diff --git a/.sops.yaml b/.sops.yaml
index fc077f4..048e0db 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -46,7 +46,7 @@ creation_rules:
     key_groups:
       - age:
           - *user_mini_watcher
-  - path_regex: modules/system/common/secrets.yaml$
+  - path_regex: modules/hosts/common/secrets.yaml$
     key_groups:
       - age:
           - *system_hetznix01
diff --git a/lib/default.nix b/lib/default.nix
index 8d48919..3776697 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -2,10 +2,6 @@
   mkDarwinHost = import ./mkDarwinHost.nix { inherit inputs; };
   mkNixosHost = import ./mkNixosHost.nix { inherit inputs; };
 in {
-  inherit (mkDarwinHost)
-    mkDarwinHost
-    ;
-  inherit (mkNixosHost)
-    mkNixosHost
-    ;
-}
\ No newline at end of file
+  inherit (mkDarwinHost) mkDarwinHost;
+  inherit (mkNixosHost) mkNixosHost;
+}
diff --git a/lib/mkDarwinHost.nix b/lib/mkDarwinHost.nix
index 6321b16..86ce42f 100644
--- a/lib/mkDarwinHost.nix
+++ b/lib/mkDarwinHost.nix
@@ -26,13 +26,13 @@
           useUserPackages = true;
           users.${username}.imports = [
             inputs.sops-nix.homeManagerModule # user-level secrets management
-            ../modules/home-manager/hosts/${hostname}/${username}.nix 
+            ../modules/hosts/darwin/${hostname}/${username}.nix 
           ];
         };
       }
 
-      ../modules/system/common/all-darwin.nix # system-wide stuff
+      ../modules/hosts/darwin # system-wide stuff
       ../modules/hosts/darwin/${hostname} # host specific stuff
     ] ++ additionalModules; # end modules
   }; # end darwinSystem
-}
\ No newline at end of file
+}
diff --git a/lib/mkNixosHost.nix b/lib/mkNixosHost.nix
index 4cde129..5926afc 100644
--- a/lib/mkNixosHost.nix
+++ b/lib/mkNixosHost.nix
@@ -31,4 +31,4 @@
       ../modules/hosts/nixos/${hostname} # host specific stuff
     ] ++ additionalModules;
   };
-}
\ No newline at end of file
+}
diff --git a/modules/home-manager/common/all-gui.nix b/modules/hosts/common/all-gui.nix
similarity index 100%
rename from modules/home-manager/common/all-gui.nix
rename to modules/hosts/common/all-gui.nix
diff --git a/modules/home-manager/common/all-cli.nix b/modules/hosts/common/default.nix
similarity index 98%
rename from modules/home-manager/common/all-cli.nix
rename to modules/hosts/common/default.nix
index 4ec847b..0aefada 100644
--- a/modules/home-manager/common/all-cli.nix
+++ b/modules/hosts/common/default.nix
@@ -335,14 +335,14 @@ in {
 
   home.file = {
     ".config/nvim/lua/config" = {
-      source = ../files/nvim/lua/config;
+      source = ./files/nvim/lua/config;
       recursive = true;
     };
     ".config/nvim/lua/plugins" = {
-      source = ../files/nvim/lua/plugins;
+      source = ./files/nvim/lua/plugins;
       recursive = true;
     };
-    ".config/powershell/Microsoft.PowerShell_profile.ps1".source = ../files/Microsoft.PowerShell_profile.ps1;
-    ".config/powershell/Microsoft.VSCode_profile.ps1".source = ../files/Microsoft.PowerShell_profile.ps1;
+    ".config/powershell/Microsoft.PowerShell_profile.ps1".source = ./files/Microsoft.PowerShell_profile.ps1;
+    ".config/powershell/Microsoft.VSCode_profile.ps1".source = ./files/Microsoft.PowerShell_profile.ps1;
   };
 }
