diff --git a/flake.nix b/flake.nix
index daffd5d..5dff281 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,37 +42,38 @@
         ### User specific ###
         ./users/anon
         ### System sepecific ###
-        ({ config, outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages]; })
         ./systems/server/configuration.nix
-        ### Modules ###
-        ./modules/cli-tools.nix
-        ./modules/static-ip.nix
-        ./modules/hdd-spindown.nix
-        ./modules/firewall.nix
-        ./modules/motd.nix
-        ./modules/postgres.nix
-        ./modules/fail2ban.nix
-        ./modules/nix/settings.nix
-        ./modules/adguard.nix
-        ./modules/git.nix
-        ./modules/github-runner.nix
-        ./modules/nextcloud.nix
-        ./modules/acme.nix
-        ./modules/samba.nix
-        ./modules/backup.nix
-        ./modules/nginx.nix
-        ./modules/ssh.nix
-        ./modules/docker.nix
-        ./modules/wireguard.nix
-        ./modules/cron.nix
-        ./modules/kavita.nix
-        ./modules/netdata.nix
-        ./modules/step-ca.nix
-        ./modules/tmpfs.nix
+        ### Services ###
+        ./modules/services/acme.nix
+        ./modules/services/adguard.nix
+        ./modules/services/github-runner.nix
+        ./modules/services/kavita.nix
+        ./modules/services/netdata.nix
+        ./modules/services/nextcloud.nix
+        ./modules/services/samba.nix
+        ./modules/services/step-ca.nix
+        ### Other Modules ###
         #./modules/games/palworld.nix
+        ./modules/backup.nix
+        ./modules/cli-tools.nix
+        ./modules/cron.nix
+        ./modules/docker.nix
+        ./modules/fail2ban.nix
+        ./modules/firewall.nix
+        ./modules/git.nix
+        ./modules/hdd-spindown.nix
         ./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]; })
         home-manager.nixosModules.home-manager
         agenix.nixosModules.default
       ];
@@ -94,38 +95,38 @@
           ### User specific ###
           ./users/kopatz
           ### System modules ###
-          ./modules/graphical/plasma.nix
-          #./modules/graphical/hyprland.nix
+          ./modules/cli-tools.nix
+          ./modules/docker.nix
+          ./modules/flatpak.nix
+          ./modules/gpg.nix
+          ./modules/graphical/audio.nix
+          ./modules/graphical/code.nix
           ./modules/graphical/emulators.nix
           ./modules/graphical/gamemode.nix
-          ./modules/graphical/obs.nix
-          ./modules/graphical/audio.nix
           ./modules/graphical/games.nix
           ./modules/graphical/ime.nix
-          ./modules/graphical/code.nix
+          ./modules/graphical/obs.nix
+          ./modules/graphical/plasma.nix
           ./modules/graphical/shared.nix
-          #./modules/fh/forensik.nix
+          ./modules/hardware/firmware.nix
           ./modules/hardware/nvidia.nix
           ./modules/hardware/ssd.nix
-          ./modules/hardware/firmware.nix
           ./modules/kernel.nix # use latest kernel
-          ./modules/nix/settings.nix
+          ./modules/nftables.nix
           ./modules/nix/index.nix
           ./modules/nix/ld.nix
-          ./modules/cli-tools.nix
-          ./modules/gpg.nix
-          ./modules/virt-manager.nix
-          #./modules/hardware/vfio.nix too stupid for this
-          ./modules/flatpak.nix
-          ./modules/docker.nix
-          ./modules/nftables.nix
+          ./modules/nix/settings.nix
           ./modules/noise-supression.nix
-         ({ config, pkgs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages]; })
-          ./modules/wooting.nix
-          ./modules/wireshark.nix
-          ./modules/tmpfs.nix
           ./modules/support/ntfs.nix
+          ./modules/tmpfs.nix
+          ./modules/virt-manager.nix
+          ./modules/wireshark.nix
+          ./modules/wooting.nix
           ./systems/pc/configuration.nix
+          #./modules/fh/forensik.nix
+          #./modules/graphical/hyprland.nix
+          #./modules/hardware/vfio.nix too stupid for this
+         ({ config, pkgs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages]; })
           agenix.nixosModules.default
           home-manager-unstable.nixosModules.home-manager
         ];
