diff --git a/Dockerfile b/Dockerfile
index 593164b0..0b010a85 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,8 +54,8 @@ RUN apt-get update && apt-get install -y \
     && mkdir -p /etc/otel
 
 # Add OpenTelemetry Collector configs
-COPY otel-collector-config-file.yaml /etc/otel/config-file.yaml
-COPY otel-collector-config-clickhouse.yaml /etc/otel/config-clickhouse.yaml
+COPY otel/otel-collector-config-file.yaml /etc/otel/config-file.yaml
+COPY otel/otel-collector-config-clickhouse.yaml /etc/otel/config-clickhouse.yaml
 
 ARG LETTA_ENVIRONMENT=PRODUCTION
 ENV LETTA_ENVIRONMENT=${LETTA_ENVIRONMENT} \
diff --git a/otel-collector-config-clickhouse-dev.yaml b/otel/otel-collector-config-clickhouse-dev.yaml
similarity index 100%
rename from otel-collector-config-clickhouse-dev.yaml
rename to otel/otel-collector-config-clickhouse-dev.yaml
diff --git a/otel-collector-config-clickhouse-prod.yaml b/otel/otel-collector-config-clickhouse-prod.yaml
similarity index 100%
rename from otel-collector-config-clickhouse-prod.yaml
rename to otel/otel-collector-config-clickhouse-prod.yaml
diff --git a/otel-collector-config-clickhouse.yaml b/otel/otel-collector-config-clickhouse.yaml
similarity index 100%
rename from otel-collector-config-clickhouse.yaml
rename to otel/otel-collector-config-clickhouse.yaml
diff --git a/otel-collector-config-file-dev.yaml b/otel/otel-collector-config-file-dev.yaml
similarity index 100%
rename from otel-collector-config-file-dev.yaml
rename to otel/otel-collector-config-file-dev.yaml
diff --git a/otel-collector-config-file.yaml b/otel/otel-collector-config-file.yaml
similarity index 100%
rename from otel-collector-config-file.yaml
rename to otel/otel-collector-config-file.yaml
diff --git a/start-otel-collector.sh b/otel/start-otel-collector.sh
similarity index 100%
rename from start-otel-collector.sh
rename to otel/start-otel-collector.sh
diff --git a/project.json b/project.json
index 88637f0f..217724ab 100644
--- a/project.json
+++ b/project.json
@@ -26,7 +26,10 @@
     "dev": {
       "executor": "@nxlv/python:run-commands",
       "options": {
-        "commands": ["./start-otel-collector.sh", "poetry run letta server"],
+        "commands": [
+          "./otel/start-otel-collector.sh",
+          "poetry run letta server"
+        ],
         "parallel": true,
         "cwd": "apps/core"
       }