diff --git a/modules/services/firewall.nix b/modules/services/firewall/module.nix
similarity index 100%
rename from modules/services/firewall.nix
rename to modules/services/firewall/module.nix
diff --git a/modules/services/greetd.nix b/modules/services/greetd/module.nix
similarity index 100%
rename from modules/services/greetd.nix
rename to modules/services/greetd/module.nix
diff --git a/modules/services/locate.nix b/modules/services/locate/module.nix
similarity index 100%
rename from modules/services/locate.nix
rename to modules/services/locate/module.nix
diff --git a/modules/services/mako.nix b/modules/services/mako/module.nix
similarity index 100%
rename from modules/services/mako.nix
rename to modules/services/mako/module.nix
diff --git a/modules/services/module.nix b/modules/services/module.nix
deleted file mode 100644
index b874528..0000000
--- a/modules/services/module.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-_: {
-  imports = [
-    ./pipewire.nix
-    ./locate.nix
-    ./ssh.nix
-    ./greetd.nix
-    ./mako.nix
-    ./mpd.nix
-    ./firewall.nix
-  ];
-}
diff --git a/modules/services/mpd.nix b/modules/services/mpd/module.nix
similarity index 100%
rename from modules/services/mpd.nix
rename to modules/services/mpd/module.nix
diff --git a/modules/services/pipewire.nix b/modules/services/pipewire/module.nix
similarity index 100%
rename from modules/services/pipewire.nix
rename to modules/services/pipewire/module.nix
diff --git a/modules/services/ssh.nix b/modules/services/ssh/module.nix
similarity index 100%
rename from modules/services/ssh.nix
rename to modules/services/ssh/module.nix