@@ -142,32 +143,32 @@
         modules = [
           ### User specific ###
           ./users/kopatz
-          ({ config, outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages]; })
-          ./modules/graphical/hyprland.nix
-          ./modules/graphical/emulators.nix
-          ./modules/graphical/gamemode.nix
-          ./modules/graphical/audio.nix
-          ./modules/graphical/games.nix
-          ./modules/graphical/ime.nix
-          ./modules/graphical/code.nix
-          ./modules/graphical/shared.nix
-          #./modules/fh/forensik.nix
-          ./systems/laptop/configuration.nix
           ./modules/cli-tools.nix
           ./modules/ecryptfs.nix
+          ./modules/graphical/audio.nix
+          ./modules/graphical/code.nix
+          ./modules/graphical/emulators.nix
+          ./modules/graphical/gamemode.nix
+          ./modules/graphical/games.nix
+          ./modules/graphical/hyprland.nix
+          ./modules/graphical/ime.nix
+          ./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
           ./modules/virt-manager.nix
           ./modules/vmware-host.nix
-          ./modules/nix/ld.nix
-          ./modules/ssh.nix
           ./modules/wireshark.nix
-          #./modules/static-ip.nix
+          ./systems/laptop/configuration.nix
+          #./modules/fh/forensik.nix
           #./modules/no-sleep-lid-closed.nix
+          #./modules/static-ip.nix
           #./modules/wake-on-lan.nix
-          ./modules/thunderbolt.nix
-          ./modules/rdp.nix
-          ./modules/tmpfs.nix
-          ./modules/support/ntfs.nix
-          ./modules/nix/settings.nix
+          ({ config, outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages]; })
           nixos-hardware.nixosModules.dell-xps-15-7590-nvidia
           agenix.nixosModules.default
           home-manager.nixosModules.home-manager
@@ -182,10 +183,10 @@
         modules = [
           #"${nixpkgs}/nixos/modules/profiles/minimal.nix"
           ./users/anon
-          ./modules/nix/settings.nix
           ./modules/cli-tools.nix
-          ({ config, outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages]; })
+          ./modules/nix/settings.nix
           ./systems/wsl/configuration.nix
+          ({ config, outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages]; })
           nixos-wsl.nixosModules.wsl
           home-manager.nixosModules.home-manager
         ];
diff --git a/modules/adguard.nix b/modules/services/adguard.nix
similarity index 100%
rename from modules/adguard.nix
rename to modules/services/adguard.nix
diff --git a/modules/coturn.nix b/modules/services/coturn.nix
similarity index 97%
rename from modules/coturn.nix
rename to modules/services/coturn.nix
index 10045da..17b2455 100644
--- a/modules/coturn.nix
+++ b/modules/services/coturn.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, inputs, ... }:
 {
     age.secrets.coturn-secret = {
-        file = ../secrets/coturn-secret.age;
+        file = ../../secrets/coturn-secret.age;
 	owner = "turnserver";
 	group = "turnserver";
     };
diff --git a/modules/dyndns.nix b/modules/services/dyndns.nix
similarity index 85%
rename from modules/dyndns.nix
rename to modules/services/dyndns.nix
index 801df33..34cb7c1 100644
--- a/modules/dyndns.nix
+++ b/modules/services/dyndns.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, inputs, ... }:
 {
     age.secrets.duckdns = {
-        file = ../secrets/duckdns.age;
+        file = ../../secrets/duckdns.age;
     };
     services.ddclient = {
         enable = true;
@@ -9,4 +9,4 @@
         passwordFile = config.age.secrets.duckdns.path;
         domains = ["wachbirn.duckdns.org"];
   };
-}
\ No newline at end of file
+}
diff --git a/modules/github-runner.nix b/modules/services/github-runner.nix
similarity index 92%
rename from modules/github-runner.nix
rename to modules/services/github-runner.nix
index 1c38d61..fba7c45 100644
--- a/modules/github-runner.nix
+++ b/modules/services/github-runner.nix
@@ -12,12 +12,12 @@
         extraGroups = [ "docker" ];
     };
     age.secrets.github-runner-token = {
-        file = ../secrets/github-runner-token.age;
+        file = ../../secrets/github-runner-token.age;
         owner = "github-actions-runner";
         group = "github-actions-runner";
     };
     age.secrets.github-runner-pw = {
-        file = ../secrets/github-runner-pw.age;
+        file = ../../secrets/github-runner-pw.age;
         owner = "github-actions-runner";
         group = "github-actions-runner";
     };
