diff --git a/dynamic.d/middlewares.yml b/dynamic.d/middlewares/compress.yml
similarity index 52%
rename from dynamic.d/middlewares.yml
rename to dynamic.d/middlewares/compress.yml
index 78d744f..bbfb17d 100644
--- a/dynamic.d/middlewares.yml
+++ b/dynamic.d/middlewares/compress.yml
@@ -1,12 +1,5 @@
 http:
   middlewares:
-    crowdsec:
-      plugin:
-        bouncer:
-          enabled: true
-          crowdsecMode: stream
-          crowdsecLapiHost: "localhost:8080"
-          crowdsecLapiKey: gFJjSzdbB0GCe/1Y9HcxMPP1vQmoa4psZOFyleJZJVQ
     compress-middleware:
       compress:
         encodings:
@@ -20,7 +13,3 @@ http:
           - application/javascript
           - application/json
           - text/plain
-    retry-fast:
-      retry:
-        attempts: 2
-        initialInterval: 50ms
diff --git a/dynamic.d/middlewares/crowdsec.yml b/dynamic.d/middlewares/crowdsec.yml
new file mode 100644
index 0000000..27de851
--- /dev/null
+++ b/dynamic.d/middlewares/crowdsec.yml
@@ -0,0 +1,9 @@
+http:
+  middlewares:
+    crowdsec:
+      plugin:
+        bouncer:
+          enabled: true
+          crowdsecMode: stream
+          crowdsecLapiHost: "localhost:8080"
+          crowdsecLapiKey: gFJjSzdbB0GCe/1Y9HcxMPP1vQmoa4psZOFyleJZJVQ
diff --git a/dynamic.d/middlewares/retry.yml b/dynamic.d/middlewares/retry.yml
new file mode 100644
index 0000000..b526a16
--- /dev/null
+++ b/dynamic.d/middlewares/retry.yml
@@ -0,0 +1,6 @@
+http:
+  middlewares:
+    retry-fast:
+      retry:
+        attempts: 2
+        initialInterval: 50ms
diff --git a/dynamic.d/internal.yml b/dynamic.d/routers/internal.yml
similarity index 82%
rename from dynamic.d/internal.yml
rename to dynamic.d/routers/internal.yml
index 6cb275e..bbf9b0c 100644
--- a/dynamic.d/internal.yml
+++ b/dynamic.d/routers/internal.yml
@@ -3,7 +3,8 @@ http:
     qbit:
       rule: Host(`qbit.gbanyan.net`)
       service: qbit
-      entryPoints: ["internal_websecure"]
+      entryPoints:
+        - internal_websecure
       tls:
         certResolver: letsencrypt
   services:
diff --git a/dynamic.d/transports.yml b/dynamic.d/transports/fast-upstreams.yml
similarity index 100%
rename from dynamic.d/transports.yml
rename to dynamic.d/transports/fast-upstreams.yml