diff --git a/flake.nix b/flake.nix
index 66cf8c4..6b1c958 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,9 +19,9 @@
       modules = [
         ./hosts/hermes/configuration.nix
         ./hosts/hermes/hardware-configuration.nix
-        ./modules/homelab.nix
-        ./modules/security.nix
-        ./modules/system.nix
+        ./modules/services
+        ./modules/security
+        ./modules/system
         agenix.nixosModules.default
         unifi-os-server.nixosModules.unifi-os-server
       ];
diff --git a/modules/homelab.nix b/modules/homelab.nix
deleted file mode 100644
index 99f4177..0000000
--- a/modules/homelab.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  imports = [
-    ./services/vaultwarden.nix
-    ./services/navidrome.nix
-    ./services/caddy.nix
-    ./services/unifi.nix
-    ./services/gitea.nix
-  ];
-}
diff --git a/modules/security.nix b/modules/security/default.nix
similarity index 69%
rename from modules/security.nix
rename to modules/security/default.nix
index 3cf9988..d7c3e19 100644
--- a/modules/security.nix
+++ b/modules/security/default.nix
@@ -1,6 +1,6 @@
 { pkgs, lib, config, ... }:
 {
 	imports = [
-			./security/ssh.nix
+			./ssh.nix
 	];
 }
diff --git a/modules/services/default.nix b/modules/services/default.nix
new file mode 100644
index 0000000..da5d7f5
--- /dev/null
+++ b/modules/services/default.nix
@@ -0,0 +1,13 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  imports = [
+    ./vaultwarden.nix
+    ./navidrome.nix
+    ./caddy.nix
+    ./unifi.nix
+    ./gitea.nix
+  ];
+}
diff --git a/modules/system.nix b/modules/system.nix
deleted file mode 100644
index c3e3f99..0000000
--- a/modules/system.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, lib, config, ... }:
-{
-	imports = [
-		./system/garbage-collection.nix
-    ./system/backups.nix
-	];
-}
diff --git a/modules/system/default.nix b/modules/system/default.nix
new file mode 100644
index 0000000..f18f367
--- /dev/null
+++ b/modules/system/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, lib, config, ... }:
+{
+	imports = [
+		./garbage-collection.nix
+    ./backups.nix
+	];
+}