diff --git a/modules/home-assistant.nix b/modules/services/home-assistant.nix
similarity index 100%
rename from modules/home-assistant.nix
rename to modules/services/home-assistant.nix
diff --git a/modules/invidious.nix b/modules/services/invidious.nix
similarity index 95%
rename from modules/invidious.nix
rename to modules/services/invidious.nix
index 381a20f..df3d801 100644
--- a/modules/invidious.nix
+++ b/modules/services/invidious.nix
@@ -5,7 +5,7 @@ let
 in
 {
   age.secrets.invidious-extra-settings = {
-    file = ../secrets/invidious-extra-settings.age;
+    file = ../../secrets/invidious-extra-settings.age;
     mode = "444";
   };
 
diff --git a/modules/kavita.nix b/modules/services/kavita.nix
similarity index 98%
rename from modules/kavita.nix
rename to modules/services/kavita.nix
index 294845f..40fd18d 100644
--- a/modules/kavita.nix
+++ b/modules/services/kavita.nix
@@ -12,7 +12,7 @@ in
       "d ${baseDir}/manga 0770 kavita kavita -"
   ];
   age.secrets.kavita = {
-    file = ../secrets/kavita.age;
+    file = ../../secrets/kavita.age;
     owner = "kavita";
     group = "kavita";
   };
diff --git a/modules/minecraft-server.nix b/modules/services/minecraft-server.nix
similarity index 100%
rename from modules/minecraft-server.nix
rename to modules/services/minecraft-server.nix
diff --git a/modules/netdata.nix b/modules/services/netdata.nix
similarity index 100%
rename from modules/netdata.nix
rename to modules/services/netdata.nix
diff --git a/modules/nextcloud.nix b/modules/services/nextcloud.nix
similarity index 98%
rename from modules/nextcloud.nix
rename to modules/services/nextcloud.nix
index 5271d9b..d573f80 100644
--- a/modules/nextcloud.nix
+++ b/modules/services/nextcloud.nix
@@ -33,7 +33,7 @@ in
     };
 
     age.secrets.nextcloud-admin = {
-        file = ../secrets/nextcloud-admin.age;
+        file = ../../secrets/nextcloud-admin.age;
         owner = "nextcloud";
         group = "nextcloud";
     };
diff --git a/modules/nginx.nix b/modules/services/nginx.nix
similarity index 100%
rename from modules/nginx.nix
rename to modules/services/nginx.nix
diff --git a/modules/paperless.nix b/modules/services/paperless.nix
similarity index 90%
rename from modules/paperless.nix
rename to modules/services/paperless.nix
index 3e60830..dc3dfdd 100644
--- a/modules/paperless.nix
+++ b/modules/services/paperless.nix
@@ -6,7 +6,7 @@ in
 {
     networking.firewall.allowedTCPPorts = [ 28981 ];
     age.secrets.paperless = {
-        file = ../secrets/paperless.age;
+        file = ../../secrets/paperless.age;
         owner = "paperless";
         group = "paperless";
     };
diff --git a/modules/postgres.nix b/modules/services/postgres.nix
similarity index 100%
rename from modules/postgres.nix
rename to modules/services/postgres.nix
diff --git a/modules/samba.nix b/modules/services/samba.nix
similarity index 100%
rename from modules/samba.nix
rename to modules/services/samba.nix
diff --git a/modules/step-ca.nix b/modules/services/step-ca.nix
similarity index 97%
rename from modules/step-ca.nix
rename to modules/services/step-ca.nix
index d599159..9a05589 100644
--- a/modules/step-ca.nix
+++ b/modules/services/step-ca.nix
@@ -34,12 +34,12 @@ in
 {
   security.pki.certificates = [ root_ca ];
   age.secrets.step-ca-pw = {
-    file = ../secrets/step-ca-pw.age;
+    file = ../../secrets/step-ca-pw.age;
     owner = "step-ca";
     group = "step-ca";
   };
   age.secrets.step-ca-key = {
-    file = ../secrets/step-ca-key.age;
+    file = ../../secrets/step-ca-key.age;
     owner = "step-ca";
     group = "step-ca";
   };
diff --git a/modules/synapse.nix b/modules/services/synapse.nix
similarity index 98%
rename from modules/synapse.nix
rename to modules/services/synapse.nix
index 85bda90..fe57755 100644
--- a/modules/synapse.nix
+++ b/modules/services/synapse.nix
@@ -59,7 +59,7 @@ in {
   };
 
   age.secrets.matrix-registration = {
-      file = ../secrets/matrix-registration.age;
+      file = ../../secrets/matrix-registration.age;
       owner = "matrix-synapse";
       group = "matrix-synapse";
   };