diff --git a/configurations/binto/modules/default.nix b/configurations/binto/modules/default.nix
index ab27a3b3..0605892d 100644
--- a/configurations/binto/modules/default.nix
+++ b/configurations/binto/modules/default.nix
@@ -1,6 +1,6 @@
 {...}: {
   imports = [
-    ./gpu-replay.nix
-    ./nix-gaming.nix
+    ./gpu-replay
+    ./nix-gaming
   ];
 }
diff --git a/configurations/binto/modules/gpu-replay.nix b/configurations/binto/modules/gpu-replay/default.nix
similarity index 100%
rename from configurations/binto/modules/gpu-replay.nix
rename to configurations/binto/modules/gpu-replay/default.nix
diff --git a/configurations/binto/modules/nix-gaming.nix b/configurations/binto/modules/nix-gaming/default.nix
similarity index 100%
rename from configurations/binto/modules/nix-gaming.nix
rename to configurations/binto/modules/nix-gaming/default.nix
diff --git a/configurations/cluster/modules/blocky.nix b/configurations/cluster/modules/blocky/default.nix
similarity index 100%
rename from configurations/cluster/modules/blocky.nix
rename to configurations/cluster/modules/blocky/default.nix
diff --git a/configurations/cluster/modules/default.nix b/configurations/cluster/modules/default.nix
index f16d29e5..eac8f5ca 100644
--- a/configurations/cluster/modules/default.nix
+++ b/configurations/cluster/modules/default.nix
@@ -1,11 +1,11 @@
 {...}: {
   imports = [
-    ./blocky.nix
+    ./blocky
     ./caddy
     ./headscale
-    ./nfs-client.nix
-    ./pcsd.nix
+    ./nfs-client
+    ./pcsd
     ./searxng
-    ./unbound.nix
+    ./unbound
   ];
 }
diff --git a/configurations/cluster/modules/nfs-client.nix b/configurations/cluster/modules/nfs-client/default.nix
similarity index 100%
rename from configurations/cluster/modules/nfs-client.nix
rename to configurations/cluster/modules/nfs-client/default.nix
diff --git a/configurations/cluster/modules/pcsd.nix b/configurations/cluster/modules/pcsd/default.nix
similarity index 100%
rename from configurations/cluster/modules/pcsd.nix
rename to configurations/cluster/modules/pcsd/default.nix
diff --git a/configurations/cluster/modules/unbound.nix b/configurations/cluster/modules/unbound/default.nix
similarity index 100%
rename from configurations/cluster/modules/unbound.nix
rename to configurations/cluster/modules/unbound/default.nix
diff --git a/configurations/nos/modules/default.nix b/configurations/nos/modules/default.nix
index ccff91a4..c5071451 100644
--- a/configurations/nos/modules/default.nix
+++ b/configurations/nos/modules/default.nix
@@ -1,13 +1,13 @@
 {...}: {
   imports = [
     ./docker
-    ./homepage.nix
+    ./homepage
     ./jellyfin
     ./qbittorrent
     # FIXME: I need to actually do this properly before unleashing it on my library
     # ./subtitles
-    ./llm.nix
-    ./mergerfs.nix
-    ./snapraid.nix
+    ./llm
+    ./mergerfs
+    ./snapraid
   ];
 }
diff --git a/configurations/nos/modules/homepage.nix b/configurations/nos/modules/homepage/default.nix
similarity index 100%
rename from configurations/nos/modules/homepage.nix
rename to configurations/nos/modules/homepage/default.nix
diff --git a/configurations/nos/modules/llm.nix b/configurations/nos/modules/llm/default.nix
similarity index 100%
rename from configurations/nos/modules/llm.nix
rename to configurations/nos/modules/llm/default.nix
diff --git a/configurations/nos/modules/mergerfs.nix b/configurations/nos/modules/mergerfs/default.nix
similarity index 100%
rename from configurations/nos/modules/mergerfs.nix
rename to configurations/nos/modules/mergerfs/default.nix
diff --git a/configurations/nos/modules/snapraid.nix b/configurations/nos/modules/snapraid/default.nix
similarity index 100%
rename from configurations/nos/modules/snapraid.nix
rename to configurations/nos/modules/snapraid/default.nix
diff --git a/configurations/servivi/modules/7-days-to-die.nix b/configurations/servivi/modules/7-days-to-die/default.nix
similarity index 100%
rename from configurations/servivi/modules/7-days-to-die.nix
rename to configurations/servivi/modules/7-days-to-die/default.nix
diff --git a/configurations/servivi/modules/binary-cache.nix b/configurations/servivi/modules/binary-cache/default.nix
similarity index 100%
rename from configurations/servivi/modules/binary-cache.nix
rename to configurations/servivi/modules/binary-cache/default.nix
diff --git a/configurations/servivi/modules/default.nix b/configurations/servivi/modules/default.nix
index e757b3b4..71751ac5 100644
--- a/configurations/servivi/modules/default.nix
+++ b/configurations/servivi/modules/default.nix
@@ -1,9 +1,9 @@
 {...}: {
   imports = [
-    ./7-days-to-die.nix
-    ./binary-cache.nix
-    ./minecraft.nix
-    ./nfs.nix
-    ./pr-tracker.nix
+    ./7-days-to-die
+    ./binary-cache
+    ./minecraft
+    ./nfs
+    ./pr-tracker
   ];
 }
diff --git a/configurations/servivi/modules/minecraft.nix b/configurations/servivi/modules/minecraft/default.nix
similarity index 100%
rename from configurations/servivi/modules/minecraft.nix
rename to configurations/servivi/modules/minecraft/default.nix
diff --git a/configurations/servivi/modules/nfs.nix b/configurations/servivi/modules/nfs/default.nix
similarity index 100%
rename from configurations/servivi/modules/nfs.nix
rename to configurations/servivi/modules/nfs/default.nix
diff --git a/configurations/servivi/modules/pr-tracker.nix b/configurations/servivi/modules/pr-tracker/default.nix
similarity index 100%
rename from configurations/servivi/modules/pr-tracker.nix
rename to configurations/servivi/modules/pr-tracker/default.nix
diff --git a/configurations/wim/modules/default.nix b/configurations/wim/modules/default.nix
index 4f99fcf3..d0dc237d 100644
--- a/configurations/wim/modules/default.nix
+++ b/configurations/wim/modules/default.nix
@@ -1,5 +1,5 @@
 {...}: {
   imports = [
-    ./security.nix
+    ./security
   ];
 }
diff --git a/configurations/wim/modules/security.nix b/configurations/wim/modules/security/default.nix
similarity index 100%
rename from configurations/wim/modules/security.nix
rename to configurations/wim/modules/security/default.nix