diff --git a/flake.nix b/flake.nix
index 5dff281..60ed7db 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,8 +50,12 @@
         ./modules/services/kavita.nix
         ./modules/services/netdata.nix
         ./modules/services/nextcloud.nix
+        ./modules/services/nginx.nix
+        ./modules/services/postgres.nix
         ./modules/services/samba.nix
+        ./modules/services/ssh.nix
         ./modules/services/step-ca.nix
+        ./modules/services/wireguard.nix
         ### Other Modules ###
         #./modules/games/palworld.nix
         ./modules/backup.nix
@@ -65,12 +69,8 @@
         ./modules/logging.nix
         ./modules/motd.nix
         ./modules/nix/settings.nix
-        ./modules/postgres.nix
-        ./modules/services/nginx.nix
-        ./modules/ssh.nix
         ./modules/static-ip.nix
         ./modules/tmpfs.nix
-        ./modules/wireguard.nix
         ### Hardware ###
         ./modules/hardware/ssd.nix
         ({ config, outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages]; })
@@ -155,8 +155,6 @@
           ./modules/graphical/shared.nix
           ./modules/nix/ld.nix
           ./modules/nix/settings.nix
-          ./modules/rdp.nix
-          ./modules/ssh.nix
           ./modules/support/ntfs.nix
           ./modules/thunderbolt.nix
           ./modules/tmpfs.nix
diff --git a/modules/acme.nix b/modules/services/acme.nix
similarity index 100%
rename from modules/acme.nix
rename to modules/services/acme.nix
diff --git a/modules/rdp.nix b/modules/services/rdp.nix
similarity index 100%
rename from modules/rdp.nix
rename to modules/services/rdp.nix
diff --git a/modules/ssh.nix b/modules/services/ssh.nix
similarity index 100%
rename from modules/ssh.nix
rename to modules/services/ssh.nix
diff --git a/modules/wireguard.nix b/modules/services/wireguard.nix
similarity index 97%
rename from modules/wireguard.nix
rename to modules/services/wireguard.nix
index c76c6a4..5005fee 100644
--- a/modules/wireguard.nix
+++ b/modules/services/wireguard.nix
@@ -5,7 +5,7 @@ in
 {
 
   age.secrets.wireguard-private = {
-    file = ../secrets/wireguard-private.age;
+    file = ../../secrets/wireguard-private.age;
   };
 
   networking.nat.enable = true;