diff --git a/modules/services/adblock.nix b/modules/services/adblock/default.nix
similarity index 100%
rename from modules/services/adblock.nix
rename to modules/services/adblock/default.nix
diff --git a/modules/services/backup.nix b/modules/services/backup/default.nix
similarity index 100%
rename from modules/services/backup.nix
rename to modules/services/backup/default.nix
diff --git a/modules/services/blog.nix b/modules/services/blog/default.nix
similarity index 100%
rename from modules/services/blog.nix
rename to modules/services/blog/default.nix
diff --git a/modules/services/calibre-web.nix b/modules/services/calibre-web/default.nix
similarity index 100%
rename from modules/services/calibre-web.nix
rename to modules/services/calibre-web/default.nix
diff --git a/modules/services/default.nix b/modules/services/default.nix
index 9f132d0..4ed40f0 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -2,33 +2,33 @@
 
 {
   imports = [
-    ./adblock.nix
-    ./backup.nix
-    ./blog.nix
-    ./calibre-web.nix
-    ./drone.nix
-    ./flood.nix
-    ./gitea.nix
-    ./indexers.nix
-    ./jellyfin.nix
-    ./lohr.nix
-    ./matrix.nix
-    ./miniflux.nix
-    ./monitoring.nix
-    ./navidrome.nix
-    ./nextcloud.nix
-    ./nginx.nix
-    ./paperless.nix
-    ./pirate.nix
-    ./podgrab.nix
-    ./postgresql-backup.nix
-    ./postgresql.nix
-    ./quassel.nix
-    ./rss-bridge.nix
-    ./sabnzbd.nix
-    ./ssh-server.nix
-    ./tlp.nix
-    ./transmission.nix
-    ./wireguard.nix
+    ./adblock
+    ./backup
+    ./blog
+    ./calibre-web
+    ./drone
+    ./flood
+    ./gitea
+    ./indexers
+    ./jellyfin
+    ./lohr
+    ./matrix
+    ./miniflux
+    ./monitoring
+    ./navidrome
+    ./nextcloud
+    ./nginx
+    ./paperless
+    ./pirate
+    ./podgrab
+    ./postgresql-backup
+    ./postgresql
+    ./quassel
+    ./rss-bridge
+    ./sabnzbd
+    ./ssh-server
+    ./tlp
+    ./transmission
+    ./wireguard
   ];
 }
diff --git a/modules/services/drone.nix b/modules/services/drone/default.nix
similarity index 100%
rename from modules/services/drone.nix
rename to modules/services/drone/default.nix
diff --git a/modules/services/flood.nix b/modules/services/flood/default.nix
similarity index 100%
rename from modules/services/flood.nix
rename to modules/services/flood/default.nix
diff --git a/modules/services/gitea.nix b/modules/services/gitea/default.nix
similarity index 100%
rename from modules/services/gitea.nix
rename to modules/services/gitea/default.nix
diff --git a/modules/services/indexers.nix b/modules/services/indexers/default.nix
similarity index 100%
rename from modules/services/indexers.nix
rename to modules/services/indexers/default.nix
diff --git a/modules/services/jellyfin.nix b/modules/services/jellyfin/default.nix
similarity index 100%
rename from modules/services/jellyfin.nix
rename to modules/services/jellyfin/default.nix
diff --git a/modules/services/lohr.nix b/modules/services/lohr/default.nix
similarity index 100%
rename from modules/services/lohr.nix
rename to modules/services/lohr/default.nix
diff --git a/modules/services/matrix.nix b/modules/services/matrix/default.nix
similarity index 100%
rename from modules/services/matrix.nix
rename to modules/services/matrix/default.nix
diff --git a/modules/services/miniflux.nix b/modules/services/miniflux/default.nix
similarity index 100%
rename from modules/services/miniflux.nix
rename to modules/services/miniflux/default.nix
diff --git a/modules/services/monitoring.nix b/modules/services/monitoring/default.nix
similarity index 100%
rename from modules/services/monitoring.nix
rename to modules/services/monitoring/default.nix
diff --git a/modules/services/navidrome.nix b/modules/services/navidrome/default.nix
similarity index 100%
rename from modules/services/navidrome.nix
rename to modules/services/navidrome/default.nix
diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud/default.nix
similarity index 100%
rename from modules/services/nextcloud.nix
rename to modules/services/nextcloud/default.nix
diff --git a/modules/services/nginx.nix b/modules/services/nginx/default.nix
similarity index 100%
rename from modules/services/nginx.nix
rename to modules/services/nginx/default.nix
diff --git a/modules/services/paperless.nix b/modules/services/paperless/default.nix
similarity index 100%
rename from modules/services/paperless.nix
rename to modules/services/paperless/default.nix
diff --git a/modules/services/pirate.nix b/modules/services/pirate/default.nix
similarity index 100%
rename from modules/services/pirate.nix
rename to modules/services/pirate/default.nix
diff --git a/modules/services/podgrab.nix b/modules/services/podgrab/default.nix
similarity index 100%
rename from modules/services/podgrab.nix
rename to modules/services/podgrab/default.nix
diff --git a/modules/services/postgresql-backup.nix b/modules/services/postgresql-backup/default.nix
similarity index 100%
rename from modules/services/postgresql-backup.nix
rename to modules/services/postgresql-backup/default.nix
diff --git a/modules/services/postgresql.nix b/modules/services/postgresql/default.nix
similarity index 100%
rename from modules/services/postgresql.nix
rename to modules/services/postgresql/default.nix
diff --git a/modules/services/quassel.nix b/modules/services/quassel/default.nix
similarity index 100%
rename from modules/services/quassel.nix
rename to modules/services/quassel/default.nix
diff --git a/modules/services/rss-bridge.nix b/modules/services/rss-bridge/default.nix
similarity index 100%
rename from modules/services/rss-bridge.nix
rename to modules/services/rss-bridge/default.nix
diff --git a/modules/services/sabnzbd.nix b/modules/services/sabnzbd/default.nix
similarity index 100%
rename from modules/services/sabnzbd.nix
rename to modules/services/sabnzbd/default.nix
diff --git a/modules/services/ssh-server.nix b/modules/services/ssh-server/default.nix
similarity index 100%
rename from modules/services/ssh-server.nix
rename to modules/services/ssh-server/default.nix
diff --git a/modules/services/tlp.nix b/modules/services/tlp/default.nix
similarity index 100%
rename from modules/services/tlp.nix
rename to modules/services/tlp/default.nix
diff --git a/modules/services/transmission.nix b/modules/services/transmission/default.nix
similarity index 100%
rename from modules/services/transmission.nix
rename to modules/services/transmission/default.nix
diff --git a/modules/services/wireguard.nix b/modules/services/wireguard/default.nix
similarity index 100%
rename from modules/services/wireguard.nix
rename to modules/services/wireguard/default.nix