diff --git a/flake.nix b/flake.nix
index 60ed7db..00c22b2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,40 +39,9 @@
     nixosConfigurations.server = nixpkgs.lib.nixosSystem {
       inherit system;
       modules = [
-        ### User specific ###
         ./users/anon
-        ### System sepecific ###
+        ./modules/collections/server.nix
         ./systems/server/configuration.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/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
-        ./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/static-ip.nix
-        ./modules/tmpfs.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
@@ -92,40 +61,9 @@
           inherit inputs outputs;
         };
         modules = [
-          ### User specific ###
           ./users/kopatz
-          ### System modules ###
-          ./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/games.nix
-          ./modules/graphical/ime.nix
-          ./modules/graphical/obs.nix
-          ./modules/graphical/plasma.nix
-          ./modules/graphical/shared.nix
-          ./modules/hardware/firmware.nix
-          ./modules/hardware/nvidia.nix
-          ./modules/hardware/ssd.nix
-          ./modules/kernel.nix # use latest kernel
-          ./modules/nftables.nix
-          ./modules/nix/index.nix
-          ./modules/nix/ld.nix
-          ./modules/nix/settings.nix
-          ./modules/noise-supression.nix
-          ./modules/support/ntfs.nix
-          ./modules/tmpfs.nix
-          ./modules/virt-manager.nix
-          ./modules/wireshark.nix
-          ./modules/wooting.nix
+          ./modules/collections/desktop.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
diff --git a/modules/collections/desktop.nix b/modules/collections/desktop.nix
new file mode 100644
index 0000000..83323fd
--- /dev/null
+++ b/modules/collections/desktop.nix
@@ -0,0 +1,36 @@
+{pkgs, ...}:
+{
+  imports = [
+    ### System modules ###
+    ../cli-tools.nix
+    ../docker.nix
+    ../flatpak.nix
+    ../gpg.nix
+    ../graphical/audio.nix
+    ../graphical/code.nix
+    ../graphical/emulators.nix
+    ../graphical/gamemode.nix
+    ../graphical/games.nix
+    ../graphical/ime.nix
+    ../graphical/obs.nix
+    ../graphical/plasma.nix
+    ../graphical/shared.nix
+    ../hardware/firmware.nix
+    ../hardware/nvidia.nix
+    ../hardware/ssd.nix
+    ../hardware/wooting.nix
+    ../kernel.nix # use latest kernel
+    ../nftables.nix
+    ../nix/index.nix
+    ../nix/ld.nix
+    ../nix/settings.nix
+    ../noise-supression.nix
+    ../support/ntfs.nix
+    ../tmpfs.nix
+    ../virt-manager.nix
+    ../wireshark.nix
+    #../fh/forensik.nix
+    #../graphical/hyprland.nix
+    #../hardware/vfio.nix too stupid for this
+  ];
+}
diff --git a/modules/collections/server.nix b/modules/collections/server.nix
new file mode 100644
index 0000000..1ac5403
--- /dev/null
+++ b/modules/collections/server.nix
@@ -0,0 +1,35 @@
+{pkgs, ...}:
+{
+  imports = [
+    ### Services ###
+    ../services/acme.nix
+    ../services/adguard.nix
+    ../services/github-runner.nix
+    ../services/kavita.nix
+    ../services/netdata.nix
+    ../services/nextcloud.nix
+    ../services/nginx.nix
+    ../services/postgres.nix
+    ../services/samba.nix
+    ../services/ssh.nix
+    ../services/step-ca.nix
+    ../services/wireguard.nix
+    ### Other Modules ###
+    #../games/palworld.nix
+    ../backup.nix
+    ../cli-tools.nix
+    ../cron.nix
+    ../docker.nix
+    ../fail2ban.nix
+    ../firewall.nix
+    ../git.nix
+    ../hdd-spindown.nix
+    ../logging.nix
+    ../motd.nix
+    ../nix/settings.nix
+    ../static-ip.nix
+    ../tmpfs.nix
+    ### Hardware ###
+    ../hardware/ssd.nix
+  ];
+}
diff --git a/modules/wooting.nix b/modules/hardware/wooting.nix
similarity index 100%
rename from modules/wooting.nix
rename to modules/hardware/wooting.nix
diff --git a/modules/wooting.rules b/modules/hardware/wooting.rules
similarity index 100%
rename from modules/wooting.rules
rename to modules/hardware/wooting.rules