diff --git a/docker-compose.yml b/docker-compose.yml
index 966179c..2a3acf3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
       - postgres
       - redis
       - redis-cache
-    env_file: env/netbox.env
+    env_file: docker/env/netbox.env
     user: 'unit:root'
     healthcheck:
       start_period: 60s
@@ -13,7 +13,7 @@ services:
       interval: 15s
       test: "curl -f http://localhost:8080/login/ || exit 1"
     volumes:
-      - ./configuration:/etc/netbox/config:z,ro
+      - ./docker/configuration:/etc/netbox/config:z,ro
       - netbox-media-files:/opt/netbox/netbox/media:rw
       - netbox-reports-files:/opt/netbox/netbox/reports:rw
       - netbox-scripts-files:/opt/netbox/netbox/scripts:rw
@@ -49,7 +49,7 @@ services:
   # postgres
   postgres:
     image: docker.io/postgres:16-alpine
-    env_file: env/postgres.env
+    env_file: docker/env/postgres.env
     volumes:
       - netbox-postgres-data:/var/lib/postgresql/data
 
@@ -60,7 +60,7 @@ services:
       - sh
       - -c # this is to evaluate the $REDIS_PASSWORD from the env
       - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
-    env_file: env/redis.env
+    env_file: docker/env/redis.env
     volumes:
       - netbox-redis-data:/data
   redis-cache:
@@ -69,7 +69,7 @@ services:
       - sh
       - -c # this is to evaluate the $REDIS_PASSWORD from the env
       - redis-server --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
-    env_file: env/redis-cache.env
+    env_file: docker/env/redis-cache.env
     volumes:
       - netbox-redis-cache-data:/data
 
diff --git a/configuration/configuration.py b/docker/configuration/configuration.py
similarity index 100%
rename from configuration/configuration.py
rename to docker/configuration/configuration.py
diff --git a/configuration/extra.py b/docker/configuration/extra.py
similarity index 100%
rename from configuration/extra.py
rename to docker/configuration/extra.py
diff --git a/configuration/ldap/extra.py b/docker/configuration/ldap/extra.py
similarity index 100%
rename from configuration/ldap/extra.py
rename to docker/configuration/ldap/extra.py
diff --git a/configuration/ldap/ldap_config.py b/docker/configuration/ldap/ldap_config.py
similarity index 100%
rename from configuration/ldap/ldap_config.py
rename to docker/configuration/ldap/ldap_config.py
diff --git a/configuration/logging.py b/docker/configuration/logging.py
similarity index 100%
rename from configuration/logging.py
rename to docker/configuration/logging.py
diff --git a/configuration/plugins.py b/docker/configuration/plugins.py
similarity index 100%
rename from configuration/plugins.py
rename to docker/configuration/plugins.py
diff --git a/env/netbox.env b/docker/env/netbox.env
similarity index 100%
rename from env/netbox.env
rename to docker/env/netbox.env
diff --git a/env/postgres.env b/docker/env/postgres.env
similarity index 100%
rename from env/postgres.env
rename to docker/env/postgres.env
diff --git a/env/redis-cache.env b/docker/env/redis-cache.env
similarity index 100%
rename from env/redis-cache.env
rename to docker/env/redis-cache.env
diff --git a/env/redis.env b/docker/env/redis.env
similarity index 100%
rename from env/redis.env
rename to docker/env/redis.env