diff --git a/Dockerfile b/Dockerfile
index 64c43ed..b687d5f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,4 +37,4 @@ HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
     CMD curl -f http://localhost:8000/health || exit 1
 
 # Run the server using the installed package entry point
-CMD ["python", "-m", "geoguessr_mcp.main"]
\ No newline at end of file
+CMD ["python", "-m", "src.geoguessr_mcp.main"]
\ No newline at end of file
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 01552e2..64189c8 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -15,15 +15,8 @@ services:
     restart: unless-stopped
     expose:
       - "8000"
-    environment:
-      - GEOGUESSR_NCFA_COOKIE=${GEOGUESSR_NCFA_COOKIE:-}
-      - MCP_TRANSPORT=streamable-http
-      - MCP_HOST=0.0.0.0
-      - MCP_PORT=8000
-      - MONITORING_ENABLED=true
-      - MONITORING_INTERVAL_HOURS=24
-      - SCHEMA_CACHE_DIR=/app/data/schemas
-      - LOG_LEVEL=INFO
+    env_file:
+      - .env
     volumes:
       - geoguessr-schemas:/app/data/schemas
     healthcheck:
diff --git a/docker-compose.yml b/docker-compose.yml
index a5e275d..b8d2bdd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,19 +10,8 @@ services:
     restart: unless-stopped
     ports:
       - "${MCP_PORT:-8000}:8000"
-    environment:
-      # GeoGuessr Authentication (optional - can use login tool instead)
-      - GEOGUESSR_NCFA_COOKIE=${GEOGUESSR_NCFA_COOKIE:-}
-      # MCP Server configuration
-      - MCP_TRANSPORT=${MCP_TRANSPORT:-streamable-http}
-      - MCP_HOST=${MCP_HOST:-0.0.0.0}
-      - MCP_PORT=${MCP_PORT:-8000}  # Use the same variable as in ports
-      # Monitoring configuration
-      - MONITORING_ENABLED=${MONITORING_ENABLED:-true}
-      - MONITORING_INTERVAL_HOURS=${MONITORING_INTERVAL_HOURS:-24}
-      - SCHEMA_CACHE_DIR=${SCHEMA_CACHE_DIR:-/app/data/schemas}
-      # Logging
-      - LOG_LEVEL=${LOG_LEVEL:-INFO}
+    env_file:
+      - .env
     volumes:
       # Persist schema cache between restarts
       - geoguessr-schemas:${SCHEMA_CACHE_DIR:-/app/data/schemas}
diff --git a/pyproject.toml b/pyproject.toml
index ac433d9..2db4f52 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -47,7 +47,7 @@ dev = [
 ]
 
 [project.scripts]
-geoguessr-mcp = "server:main"
+geoguessr-mcp = "geoguessr_mcp.main:main"
 
 [project.urls]
 Homepage = "https://github.com/NyxiumYuuki/GeoGuessrMCP"
@@ -59,7 +59,7 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [tool.hatch.build.targets.wheel]
-packages = ["."]
+packages = ["src/geoguessr_mcp"]
 
 # Black configuration
 [tool.black]