diff --git a/flake/modules.nix b/flake/modules.nix
index 2a39f89..e9dcc65 100644
--- a/flake/modules.nix
+++ b/flake/modules.nix
@@ -4,7 +4,7 @@ let
 in
 {
   flake.nixosModules = {
-    nixos.imports = modulesOf "${self}/modules/nixos";
-    home-manager.imports = modulesOf "${self}/modules/home-manager";
+    system.imports = modulesOf "${self}/modules/system";
+    home.imports = modulesOf "${self}/modules/home";
   };
 }
diff --git a/hosts/common.nix b/hosts/common.nix
index 5bb28be..9002ea1 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -1,7 +1,7 @@
 { self, pkgs, ... }:
 {
   imports = [
-    self.nixosModules.nixos
+    self.nixosModules.system
     self.nixosModules.wrappers
   ];
 
diff --git a/modules/home-manager/equalizer/default.nix b/modules/home/equalizer/default.nix
similarity index 100%
rename from modules/home-manager/equalizer/default.nix
rename to modules/home/equalizer/default.nix
diff --git a/modules/home-manager/equalizer/output/ESP95X.json b/modules/home/equalizer/output/ESP95X.json
similarity index 100%
rename from modules/home-manager/equalizer/output/ESP95X.json
rename to modules/home/equalizer/output/ESP95X.json
diff --git a/modules/home-manager/equalizer/output/default.json b/modules/home/equalizer/output/default.json
similarity index 100%
rename from modules/home-manager/equalizer/output/default.json
rename to modules/home/equalizer/output/default.json
diff --git a/modules/home-manager/flatpak.nix b/modules/home/flatpak.nix
similarity index 100%
rename from modules/home-manager/flatpak.nix
rename to modules/home/flatpak.nix
diff --git a/modules/home-manager/git.nix b/modules/home/git.nix
similarity index 100%
rename from modules/home-manager/git.nix
rename to modules/home/git.nix
diff --git a/modules/home-manager/hyprland/default.nix b/modules/home/hyprland/default.nix
similarity index 100%
rename from modules/home-manager/hyprland/default.nix
rename to modules/home/hyprland/default.nix
diff --git a/modules/home-manager/hyprland/keybinds.nix b/modules/home/hyprland/keybinds.nix
similarity index 100%
rename from modules/home-manager/hyprland/keybinds.nix
rename to modules/home/hyprland/keybinds.nix
diff --git a/modules/home-manager/night-light.nix b/modules/home/night-light.nix
similarity index 100%
rename from modules/home-manager/night-light.nix
rename to modules/home/night-light.nix
diff --git a/modules/home-manager/shell/aliases.nix b/modules/home/shell/aliases.nix
similarity index 100%
rename from modules/home-manager/shell/aliases.nix
rename to modules/home/shell/aliases.nix
diff --git a/modules/home-manager/shell/default.nix b/modules/home/shell/default.nix
similarity index 100%
rename from modules/home-manager/shell/default.nix
rename to modules/home/shell/default.nix
diff --git a/modules/home-manager/shell/p10k/default.nix b/modules/home/shell/p10k/default.nix
similarity index 100%
rename from modules/home-manager/shell/p10k/default.nix
rename to modules/home/shell/p10k/default.nix
diff --git a/modules/home-manager/shell/p10k/p10k.zsh b/modules/home/shell/p10k/p10k.zsh
similarity index 100%
rename from modules/home-manager/shell/p10k/p10k.zsh
rename to modules/home/shell/p10k/p10k.zsh
diff --git a/modules/home-manager/sops.nix b/modules/home/sops.nix
similarity index 100%
rename from modules/home-manager/sops.nix
rename to modules/home/sops.nix
diff --git a/modules/home-manager/theme.nix b/modules/home/theme.nix
similarity index 100%
rename from modules/home-manager/theme.nix
rename to modules/home/theme.nix
diff --git a/modules/home-manager/virtualisation.nix b/modules/home/virtualisation.nix
similarity index 100%
rename from modules/home-manager/virtualisation.nix
rename to modules/home/virtualisation.nix
diff --git a/modules/home-manager/vscode.nix b/modules/home/vscode.nix
similarity index 100%
rename from modules/home-manager/vscode.nix
rename to modules/home/vscode.nix
diff --git a/modules/nixos/auto-gc.nix b/modules/system/auto-gc.nix
similarity index 100%
rename from modules/nixos/auto-gc.nix
rename to modules/system/auto-gc.nix
diff --git a/modules/nixos/bluetooth.nix b/modules/system/bluetooth.nix
similarity index 100%
rename from modules/nixos/bluetooth.nix
rename to modules/system/bluetooth.nix
diff --git a/modules/nixos/boot.nix b/modules/system/boot.nix
similarity index 100%
rename from modules/nixos/boot.nix
rename to modules/system/boot.nix
diff --git a/modules/nixos/comma.nix b/modules/system/comma.nix
similarity index 100%
rename from modules/nixos/comma.nix
rename to modules/system/comma.nix
diff --git a/modules/nixos/de.nix b/modules/system/de.nix
similarity index 100%
rename from modules/nixos/de.nix
rename to modules/system/de.nix
diff --git a/modules/nixos/dm.nix b/modules/system/dm.nix
similarity index 100%
rename from modules/nixos/dm.nix
rename to modules/system/dm.nix
diff --git a/modules/nixos/flatpak.nix b/modules/system/flatpak.nix
similarity index 100%
rename from modules/nixos/flatpak.nix
rename to modules/system/flatpak.nix
diff --git a/modules/nixos/geoclue.nix b/modules/system/geoclue.nix
similarity index 100%
rename from modules/nixos/geoclue.nix
rename to modules/system/geoclue.nix
diff --git a/modules/nixos/nix-helper.nix b/modules/system/nix-helper.nix
similarity index 100%
rename from modules/nixos/nix-helper.nix
rename to modules/system/nix-helper.nix
diff --git a/modules/nixos/printing.nix b/modules/system/printing.nix
similarity index 100%
rename from modules/nixos/printing.nix
rename to modules/system/printing.nix
diff --git a/modules/nixos/sops.nix b/modules/system/sops.nix
similarity index 100%
rename from modules/nixos/sops.nix
rename to modules/system/sops.nix
diff --git a/modules/nixos/sound.nix b/modules/system/sound.nix
similarity index 100%
rename from modules/nixos/sound.nix
rename to modules/system/sound.nix
diff --git a/modules/nixos/syncthing.nix b/modules/system/syncthing.nix
similarity index 100%
rename from modules/nixos/syncthing.nix
rename to modules/system/syncthing.nix
diff --git a/modules/nixos/tailscale.nix b/modules/system/tailscale.nix
similarity index 100%
rename from modules/nixos/tailscale.nix
rename to modules/system/tailscale.nix
diff --git a/modules/nixos/virtualisation.nix b/modules/system/virtualisation.nix
similarity index 100%
rename from modules/nixos/virtualisation.nix
rename to modules/system/virtualisation.nix
diff --git a/modules/nixos/wlan.nix b/modules/system/wlan.nix
similarity index 100%
rename from modules/nixos/wlan.nix
rename to modules/system/wlan.nix
diff --git a/users/common.nix b/users/common.nix
index 7e62e25..bf4aa94 100644
--- a/users/common.nix
+++ b/users/common.nix
@@ -11,7 +11,7 @@
   };
 
   home-manager.sharedModules = [
-    self.nixosModules.home-manager
+    self.nixosModules.home
     self.nixosModules.wrappers
 
     {