diff --git a/modules/home-manager/files/Microsoft.PowerShell_profile.ps1 b/modules/hosts/common/files/Microsoft.PowerShell_profile.ps1
similarity index 100%
rename from modules/home-manager/files/Microsoft.PowerShell_profile.ps1
rename to modules/hosts/common/files/Microsoft.PowerShell_profile.ps1
diff --git a/modules/home-manager/files/nvim/lua/config/vim-options.lua b/modules/hosts/common/files/nvim/lua/config/vim-options.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/config/vim-options.lua
rename to modules/hosts/common/files/nvim/lua/config/vim-options.lua
diff --git a/modules/home-manager/files/nvim/lua/disabled/barbar.lua b/modules/hosts/common/files/nvim/lua/disabled/barbar.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/disabled/barbar.lua
rename to modules/hosts/common/files/nvim/lua/disabled/barbar.lua
diff --git a/modules/home-manager/files/nvim/lua/disabled/cheatsheet.lua b/modules/hosts/common/files/nvim/lua/disabled/cheatsheet.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/disabled/cheatsheet.lua
rename to modules/hosts/common/files/nvim/lua/disabled/cheatsheet.lua
diff --git a/modules/home-manager/files/nvim/lua/disabled/nvim-tree.lua b/modules/hosts/common/files/nvim/lua/disabled/nvim-tree.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/disabled/nvim-tree.lua
rename to modules/hosts/common/files/nvim/lua/disabled/nvim-tree.lua
diff --git a/modules/home-manager/files/nvim/lua/disabled/themes/dracula.lua b/modules/hosts/common/files/nvim/lua/disabled/themes/dracula.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/disabled/themes/dracula.lua
rename to modules/hosts/common/files/nvim/lua/disabled/themes/dracula.lua
diff --git a/modules/home-manager/files/nvim/lua/disabled/themes/gruvbox.lua b/modules/hosts/common/files/nvim/lua/disabled/themes/gruvbox.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/disabled/themes/gruvbox.lua
rename to modules/hosts/common/files/nvim/lua/disabled/themes/gruvbox.lua
diff --git a/modules/home-manager/files/nvim/lua/disabled/themes/kanagawa.lua b/modules/hosts/common/files/nvim/lua/disabled/themes/kanagawa.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/disabled/themes/kanagawa.lua
rename to modules/hosts/common/files/nvim/lua/disabled/themes/kanagawa.lua
diff --git a/modules/home-manager/files/nvim/lua/disabled/themes/oxocarbon.lua b/modules/hosts/common/files/nvim/lua/disabled/themes/oxocarbon.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/disabled/themes/oxocarbon.lua
rename to modules/hosts/common/files/nvim/lua/disabled/themes/oxocarbon.lua
diff --git a/modules/home-manager/files/nvim/lua/disabled/themes/tokyonight.lua b/modules/hosts/common/files/nvim/lua/disabled/themes/tokyonight.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/disabled/themes/tokyonight.lua
rename to modules/hosts/common/files/nvim/lua/disabled/themes/tokyonight.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/alpha.lua b/modules/hosts/common/files/nvim/lua/plugins/alpha.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/alpha.lua
rename to modules/hosts/common/files/nvim/lua/plugins/alpha.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/bufferline.lua b/modules/hosts/common/files/nvim/lua/plugins/bufferline.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/bufferline.lua
rename to modules/hosts/common/files/nvim/lua/plugins/bufferline.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/catppuccin.lua b/modules/hosts/common/files/nvim/lua/plugins/catppuccin.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/catppuccin.lua
rename to modules/hosts/common/files/nvim/lua/plugins/catppuccin.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/completions.lua b/modules/hosts/common/files/nvim/lua/plugins/completions.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/completions.lua
rename to modules/hosts/common/files/nvim/lua/plugins/completions.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/edgy.lua b/modules/hosts/common/files/nvim/lua/plugins/edgy.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/edgy.lua
rename to modules/hosts/common/files/nvim/lua/plugins/edgy.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/git-stuff.lua b/modules/hosts/common/files/nvim/lua/plugins/git-stuff.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/git-stuff.lua
rename to modules/hosts/common/files/nvim/lua/plugins/git-stuff.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/lsp-config.lua b/modules/hosts/common/files/nvim/lua/plugins/lsp-config.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/lsp-config.lua
rename to modules/hosts/common/files/nvim/lua/plugins/lsp-config.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/lualine.lua b/modules/hosts/common/files/nvim/lua/plugins/lualine.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/lualine.lua
rename to modules/hosts/common/files/nvim/lua/plugins/lualine.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/neo-tree.lua b/modules/hosts/common/files/nvim/lua/plugins/neo-tree.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/neo-tree.lua
rename to modules/hosts/common/files/nvim/lua/plugins/neo-tree.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/noice.lua b/modules/hosts/common/files/nvim/lua/plugins/noice.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/noice.lua
rename to modules/hosts/common/files/nvim/lua/plugins/noice.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/none-ls.lua b/modules/hosts/common/files/nvim/lua/plugins/none-ls.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/none-ls.lua
rename to modules/hosts/common/files/nvim/lua/plugins/none-ls.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/nvim-web-devicons.lua b/modules/hosts/common/files/nvim/lua/plugins/nvim-web-devicons.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/nvim-web-devicons.lua
rename to modules/hosts/common/files/nvim/lua/plugins/nvim-web-devicons.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/telescope.lua b/modules/hosts/common/files/nvim/lua/plugins/telescope.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/telescope.lua
rename to modules/hosts/common/files/nvim/lua/plugins/telescope.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/todo-comments.lua b/modules/hosts/common/files/nvim/lua/plugins/todo-comments.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/todo-comments.lua
rename to modules/hosts/common/files/nvim/lua/plugins/todo-comments.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/toggleterm.lua b/modules/hosts/common/files/nvim/lua/plugins/toggleterm.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/toggleterm.lua
rename to modules/hosts/common/files/nvim/lua/plugins/toggleterm.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/treesitter.lua b/modules/hosts/common/files/nvim/lua/plugins/treesitter.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/treesitter.lua
rename to modules/hosts/common/files/nvim/lua/plugins/treesitter.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/trouble.lua b/modules/hosts/common/files/nvim/lua/plugins/trouble.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/trouble.lua
rename to modules/hosts/common/files/nvim/lua/plugins/trouble.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/vim-tmux-navigator.lua b/modules/hosts/common/files/nvim/lua/plugins/vim-tmux-navigator.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/vim-tmux-navigator.lua
rename to modules/hosts/common/files/nvim/lua/plugins/vim-tmux-navigator.lua
diff --git a/modules/home-manager/files/nvim/lua/plugins/which-key.lua b/modules/hosts/common/files/nvim/lua/plugins/which-key.lua
similarity index 100%
rename from modules/home-manager/files/nvim/lua/plugins/which-key.lua
rename to modules/hosts/common/files/nvim/lua/plugins/which-key.lua
diff --git a/modules/home-manager/files/tilix/Beanbag-Mathias.json b/modules/hosts/common/files/tilix/Beanbag-Mathias.json
similarity index 100%
rename from modules/home-manager/files/tilix/Beanbag-Mathias.json
rename to modules/hosts/common/files/tilix/Beanbag-Mathias.json
diff --git a/modules/home-manager/files/waybar/config b/modules/hosts/common/files/waybar/config
similarity index 100%
rename from modules/home-manager/files/waybar/config
rename to modules/hosts/common/files/waybar/config
diff --git a/modules/home-manager/files/waybar/style.css b/modules/hosts/common/files/waybar/style.css
similarity index 100%
rename from modules/home-manager/files/waybar/style.css
rename to modules/hosts/common/files/waybar/style.css
diff --git a/modules/home-manager/files/xfce4/terminal/accels.scm b/modules/hosts/common/files/xfce4/terminal/accels.scm
similarity index 100%
rename from modules/home-manager/files/xfce4/terminal/accels.scm
rename to modules/hosts/common/files/xfce4/terminal/accels.scm
diff --git a/modules/home-manager/files/xfce4/terminal/terminalrc b/modules/hosts/common/files/xfce4/terminal/terminalrc
similarity index 100%
rename from modules/home-manager/files/xfce4/terminal/terminalrc
rename to modules/hosts/common/files/xfce4/terminal/terminalrc
diff --git a/modules/system/common/secrets.yaml b/modules/hosts/common/secrets.yaml
similarity index 100%
rename from modules/system/common/secrets.yaml
rename to modules/hosts/common/secrets.yaml
diff --git a/modules/system/common/all-darwin.nix b/modules/hosts/darwin/default.nix
similarity index 100%
rename from modules/system/common/all-darwin.nix
rename to modules/hosts/darwin/default.nix
diff --git a/modules/home-manager/common/all-darwin.nix b/modules/hosts/darwin/home.nix
similarity index 100%
rename from modules/home-manager/common/all-darwin.nix
rename to modules/hosts/darwin/home.nix
diff --git a/modules/home-manager/hosts/mightymac/gene.liverman.nix b/modules/hosts/darwin/mightymac/gene.liverman.nix
similarity index 90%
rename from modules/home-manager/hosts/mightymac/gene.liverman.nix
rename to modules/hosts/darwin/mightymac/gene.liverman.nix
index 346236d..3643f6e 100644
--- a/modules/home-manager/hosts/mightymac/gene.liverman.nix
+++ b/modules/hosts/darwin/mightymac/gene.liverman.nix
@@ -1,9 +1,9 @@
 { username, ... }: {
   home.stateVersion = "23.11";
   imports = [
-    ../../common/all-cli.nix
+    ../home.nix
+    ../../common
     ../../common/all-gui.nix
-    ../../common/all-darwin.nix
   ];
 
   programs = {
diff --git a/modules/home-manager/hosts/mightymac/secrets.yaml b/modules/hosts/darwin/mightymac/secrets.yaml
similarity index 100%
rename from modules/home-manager/hosts/mightymac/secrets.yaml
rename to modules/hosts/darwin/mightymac/secrets.yaml