diff --git a/home-manager/home.nix b/home-manager/home.nix
index df1eaad..4807f15 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -15,15 +15,17 @@
     # Platform-specific configurations
     ./platform/darwin.nix
     ./platform/linux.nix
+
+    ./modules/packages.nix
     
-    # Modular configurations by program/tool
-    ./modules/git.nix
     ./modules/shells.nix
-    ./modules/cli-tools.nix
-    ./modules/terminal-emulators.nix
-    ./modules/editors.nix
-    ./modules/multiplexers.nix
-    ./modules/dev-tools.nix
+
+    ./modules/git.nix
+    ./modules/kitty.nix
+    ./modules/neovim.nix
+    ./modules/tmux.nix
+
+    ./modules/inbox.nix
     
     # If you want to use modules your own flake exports (from modules/home-manager):
     # inputs.self.homeManagerModules.example
diff --git a/home-manager/modules/dev-tools.nix b/home-manager/modules/inbox.nix
similarity index 100%
rename from home-manager/modules/dev-tools.nix
rename to home-manager/modules/inbox.nix
diff --git a/home-manager/modules/terminal-emulators.nix b/home-manager/modules/kitty.nix
similarity index 100%
rename from home-manager/modules/terminal-emulators.nix
rename to home-manager/modules/kitty.nix
diff --git a/home-manager/modules/editors.nix b/home-manager/modules/neovim.nix
similarity index 100%
rename from home-manager/modules/editors.nix
rename to home-manager/modules/neovim.nix
diff --git a/home-manager/modules/cli-tools.nix b/home-manager/modules/packages.nix
similarity index 100%
rename from home-manager/modules/cli-tools.nix
rename to home-manager/modules/packages.nix
diff --git a/home-manager/modules/multiplexers.nix b/home-manager/modules/tmux.nix
similarity index 100%
rename from home-manager/modules/multiplexers.nix
rename to home-manager/modules/tmux.nix