diff --git a/.gitignore b/.gitignore
index 96100cb..f9cb675 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *.nas-compose.env
 */secrets/*
-!*/secrets/README.md
+!*/secrets/.gitkeep
 */volumes/*/*
 !*/volumes/*/.gitkeep
diff --git a/docker/secrets/traefik/README.md b/docker/secrets/traefik/README.md
deleted file mode 100644
index fefc93e..0000000
--- a/docker/secrets/traefik/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Contains the file `htpasswd`
-
-Username/password to login on traefik, see https://v2.doc.traefik.io/traefik/middlewares/http/basicauth/#usersfile
-
-
-`treefik.cert`  & `traefik.key`
-Self-Signed certificate for Trafik default setup
diff --git a/docker/configs/traefik/dynamic/authelia.yml b/traefik/configs/dynamic/authelia.yml
similarity index 100%
rename from docker/configs/traefik/dynamic/authelia.yml
rename to traefik/configs/dynamic/authelia.yml
diff --git a/docker/configs/traefik/dynamic/hsts.yml b/traefik/configs/dynamic/hsts.yml
similarity index 100%
rename from docker/configs/traefik/dynamic/hsts.yml
rename to traefik/configs/dynamic/hsts.yml
diff --git a/docker/configs/traefik/dynamic/portainer.yml b/traefik/configs/dynamic/portainer.yml
similarity index 100%
rename from docker/configs/traefik/dynamic/portainer.yml
rename to traefik/configs/dynamic/portainer.yml
diff --git a/docker/configs/traefik/dynamic/synology.yml b/traefik/configs/dynamic/synology.yml
similarity index 100%
rename from docker/configs/traefik/dynamic/synology.yml
rename to traefik/configs/dynamic/synology.yml
diff --git a/docker/configs/traefik/dynamic/tls.yml b/traefik/configs/dynamic/tls.yml
similarity index 100%
rename from docker/configs/traefik/dynamic/tls.yml
rename to traefik/configs/dynamic/tls.yml
diff --git a/docker/configs/traefik/dynamic/traefik.yml b/traefik/configs/dynamic/traefik.yml
similarity index 100%
rename from docker/configs/traefik/dynamic/traefik.yml
rename to traefik/configs/dynamic/traefik.yml
diff --git a/docker/configs/traefik/dynamic/transmission-api.yml b/traefik/configs/dynamic/transmission-api.yml
similarity index 100%
rename from docker/configs/traefik/dynamic/transmission-api.yml
rename to traefik/configs/dynamic/transmission-api.yml
diff --git a/docker/configs/traefik/traefik.yml b/traefik/configs/traefik.yml
similarity index 100%
rename from docker/configs/traefik/traefik.yml
rename to traefik/configs/traefik.yml
diff --git a/traefik/secrets/.gitkeep b/traefik/secrets/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/traefik.docker-compose.local.yml b/traefik/traefik.docker-compose.local.yml
similarity index 100%
rename from traefik.docker-compose.local.yml
rename to traefik/traefik.docker-compose.local.yml
diff --git a/traefik.docker-compose.macvlan.yml b/traefik/traefik.docker-compose.macvlan.yml
similarity index 100%
rename from traefik.docker-compose.macvlan.yml
rename to traefik/traefik.docker-compose.macvlan.yml
diff --git a/traefik.docker-compose.yml b/traefik/traefik.docker-compose.yml
similarity index 69%
rename from traefik.docker-compose.yml
rename to traefik/traefik.docker-compose.yml
index ee5f9bf..4835f3e 100644
--- a/traefik.docker-compose.yml
+++ b/traefik/traefik.docker-compose.yml
@@ -39,20 +39,20 @@ networks:
 
 configs:
   traefik_static:
-    file: ${NASCOMPOSE_SERVICES?}/configs/traefik/traefik.yml
+    file: ${NASCOMPOSE_SERVICES?}/traefik/configs/traefik.yml
   traefik_dynamic:
-    file: ${NASCOMPOSE_SERVICES?}/configs/traefik/dynamic/traefik.yml
+    file: ${NASCOMPOSE_SERVICES?}/traefik/configs/dynamic/traefik.yml
   traefik_tls:
-    file: ${NASCOMPOSE_SERVICES?}/configs/traefik/dynamic/tls.yml
+    file: ${NASCOMPOSE_SERVICES?}/traefik/configs/dynamic/tls.yml
   traefik_hsts:
-    file: ${NASCOMPOSE_SERVICES?}/configs/traefik/dynamic/hsts.yml
+    file: ${NASCOMPOSE_SERVICES?}/traefik/configs/dynamic/hsts.yml
   traefik_authelia:
-    file: ${NASCOMPOSE_SERVICES?}/configs/traefik/dynamic/authelia.yml
+    file: ${NASCOMPOSE_SERVICES?}/traefik/configs/dynamic/authelia.yml
   traefik_transmission-api:
-    file: ${NASCOMPOSE_SERVICES?}/configs/traefik/dynamic/transmission-api.yml
+    file: ${NASCOMPOSE_SERVICES?}/traefik/configs/dynamic/transmission-api.yml
 
 secrets:
   traefik_tls_cert:
-    file: ${NASCOMPOSE_SERVICES?}/secrets/traefik/traefik.cert
+    file: ${NASCOMPOSE_SERVICES?}/traefik/secrets/traefik.cert
   traefik_tls_key:
-    file: ${NASCOMPOSE_SERVICES?}/secrets/traefik/traefik.key
+    file: ${NASCOMPOSE_SERVICES?}/traefik/secrets/traefik.key