diff --git a/hosts/archlaptop-vm/home.nix b/hosts/archlaptop-vm/home.nix
index e63168b..8067937 100644
--- a/hosts/archlaptop-vm/home.nix
+++ b/hosts/archlaptop-vm/home.nix
@@ -24,9 +24,9 @@
   home.username = "gabe";
   home.homeDirectory = "/home/gabe";
   imports = [
-    ../../modules/home-manager/terminal/terminal.nix
-    ../../modules/home-manager/home-manager.nix
-    ../../modules/home-manager/kittty/kitty.nix
+    ../../modules/home-manager/terminal
+    ../../modules/home-manager
+    ../../modules/home-manager/kittty
     inputs.nixvim.homeManagerModules.nixvim
   ];
 }
diff --git a/hosts/gabe-archlaptop.nix b/hosts/gabe-archlaptop.nix
index 7846018..9712f25 100644
--- a/hosts/gabe-archlaptop.nix
+++ b/hosts/gabe-archlaptop.nix
@@ -24,7 +24,7 @@
   home.username = "gabe";
   home.homeDirectory = "/home/gabe";
   imports = [
-    ../modules/home-manager/terminal/terminal.nix
-    ../modules/home-manager/home-manager.nix
+    ../modules/home-manager/terminal
+    ../modules/home-manager
   ];
 }
diff --git a/hosts/gabe-workstation.nix b/hosts/gabe-workstation.nix
index 099cba4..d85725b 100644
--- a/hosts/gabe-workstation.nix
+++ b/hosts/gabe-workstation.nix
@@ -27,7 +27,7 @@
   home.username = "gabe";
   home.homeDirectory = "/home/gabe";
   imports = [
-    ../modules/home-manager/terminal/terminal.nix
-    ../modules/home-manager/home-manager.nix
+    ../modules/home-manager/terminal
+    ../modules/home-manager
   ];
 }
diff --git a/hosts/workstation-vm/home.nix b/hosts/workstation-vm/home.nix
index e63168b..8067937 100644
--- a/hosts/workstation-vm/home.nix
+++ b/hosts/workstation-vm/home.nix
@@ -24,9 +24,9 @@
   home.username = "gabe";
   home.homeDirectory = "/home/gabe";
   imports = [
-    ../../modules/home-manager/terminal/terminal.nix
-    ../../modules/home-manager/home-manager.nix
-    ../../modules/home-manager/kittty/kitty.nix
+    ../../modules/home-manager/terminal
+    ../../modules/home-manager
+    ../../modules/home-manager/kittty
     inputs.nixvim.homeManagerModules.nixvim
   ];
 }
diff --git a/modules/home-manager/home-manager.nix b/modules/home-manager/default.nix
similarity index 100%
rename from modules/home-manager/home-manager.nix
rename to modules/home-manager/default.nix
diff --git a/modules/home-manager/kittty/kitty.nix b/modules/home-manager/kittty/default.nix
similarity index 100%
rename from modules/home-manager/kittty/kitty.nix
rename to modules/home-manager/kittty/default.nix
diff --git a/modules/home-manager/terminal/terminal.nix b/modules/home-manager/terminal/default.nix
similarity index 94%
rename from modules/home-manager/terminal/terminal.nix
rename to modules/home-manager/terminal/default.nix
index a9f57c8..02341fd 100644
--- a/modules/home-manager/terminal/terminal.nix
+++ b/modules/home-manager/terminal/default.nix
@@ -39,13 +39,13 @@
   };
 
   imports = [
-    ./nushell/nushell.nix
+    ./nushell
     ./zsh.nix
     ./git.nix
     ./starship.nix
     ./voice.nix
-    ./nvim/nvim.nix
-    ./zellij/zellij.nix
+    ./nvim
+    ./zellij
   ];
 
   programs = {
diff --git a/modules/home-manager/terminal/nushell/nushell.nix b/modules/home-manager/terminal/nushell/default.nix
similarity index 100%
rename from modules/home-manager/terminal/nushell/nushell.nix
rename to modules/home-manager/terminal/nushell/default.nix
diff --git a/modules/home-manager/terminal/nvim/cmp/cmp.nix b/modules/home-manager/terminal/nvim/cmp/default.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/cmp/cmp.nix
rename to modules/home-manager/terminal/nvim/cmp/default.nix
diff --git a/modules/home-manager/terminal/nvim/nvim.nix b/modules/home-manager/terminal/nvim/default.nix
similarity index 89%
rename from modules/home-manager/terminal/nvim/nvim.nix
rename to modules/home-manager/terminal/nvim/default.nix
index 55e3a88..7baf16b 100644
--- a/modules/home-manager/terminal/nvim/nvim.nix
+++ b/modules/home-manager/terminal/nvim/default.nix
@@ -31,8 +31,8 @@
     ./gitsigns.nix
     ./which-key.nix
     ./telescope.nix
-    ./treesitter/treesitter.nix
-    ./cmp/cmp.nix
-    ./lsp/lsp.nix
+    ./treesitter
+    ./cmp
+    ./lsp
   ];
 }
diff --git a/modules/home-manager/terminal/nvim/lsp/lsp.nix b/modules/home-manager/terminal/nvim/lsp/default.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/lsp/lsp.nix
rename to modules/home-manager/terminal/nvim/lsp/default.nix
diff --git a/modules/home-manager/terminal/nvim/treesitter/treesitter.nix b/modules/home-manager/terminal/nvim/treesitter/default.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/treesitter/treesitter.nix
rename to modules/home-manager/terminal/nvim/treesitter/default.nix
diff --git a/modules/home-manager/terminal/zellij/zellij.nix b/modules/home-manager/terminal/zellij/default.nix
similarity index 100%
rename from modules/home-manager/terminal/zellij/zellij.nix
rename to modules/home-manager/terminal/zellij/default.nix