diff --git a/hosts/atlas/default.nix b/hosts/atlas/default.nix
index d65e121..deace69 100644
--- a/hosts/atlas/default.nix
+++ b/hosts/atlas/default.nix
@@ -22,29 +22,22 @@
   users.extraGroups.vboxusers.members = [ "jordan" ];
 
   modules = {
-    desktop = {
-      apps = {
-        qbittorrent.enable = true;
-        thunderbird.enable = true;
+    programs = {
+      dev = {
+        node.enable = true;
       };
-      browsers = {
-        firefox.enable = true;
-      };
-      media.graphics = {
+      firefox.enable = true;
+      git.enable = true;
+      gpg.enable = true;
+      graphics = {
         raster.enable = true;
         vector.enable = true;
       };
-      office.libreoffice.enable = true;
-    };
-    dev = {
-      node.enable = true;
-    };
-    editors = {
+      libreoffice.enable = true;
       neovim.enable = true;
-    };
-    security = {
-      gpg.enable = true;
       pass.enable = true;
+      qbittorrent.enable = true;
+      thunderbird.enable = true;
     };
     services = {
       borgmatic = {
@@ -56,7 +49,6 @@
       };
     };
     shell = {
-      git.enable = true;
       zsh.enable = true;
     };
   };
diff --git a/hosts/common.nix b/hosts/common.nix
index e34464e..55b2028 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -4,7 +4,8 @@
   imports = [
     self.inputs.agenix.nixosModules.age
     self.inputs.home-manager.nixosModule
-    ../modules
+    ../modules/home-manager
+    ../modules/nixos
   ];
 
   nixpkgs.overlays = [
diff --git a/hosts/desktop.nix b/hosts/desktop.nix
index f8f398c..7ec7378 100644
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@@ -52,8 +52,8 @@
   ];
 
   modules = {
-    desktop.gnome.enable = true;
-    networking.tailscale.enable = true;
+    system.desktop.gnome.enable = true;
+    services.tailscale.enable = true;
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/hosts/eos/default.nix b/hosts/eos/default.nix
index 33a7a4c..fda0fbc 100644
--- a/hosts/eos/default.nix
+++ b/hosts/eos/default.nix
@@ -25,24 +25,18 @@
   };
 
   modules = {
-    desktop = {
-      apps.qbittorrent.enable = true;
-      browsers = {
-        firefox.enable = true;
+    programs = {
+      dev = {
+        node.enable = true;
       };
-    };
-    dev = {
-      node.enable = true;
-    };
-    editors = {
-      neovim.enable = true;
-    };
-    security = {
+      firefox.enable = true;
+      git.enable = true;
       gpg.enable = true;
+      neovim.enable = true;
       pass.enable = true;
+      qbittorrent.enable = true;
     };
     shell = {
-      git.enable = true;
       zsh.enable = true;
     };
   };
diff --git a/hosts/helios/default.nix b/hosts/helios/default.nix
index 8122ae9..5b19868 100644
--- a/hosts/helios/default.nix
+++ b/hosts/helios/default.nix
@@ -22,21 +22,16 @@
   };
 
   modules = {
-    desktop = {
-      apps.qbittorrent.enable = true;
-      browsers = {
-        firefox.enable = true;
+    programs = {
+      dev = {
+        node.enable = true;
       };
-    };
-    dev = {
-      node.enable = true;
-    };
-    editors = {
-      neovim.enable = true;
-    };
-    security = {
+      firefox.enable = true;
+      git.enable = true;
       gpg.enable = true;
+      neovim.enable = true;
       pass.enable = true;
+      qbittorrent.enable = true;
     };
     services = {
       borgmatic = {
@@ -48,7 +43,6 @@
       };
     };
     shell = {
-      git.enable = true;
       zsh.enable = true;
     };
   };
diff --git a/hosts/hypnos/default.nix b/hosts/hypnos/default.nix
index 95bef71..57d8f07 100644
--- a/hosts/hypnos/default.nix
+++ b/hosts/hypnos/default.nix
@@ -30,7 +30,7 @@
       videoDrivers = [ "nvidia" ];
     };
     displayManager = {
-      defaultSession = if config.modules.desktop.kde.enable then "plasmax11" else "gnome-xorg";
+      defaultSession = if config.modules.system.desktop.kde.enable then "plasmax11" else "gnome-xorg";
       sddm.wayland.enable = lib.mkForce false;
     };
   };
@@ -39,26 +39,20 @@
   environment.sessionVariables.GSK_RENDERER = "gl";
 
   modules = {
-    desktop = {
-      browsers = {
-        firefox.enable = true;
+    programs = {
+      dev = {
+        node.enable = true;
       };
-      media.recording = {
+      firefox.enable = true;
+      git.enable = true;
+      gpg.enable = true;
+      neovim.enable = true;
+      pass.enable = true;
+      recording = {
         audio.enable = true;
       };
     };
-    dev = {
-      node.enable = true;
-    };
-    editors = {
-      neovim.enable = true;
-    };
-    security = {
-      gpg.enable = true;
-      pass.enable = true;
-    };
     shell = {
-      git.enable = true;
       zsh.enable = true;
     };
   };
diff --git a/hosts/library/default.nix b/hosts/library/default.nix
index cb3b647..7580bd2 100644
--- a/hosts/library/default.nix
+++ b/hosts/library/default.nix
@@ -172,7 +172,7 @@
 
   modules = {
     podman.enable = true;
-    security = {
+    programs = {
       gpg.enable = true;
     };
     shell = {
diff --git a/hosts/odyssey/default.nix b/hosts/odyssey/default.nix
index 961a730..4f90217 100644
--- a/hosts/odyssey/default.nix
+++ b/hosts/odyssey/default.nix
@@ -50,44 +50,37 @@
   };
 
   modules = {
-    desktop = {
-      apps.qbittorrent.enable = true;
-      browsers = {
-        firefox.enable = true;
+    programs = {
+      dev = {
+        node.enable = true;
       };
-      gaming = {
-        emulators = {
-          gamecube.enable = true;
-          ps2.enable = true;
-          ps3.enable = true;
-          psp.enable = true;
-          wii.enable = true;
-          xbox.enable = true;
-        };
-        lutris.enable = true;
+      emulators = {
+        gamecube.enable = true;
+        ps2.enable = true;
+        ps3.enable = true;
+        psp.enable = true;
+        wii.enable = true;
+        xbox.enable = true;
       };
-      media.graphics = {
+      firefox.enable = true;
+      git.enable = true;
+      gpg.enable = true;
+      graphics = {
         modeling.enable = true;
         raster.enable = true;
         vector.enable = true;
       };
-      media.recording = {
+      libreoffice.enable = true;
+      lutris.enable = true;
+      pass.enable = true;
+      neovim.enable = true;
+      qbittorrent.enable = true;
+      recording = {
         audio.enable = true;
         video.enable = true;
       };
-      office.libreoffice.enable = true;
-    };
-    dev = {
-      node.enable = true;
-    };
-    editors = {
-      neovim.enable = true;
     };
     hardware.presonus-studio.enable = true;
-    security = {
-      gpg.enable = true;
-      pass.enable = true;
-    };
     services = {
       borgmatic = {
         enable = true;
@@ -105,7 +98,6 @@
       gitea-runner.enable = true;
     };
     shell = {
-      git.enable = true;
       zsh.enable = true;
     };
   };
diff --git a/hosts/pi/default.nix b/hosts/pi/default.nix
index 6ce1ba5..e7622db 100644
--- a/hosts/pi/default.nix
+++ b/hosts/pi/default.nix
@@ -214,7 +214,7 @@
   };
 
   modules = {
-    networking = {
+    system = {
       wireless = {
         enable = true;
         interfaces = [ "wlan0" ];
diff --git a/hosts/server.nix b/hosts/server.nix
index 212d67e..8366210 100644
--- a/hosts/server.nix
+++ b/hosts/server.nix
@@ -54,7 +54,7 @@
     ];
   };
 
-  modules.networking.tailscale = {
+  modules.services.tailscale = {
     enable = true;
     restrictSSH = false;
   };
diff --git a/hosts/vps1/default.nix b/hosts/vps1/default.nix
index 205d4a9..eb71b82 100644
--- a/hosts/vps1/default.nix
+++ b/hosts/vps1/default.nix
@@ -79,7 +79,6 @@
   };
 
   modules = rec {
-    databases.postgresql.enable = true;
     services = {
       borgmatic = {
         enable = true;
@@ -103,10 +102,11 @@
           signal = true;
           whatsapp = true;
         };
-        usePostgresql = databases.postgresql.enable;
+        usePostgresql = services.postgresql.enable;
       };
       nginx.enable = true;
       photoprism.enable = true;
+      postgresql.enable = true;
     };
   };
 
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
new file mode 100644
index 0000000..6419243
--- /dev/null
+++ b/modules/home-manager/default.nix
@@ -0,0 +1,33 @@
+{
+  imports = [
+    ./options.nix
+    ./programs/brave.nix
+    ./programs/dev/cc.nix
+    ./programs/dev/java.nix
+    ./programs/dev/lua.nix
+    ./programs/dev/node.nix
+    ./programs/dev/python.nix
+    ./programs/dev/rust.nix
+    ./programs/dev/scala.nix
+    ./programs/dev/shell.nix
+    ./programs/dev/zig.nix
+    ./programs/emulators.nix
+    ./programs/firefox.nix
+    ./programs/forensics.nix
+    ./programs/git
+    ./programs/gpg.nix
+    ./programs/graphics.nix
+    ./programs/libreoffice.nix
+    ./programs/lutris.nix
+    ./programs/neovim.nix
+    ./programs/pass.nix
+    ./programs/qbittorrent.nix
+    ./programs/recording.nix
+    ./programs/slack.nix
+    ./programs/steam.nix
+    ./programs/thunderbird.nix
+    ./programs/vscode.nix
+    ./programs/zoom.nix
+    ./shell/zsh
+  ];
+}
diff --git a/modules/nixos/options.nix b/modules/home-manager/options.nix
similarity index 100%
rename from modules/nixos/options.nix
rename to modules/home-manager/options.nix
diff --git a/modules/nixos/desktop/browsers/brave.nix b/modules/home-manager/programs/brave.nix
similarity index 69%
rename from modules/nixos/desktop/browsers/brave.nix
rename to modules/home-manager/programs/brave.nix
index 34efee0..72949e5 100644
--- a/modules/nixos/desktop/browsers/brave.nix
+++ b/modules/home-manager/programs/brave.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.browsers.brave;
+let cfg = config.modules.programs.brave;
 in {
-  options.modules.desktop.browsers.brave = {
+  options.modules.programs.brave = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/dev/cc.nix b/modules/home-manager/programs/dev/cc.nix
similarity index 77%
rename from modules/nixos/dev/cc.nix
rename to modules/home-manager/programs/dev/cc.nix
index 924f762..8708015 100644
--- a/modules/nixos/dev/cc.nix
+++ b/modules/home-manager/programs/dev/cc.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.cc;
+let cfg = config.modules.programs.dev.cc;
 in {
-  options.modules.dev.cc = {
+  options.modules.programs.dev.cc = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/dev/java.nix b/modules/home-manager/programs/dev/java.nix
similarity index 71%
rename from modules/nixos/dev/java.nix
rename to modules/home-manager/programs/dev/java.nix
index 41033ad..d355505 100644
--- a/modules/nixos/dev/java.nix
+++ b/modules/home-manager/programs/dev/java.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.java;
+let cfg = config.modules.programs.dev.java;
 in {
-  options.modules.dev.java = {
+  options.modules.programs.dev.java = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/dev/lua.nix b/modules/home-manager/programs/dev/lua.nix
similarity index 71%
rename from modules/nixos/dev/lua.nix
rename to modules/home-manager/programs/dev/lua.nix
index 547d912..5e9c6ea 100644
--- a/modules/nixos/dev/lua.nix
+++ b/modules/home-manager/programs/dev/lua.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.lua;
+let cfg = config.modules.programs.dev.lua;
 in {
-  options.modules.dev.lua = {
+  options.modules.programs.dev.lua = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/dev/node.nix b/modules/home-manager/programs/dev/node.nix
similarity index 72%
rename from modules/nixos/dev/node.nix
rename to modules/home-manager/programs/dev/node.nix
index fe486b1..a78545a 100644
--- a/modules/nixos/dev/node.nix
+++ b/modules/home-manager/programs/dev/node.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.node;
+let cfg = config.modules.programs.dev.node;
 in {
-  options.modules.dev.node = {
+  options.modules.programs.dev.node = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/dev/python.nix b/modules/home-manager/programs/dev/python.nix
similarity index 71%
rename from modules/nixos/dev/python.nix
rename to modules/home-manager/programs/dev/python.nix
index 32d0bc6..e5b2e60 100644
--- a/modules/nixos/dev/python.nix
+++ b/modules/home-manager/programs/dev/python.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.python;
+let cfg = config.modules.programs.dev.python;
 in {
-  options.modules.dev.python = {
+  options.modules.programs.dev.python = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/dev/rust.nix b/modules/home-manager/programs/dev/rust.nix
similarity index 75%
rename from modules/nixos/dev/rust.nix
rename to modules/home-manager/programs/dev/rust.nix
index d7767f1..4407161 100644
--- a/modules/nixos/dev/rust.nix
+++ b/modules/home-manager/programs/dev/rust.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.rust;
+let cfg = config.modules.programs.dev.rust;
 in {
-  options.modules.dev.rust = {
+  options.modules.programs.dev.rust = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/dev/scala.nix b/modules/home-manager/programs/dev/scala.nix
similarity index 72%
rename from modules/nixos/dev/scala.nix
rename to modules/home-manager/programs/dev/scala.nix
index 9b07f1d..6632afd 100644
--- a/modules/nixos/dev/scala.nix
+++ b/modules/home-manager/programs/dev/scala.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.scala;
+let cfg = config.modules.programs.dev.scala;
 in {
-  options.modules.dev.scala = {
+  options.modules.programs.dev.scala = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/dev/shell.nix b/modules/home-manager/programs/dev/shell.nix
similarity index 71%
rename from modules/nixos/dev/shell.nix
rename to modules/home-manager/programs/dev/shell.nix
index f3eabb2..53f6fbf 100644
--- a/modules/nixos/dev/shell.nix
+++ b/modules/home-manager/programs/dev/shell.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.shell;
+let cfg = config.modules.programs.dev.shell;
 in {
-  options.modules.dev.shell = {
+  options.modules.programs.dev.shell = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/dev/zig.nix b/modules/home-manager/programs/dev/zig.nix
similarity index 71%
rename from modules/nixos/dev/zig.nix
rename to modules/home-manager/programs/dev/zig.nix
index e237073..7f798f3 100644
--- a/modules/nixos/dev/zig.nix
+++ b/modules/home-manager/programs/dev/zig.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.zig;
+let cfg = config.modules.programs.dev.zig;
 in {
-  options.modules.dev.zig = {
+  options.modules.programs.dev.zig = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/desktop/gaming/emulators.nix b/modules/home-manager/programs/emulators.nix
similarity index 94%
rename from modules/nixos/desktop/gaming/emulators.nix
rename to modules/home-manager/programs/emulators.nix
index 0399e30..6cca02b 100644
--- a/modules/nixos/desktop/gaming/emulators.nix
+++ b/modules/home-manager/programs/emulators.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.gaming.emulators;
+let cfg = config.modules.programs.emulators;
 in {
-  options.modules.desktop.gaming.emulators = {
+  options.modules.programs.emulators = {
     ds.enable       = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/desktop/browsers/firefox.nix b/modules/home-manager/programs/firefox.nix
similarity index 98%
rename from modules/nixos/desktop/browsers/firefox.nix
rename to modules/home-manager/programs/firefox.nix
index 23d2132..c73e884 100644
--- a/modules/nixos/desktop/browsers/firefox.nix
+++ b/modules/home-manager/programs/firefox.nix
@@ -1,8 +1,8 @@
 { config, lib, self, ... }:
 
-let cfg = config.modules.desktop.browsers.firefox;
+let cfg = config.modules.programs.firefox;
 in {
-  options.modules.desktop.browsers.firefox = {
+  options.modules.programs.firefox = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/desktop/forensics.nix b/modules/home-manager/programs/forensics.nix
similarity index 80%
rename from modules/nixos/desktop/forensics.nix
rename to modules/home-manager/programs/forensics.nix
index ad5850c..b943a88 100644
--- a/modules/nixos/desktop/forensics.nix
+++ b/modules/home-manager/programs/forensics.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.forensics;
+let cfg = config.modules.programs.forensics;
 in {
-  options.modules.desktop.forensics = {
+  options.modules.programs.forensics = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/shell/git/default.nix b/modules/home-manager/programs/git/default.nix
similarity index 91%
rename from modules/nixos/shell/git/default.nix
rename to modules/home-manager/programs/git/default.nix
index ac71379..0e2d51b 100644
--- a/modules/nixos/shell/git/default.nix
+++ b/modules/home-manager/programs/git/default.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.shell.git;
+let cfg = config.modules.programs.git;
 in {
-  options.modules.shell.git = {
+  options.modules.programs.git = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/shell/git/ignore b/modules/home-manager/programs/git/ignore
similarity index 100%
rename from modules/nixos/shell/git/ignore
rename to modules/home-manager/programs/git/ignore
diff --git a/modules/nixos/security/gpg.nix b/modules/home-manager/programs/gpg.nix
similarity index 80%
rename from modules/nixos/security/gpg.nix
rename to modules/home-manager/programs/gpg.nix
index 62d6b4b..b5f99b3 100644
--- a/modules/nixos/security/gpg.nix
+++ b/modules/home-manager/programs/gpg.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.security.gpg;
+let cfg = config.modules.programs.gpg;
 in {
-  options.modules.security.gpg = {
+  options.modules.programs.gpg = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/desktop/media/graphics.nix b/modules/home-manager/programs/graphics.nix
similarity index 85%
rename from modules/nixos/desktop/media/graphics.nix
rename to modules/home-manager/programs/graphics.nix
index d79e1f0..dff0ab2 100644
--- a/modules/nixos/desktop/media/graphics.nix
+++ b/modules/home-manager/programs/graphics.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.media.graphics;
+let cfg = config.modules.programs.graphics;
 in {
-  options.modules.desktop.media.graphics = {
+  options.modules.programs.graphics = {
     modeling.enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/desktop/office/libreoffice.nix b/modules/home-manager/programs/libreoffice.nix
similarity index 80%
rename from modules/nixos/desktop/office/libreoffice.nix
rename to modules/home-manager/programs/libreoffice.nix
index 5074f19..94e7dcd 100644
--- a/modules/nixos/desktop/office/libreoffice.nix
+++ b/modules/home-manager/programs/libreoffice.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  cfg = config.modules.desktop.office.libreoffice;
+  cfg = config.modules.programs.libreoffice;
   # libreoffice-gtk4 = pkgs.libreoffice.override {
   #   extraMakeWrapperArgs = [
   #     "--set SAL_USE_VCLPLUGIN gtk4"
@@ -20,7 +20,7 @@ let
   #   });
   # };
 in {
-  options.modules.desktop.office.libreoffice = {
+  options.modules.programs.libreoffice = {
     enable = lib.mkOption {
       default = false;
       example = true;
@@ -29,7 +29,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
-      (if config.modules.desktop.kde.enable == true then libreoffice-qt else libreoffice)
+      (if config.modules.system.desktop.kde.enable == true then libreoffice-qt else libreoffice)
       hunspell
       hunspellDicts.en-gb-large
       hunspellDicts.en-us-large
diff --git a/modules/nixos/desktop/gaming/lutris.nix b/modules/home-manager/programs/lutris.nix
similarity index 83%
rename from modules/nixos/desktop/gaming/lutris.nix
rename to modules/home-manager/programs/lutris.nix
index a12706e..9f4189a 100644
--- a/modules/nixos/desktop/gaming/lutris.nix
+++ b/modules/home-manager/programs/lutris.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.gaming.lutris;
+let cfg = config.modules.programs.lutris;
 in {
-  options.modules.desktop.gaming.lutris = {
+  options.modules.programs.lutris = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/editors/neovim/default.nix b/modules/home-manager/programs/neovim.nix
similarity index 97%
rename from modules/nixos/editors/neovim/default.nix
rename to modules/home-manager/programs/neovim.nix
index 047d0fa..45fd25a 100644
--- a/modules/nixos/editors/neovim/default.nix
+++ b/modules/home-manager/programs/neovim.nix
@@ -1,9 +1,9 @@
 { config, lib, pkgs, ... }:
 
 let
-  cfg = config.modules.editors.neovim;
+  cfg = config.modules.programs.neovim;
 in {
-  options.modules.editors.neovim = {
+  options.modules.programs.neovim = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/security/pass.nix b/modules/home-manager/programs/pass.nix
similarity index 79%
rename from modules/nixos/security/pass.nix
rename to modules/home-manager/programs/pass.nix
index 8572551..6f588a0 100644
--- a/modules/nixos/security/pass.nix
+++ b/modules/home-manager/programs/pass.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.security.pass;
+let cfg = config.modules.programs.pass;
 in {
-  options.modules.security.pass = {
+  options.modules.programs.pass = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/desktop/apps/qbittorrent.nix b/modules/home-manager/programs/qbittorrent.nix
similarity index 68%
rename from modules/nixos/desktop/apps/qbittorrent.nix
rename to modules/home-manager/programs/qbittorrent.nix
index e3b59f0..c5a5068 100644
--- a/modules/nixos/desktop/apps/qbittorrent.nix
+++ b/modules/home-manager/programs/qbittorrent.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.apps.qbittorrent;
+let cfg = config.modules.programs.qbittorrent;
 in {
-  options.modules.desktop.apps.qbittorrent = {
+  options.modules.programs.qbittorrent = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/desktop/media/recording.nix b/modules/home-manager/programs/recording.nix
similarity index 82%
rename from modules/nixos/desktop/media/recording.nix
rename to modules/home-manager/programs/recording.nix
index b1424bf..d16aeab 100644
--- a/modules/nixos/desktop/media/recording.nix
+++ b/modules/home-manager/programs/recording.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.media.recording;
+let cfg = config.modules.programs.recording;
 in {
-  options.modules.desktop.media.recording = {
+  options.modules.programs.recording = {
     audio.enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/desktop/apps/slack.nix b/modules/home-manager/programs/slack.nix
similarity index 71%
rename from modules/nixos/desktop/apps/slack.nix
rename to modules/home-manager/programs/slack.nix
index e6abb17..454594d 100644
--- a/modules/nixos/desktop/apps/slack.nix
+++ b/modules/home-manager/programs/slack.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.apps.slack;
+let cfg = config.modules.programs.slack;
 in {
-  options.modules.desktop.apps.slack = {
+  options.modules.programs.slack = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/desktop/gaming/steam.nix b/modules/home-manager/programs/steam.nix
similarity index 73%
rename from modules/nixos/desktop/gaming/steam.nix
rename to modules/home-manager/programs/steam.nix
index 62fb5c1..3be32dd 100644
--- a/modules/nixos/desktop/gaming/steam.nix
+++ b/modules/home-manager/programs/steam.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.gaming.steam;
+let cfg = config.modules.programs.steam;
 in {
-  options.modules.desktop.gaming.steam = {
+  options.modules.programs.steam = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/desktop/apps/thunderbird.nix b/modules/home-manager/programs/thunderbird.nix
similarity index 88%
rename from modules/nixos/desktop/apps/thunderbird.nix
rename to modules/home-manager/programs/thunderbird.nix
index 0578c61..64c05c2 100644
--- a/modules/nixos/desktop/apps/thunderbird.nix
+++ b/modules/home-manager/programs/thunderbird.nix
@@ -1,8 +1,8 @@
 { config, lib, self, ... }:
 
-let cfg = config.modules.desktop.apps.thunderbird;
+let cfg = config.modules.programs.thunderbird;
 in {
-  options.modules.desktop.apps.thunderbird = {
+  options.modules.programs.thunderbird = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/editors/vscode.nix b/modules/home-manager/programs/vscode.nix
similarity index 94%
rename from modules/nixos/editors/vscode.nix
rename to modules/home-manager/programs/vscode.nix
index 1c525af..5d54027 100644
--- a/modules/nixos/editors/vscode.nix
+++ b/modules/home-manager/programs/vscode.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.editors.vscode;
+let cfg = config.modules.programs.vscode;
 in {
-  options.modules.editors.vscode = {
+  options.modules.programs.vscode = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/desktop/apps/zoom.nix b/modules/home-manager/programs/zoom.nix
similarity index 71%
rename from modules/nixos/desktop/apps/zoom.nix
rename to modules/home-manager/programs/zoom.nix
index 8c651c3..adb0136 100644
--- a/modules/nixos/desktop/apps/zoom.nix
+++ b/modules/home-manager/programs/zoom.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.apps.zoom;
+let cfg = config.modules.programs.zoom;
 in {
-  options.modules.desktop.apps.zoom = {
+  options.modules.programs.zoom = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/shell/zsh/.zshrc b/modules/home-manager/shell/zsh/.zshrc
similarity index 100%
rename from modules/nixos/shell/zsh/.zshrc
rename to modules/home-manager/shell/zsh/.zshrc
diff --git a/modules/nixos/shell/zsh/aliases.zsh b/modules/home-manager/shell/zsh/aliases.zsh
similarity index 100%
rename from modules/nixos/shell/zsh/aliases.zsh
rename to modules/home-manager/shell/zsh/aliases.zsh
diff --git a/modules/nixos/shell/zsh/completion.zsh b/modules/home-manager/shell/zsh/completion.zsh
similarity index 100%
rename from modules/nixos/shell/zsh/completion.zsh
rename to modules/home-manager/shell/zsh/completion.zsh
diff --git a/modules/nixos/shell/zsh/config.zsh b/modules/home-manager/shell/zsh/config.zsh
similarity index 100%
rename from modules/nixos/shell/zsh/config.zsh
rename to modules/home-manager/shell/zsh/config.zsh
diff --git a/modules/nixos/shell/zsh/default.nix b/modules/home-manager/shell/zsh/default.nix
similarity index 100%
rename from modules/nixos/shell/zsh/default.nix
rename to modules/home-manager/shell/zsh/default.nix
diff --git a/modules/nixos/shell/zsh/keybinds.zsh b/modules/home-manager/shell/zsh/keybinds.zsh
similarity index 100%
rename from modules/nixos/shell/zsh/keybinds.zsh
rename to modules/home-manager/shell/zsh/keybinds.zsh
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index a5ff39d..55f2231 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,53 +1,24 @@
 {
   imports = [
-    ./options.nix
+    ./hardware/presonus-studio
     ./podman.nix
-    ./databases/postgresql.nix
-    ./desktop/gnome.nix
-    ./desktop/forensics.nix
-    ./desktop/hyprland.nix
-    ./desktop/kde.nix
-    ./desktop/mimeapps.nix
-    ./desktop/apps/qbittorrent.nix
-    ./desktop/apps/slack.nix
-    ./desktop/apps/thunderbird.nix
-    ./desktop/apps/zoom.nix
-    ./desktop/browsers/brave.nix
-    ./desktop/browsers/firefox.nix
-    ./desktop/gaming/emulators.nix
-    ./desktop/gaming/lutris.nix
-    ./desktop/gaming/steam.nix
-    ./desktop/media/graphics.nix
-    ./desktop/media/recording.nix
-    ./desktop/office/libreoffice.nix
-    ./dev/cc.nix
-    ./dev/java.nix
-    ./dev/lua.nix
-    ./dev/node.nix
-    ./dev/python.nix
-    ./dev/rust.nix
-    ./dev/scala.nix
-    ./dev/shell.nix
-    ./dev/zig.nix
-    ./editors/neovim
-    ./editors/vscode.nix
-    ./hardware/presonus-studio.nix
-    ./networking/netbird.nix
-    ./networking/tailscale.nix
-    ./networking/wireless.nix
-    ./security/gpg.nix
-    ./security/pass.nix
-    ./services/borgmatic
-    ./services/chrony
-    ./services/coturn
-    ./services/gitea
-    ./services/gitea-runner
-    ./services/headscale
-    ./services/mail
-    ./services/matrix
-    ./services/nginx
-    ./services/photoprism
-    ./shell/git
-    ./shell/zsh
+    ./services/borgmatic.nix
+    ./services/chrony.nix
+    ./services/coturn.nix
+    ./services/gitea.nix
+    ./services/gitea-runner.nix
+    ./services/headscale.nix
+    ./services/mail.nix
+    ./services/matrix.nix
+    ./services/netbird.nix
+    ./services/nginx.nix
+    ./services/photoprism.nix
+    ./services/postgresql.nix
+    ./services/tailscale.nix
+    ./system/desktop/gnome.nix
+    ./system/desktop/hyprland.nix
+    ./system/desktop/kde.nix
+    ./system/desktop/mimeapps.nix
+    ./system/wireless.nix
   ];
 }
diff --git a/modules/nixos/hardware/0001-Update-device-ID-for-PreSonus-1824c.patch b/modules/nixos/hardware/presonus-studio/0001-Update-device-ID-for-PreSonus-1824c.patch
similarity index 100%
rename from modules/nixos/hardware/0001-Update-device-ID-for-PreSonus-1824c.patch
rename to modules/nixos/hardware/presonus-studio/0001-Update-device-ID-for-PreSonus-1824c.patch
diff --git a/modules/nixos/hardware/presonus-studio.nix b/modules/nixos/hardware/presonus-studio/default.nix
similarity index 100%
rename from modules/nixos/hardware/presonus-studio.nix
rename to modules/nixos/hardware/presonus-studio/default.nix
diff --git a/modules/nixos/hardware/snd-usb-audio.nix b/modules/nixos/hardware/presonus-studio/snd-usb-audio.nix
similarity index 100%
rename from modules/nixos/hardware/snd-usb-audio.nix
rename to modules/nixos/hardware/presonus-studio/snd-usb-audio.nix
diff --git a/modules/nixos/services/borgmatic/default.nix b/modules/nixos/services/borgmatic.nix
similarity index 100%
rename from modules/nixos/services/borgmatic/default.nix
rename to modules/nixos/services/borgmatic.nix
diff --git a/modules/nixos/services/chrony/default.nix b/modules/nixos/services/chrony.nix
similarity index 100%
rename from modules/nixos/services/chrony/default.nix
rename to modules/nixos/services/chrony.nix
diff --git a/modules/nixos/services/coturn/default.nix b/modules/nixos/services/coturn.nix
similarity index 100%
rename from modules/nixos/services/coturn/default.nix
rename to modules/nixos/services/coturn.nix
diff --git a/modules/nixos/services/gitea-runner/default.nix b/modules/nixos/services/gitea-runner.nix
similarity index 100%
rename from modules/nixos/services/gitea-runner/default.nix
rename to modules/nixos/services/gitea-runner.nix
diff --git a/modules/nixos/services/gitea/default.nix b/modules/nixos/services/gitea.nix
similarity index 100%
rename from modules/nixos/services/gitea/default.nix
rename to modules/nixos/services/gitea.nix
diff --git a/modules/nixos/services/headscale/default.nix b/modules/nixos/services/headscale.nix
similarity index 100%
rename from modules/nixos/services/headscale/default.nix
rename to modules/nixos/services/headscale.nix
diff --git a/modules/nixos/services/mail/default.nix b/modules/nixos/services/mail.nix
similarity index 100%
rename from modules/nixos/services/mail/default.nix
rename to modules/nixos/services/mail.nix
diff --git a/modules/nixos/services/matrix/default.nix b/modules/nixos/services/matrix.nix
similarity index 100%
rename from modules/nixos/services/matrix/default.nix
rename to modules/nixos/services/matrix.nix
diff --git a/modules/nixos/networking/netbird.nix b/modules/nixos/services/netbird.nix
similarity index 96%
rename from modules/nixos/networking/netbird.nix
rename to modules/nixos/services/netbird.nix
index c7c4664..7a109e7 100644
--- a/modules/nixos/networking/netbird.nix
+++ b/modules/nixos/services/netbird.nix
@@ -1,10 +1,10 @@
 { config, lib, self, ... }:
 
 let
-  cfg = config.modules.networking.netbird;
+  cfg = config.modules.services.netbird;
   hostname = config.networking.hostName;
 in {
-  options.modules.networking.netbird = {
+  options.modules.services.netbird = {
     enable = lib.mkEnableOption "netbird";
     coordinatorDomain = lib.mkOption {
       type = lib.types.str;
diff --git a/modules/nixos/services/nginx/default.nix b/modules/nixos/services/nginx.nix
similarity index 100%
rename from modules/nixos/services/nginx/default.nix
rename to modules/nixos/services/nginx.nix
diff --git a/modules/nixos/services/photoprism/default.nix b/modules/nixos/services/photoprism.nix
similarity index 100%
rename from modules/nixos/services/photoprism/default.nix
rename to modules/nixos/services/photoprism.nix
diff --git a/modules/nixos/databases/postgresql.nix b/modules/nixos/services/postgresql.nix
similarity index 87%
rename from modules/nixos/databases/postgresql.nix
rename to modules/nixos/services/postgresql.nix
index 4f8cde6..8de4b35 100644
--- a/modules/nixos/databases/postgresql.nix
+++ b/modules/nixos/services/postgresql.nix
@@ -5,9 +5,9 @@
 }:
 
 let
-  cfg = config.modules.databases.postgresql;
+  cfg = config.modules.services.postgresql;
 in {
-  options.modules.databases.postgresql = {
+  options.modules.services.postgresql = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/networking/tailscale.nix b/modules/nixos/services/tailscale.nix
similarity index 92%
rename from modules/nixos/networking/tailscale.nix
rename to modules/nixos/services/tailscale.nix
index 7266a66..cccdb69 100644
--- a/modules/nixos/networking/tailscale.nix
+++ b/modules/nixos/services/tailscale.nix
@@ -1,11 +1,11 @@
 { config, lib, pkgs, self, ... }:
 
 let
-  cfg = config.modules.networking.tailscale;
+  cfg = config.modules.services.tailscale;
   headscale = "https://headscale.vimium.net";
   hostname = config.networking.hostName;
 in {
-  options.modules.networking.tailscale = {
+  options.modules.services.tailscale = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/desktop/gnome.nix b/modules/nixos/system/desktop/gnome.nix
similarity index 98%
rename from modules/nixos/desktop/gnome.nix
rename to modules/nixos/system/desktop/gnome.nix
index f5e7826..7389b80 100644
--- a/modules/nixos/desktop/gnome.nix
+++ b/modules/nixos/system/desktop/gnome.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, self, ... }:
 
-let cfg = config.modules.desktop.gnome;
+let cfg = config.modules.system.desktop.gnome;
 in {
-  options.modules.desktop.gnome = {
+  options.modules.system.desktop.gnome = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/desktop/hyprland.nix b/modules/nixos/system/desktop/hyprland.nix
similarity index 81%
rename from modules/nixos/desktop/hyprland.nix
rename to modules/nixos/system/desktop/hyprland.nix
index 6afcdb9..7455cf7 100644
--- a/modules/nixos/desktop/hyprland.nix
+++ b/modules/nixos/system/desktop/hyprland.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.hyprland;
+let cfg = config.modules.system.desktop.hyprland;
 in {
-  options.modules.desktop.hyprland = {
+  options.modules.system.desktop.hyprland = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/system/desktop/kde.nix
similarity index 87%
rename from modules/nixos/desktop/kde.nix
rename to modules/nixos/system/desktop/kde.nix
index 7b7020c..0adc39a 100644
--- a/modules/nixos/desktop/kde.nix
+++ b/modules/nixos/system/desktop/kde.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.kde;
+let cfg = config.modules.system.desktop.kde;
 in {
-  options.modules.desktop.kde = {
+  options.modules.system.desktop.kde = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/desktop/mimeapps.nix b/modules/nixos/system/desktop/mimeapps.nix
similarity index 97%
rename from modules/nixos/desktop/mimeapps.nix
rename to modules/nixos/system/desktop/mimeapps.nix
index f098350..a3bb9de 100644
--- a/modules/nixos/desktop/mimeapps.nix
+++ b/modules/nixos/system/desktop/mimeapps.nix
@@ -1,11 +1,11 @@
 { config, lib, pkgs, ... }:
 
 let
-  cfg = config.modules.desktop.mimeapps;
+  cfg = config.modules.system.desktop.mimeapps;
   avApp = "io.github.celluloid_player.Celluloid.desktop";
   imageApp = "org.gnome.eog.desktop";
 in {
-  options.modules.desktop.mimeapps = {
+  options.modules.system.desktop.mimeapps = {
     enable = lib.mkOption {
       default = false;
       example = true;
diff --git a/modules/nixos/networking/wireless.nix b/modules/nixos/system/wireless.nix
similarity index 94%
rename from modules/nixos/networking/wireless.nix
rename to modules/nixos/system/wireless.nix
index 87e96ce..0326b4b 100644
--- a/modules/nixos/networking/wireless.nix
+++ b/modules/nixos/system/wireless.nix
@@ -2,9 +2,9 @@
 
 with lib;
 
-let cfg = config.modules.networking.wireless;
+let cfg = config.modules.system.wireless;
 in {
-  options.modules.networking.wireless = {
+  options.modules.system.wireless = {
     enable = mkOption {
       default = false;
       example = true;