diff --git a/home/toast/home.nix b/home/toast/home.nix
index e832f10..efc12e8 100644
--- a/home/toast/home.nix
+++ b/home/toast/home.nix
@@ -5,23 +5,23 @@
     inputs.nixcord.homeModules.nixcord
     inputs.nix-flatpak.homeManagerModules.nix-flatpak
     
-    ./programs/kitty.nix
-    ./programs/git.nix
-    ./programs/nixvim
-    ./programs/fonts.nix
-    ./programs/hyprland.nix
-    ./programs/tofi.nix
-    ./programs/zsh.nix
-    ./programs/firefox.nix
-    ./programs/yazi.nix
-    ./programs/nixcord.nix
-    ./programs/nodejs.nix
-    ./programs/btop.nix
-    ./programs/waybar
-    ./programs/dunst.nix
-    ./programs/keepassxc.nix
-    ./programs/mouse-actions
-    ./programs/hypridle.nix
+    ./modules/kitty.nix
+    ./modules/git.nix
+    ./modules/nixvim
+    ./modules/fonts.nix
+    ./modules/hyprland.nix
+    ./modules/tofi.nix
+    ./modules/zsh.nix
+    ./modules/firefox.nix
+    ./modules/yazi.nix
+    ./modules/nixcord.nix
+    ./modules/nodejs.nix
+    ./modules/btop.nix
+    ./modules/waybar
+    ./modules/dunst.nix
+    ./modules/keepassxc.nix
+    ./modules/mouse-actions
+    ./modules/hypridle.nix
   ];
   
   home = {
diff --git a/home/toast/programs/btop.nix b/home/toast/modules/btop.nix
similarity index 100%
rename from home/toast/programs/btop.nix
rename to home/toast/modules/btop.nix
diff --git a/home/toast/programs/dunst.nix b/home/toast/modules/dunst.nix
similarity index 100%
rename from home/toast/programs/dunst.nix
rename to home/toast/modules/dunst.nix
diff --git a/home/toast/programs/firefox.nix b/home/toast/modules/firefox.nix
similarity index 100%
rename from home/toast/programs/firefox.nix
rename to home/toast/modules/firefox.nix
diff --git a/home/toast/programs/fonts.nix b/home/toast/modules/fonts.nix
similarity index 100%
rename from home/toast/programs/fonts.nix
rename to home/toast/modules/fonts.nix
diff --git a/home/toast/programs/git.nix b/home/toast/modules/git.nix
similarity index 100%
rename from home/toast/programs/git.nix
rename to home/toast/modules/git.nix
diff --git a/home/toast/programs/hypridle.nix b/home/toast/modules/hypridle.nix
similarity index 100%
rename from home/toast/programs/hypridle.nix
rename to home/toast/modules/hypridle.nix
diff --git a/home/toast/programs/hyprland.nix b/home/toast/modules/hyprland.nix
similarity index 100%
rename from home/toast/programs/hyprland.nix
rename to home/toast/modules/hyprland.nix
diff --git a/home/toast/programs/keepassxc.nix b/home/toast/modules/keepassxc.nix
similarity index 100%
rename from home/toast/programs/keepassxc.nix
rename to home/toast/modules/keepassxc.nix
diff --git a/home/toast/programs/kitty.nix b/home/toast/modules/kitty.nix
similarity index 100%
rename from home/toast/programs/kitty.nix
rename to home/toast/modules/kitty.nix
diff --git a/home/toast/programs/mouse-actions/actions/autoclick.nix b/home/toast/modules/mouse-actions/actions/autoclick.nix
similarity index 100%
rename from home/toast/programs/mouse-actions/actions/autoclick.nix
rename to home/toast/modules/mouse-actions/actions/autoclick.nix
diff --git a/home/toast/programs/mouse-actions/actions/deafen.nix b/home/toast/modules/mouse-actions/actions/deafen.nix
similarity index 100%
rename from home/toast/programs/mouse-actions/actions/deafen.nix
rename to home/toast/modules/mouse-actions/actions/deafen.nix
diff --git a/home/toast/programs/mouse-actions/actions/default.nix b/home/toast/modules/mouse-actions/actions/default.nix
similarity index 100%
rename from home/toast/programs/mouse-actions/actions/default.nix
rename to home/toast/modules/mouse-actions/actions/default.nix
diff --git a/home/toast/programs/mouse-actions/actions/sober-lag.nix b/home/toast/modules/mouse-actions/actions/sober-lag.nix
similarity index 100%
rename from home/toast/programs/mouse-actions/actions/sober-lag.nix
rename to home/toast/modules/mouse-actions/actions/sober-lag.nix
diff --git a/home/toast/programs/mouse-actions/cycle.nix b/home/toast/modules/mouse-actions/cycle.nix
similarity index 100%
rename from home/toast/programs/mouse-actions/cycle.nix
rename to home/toast/modules/mouse-actions/cycle.nix
diff --git a/home/toast/programs/mouse-actions/default.nix b/home/toast/modules/mouse-actions/default.nix
similarity index 100%
rename from home/toast/programs/mouse-actions/default.nix
rename to home/toast/modules/mouse-actions/default.nix
diff --git a/home/toast/programs/mouse-actions/run.nix b/home/toast/modules/mouse-actions/run.nix
similarity index 100%
rename from home/toast/programs/mouse-actions/run.nix
rename to home/toast/modules/mouse-actions/run.nix
diff --git a/home/toast/programs/nixcord.nix b/home/toast/modules/nixcord.nix
similarity index 100%
rename from home/toast/programs/nixcord.nix
rename to home/toast/modules/nixcord.nix
diff --git a/home/toast/programs/nixvim/default.nix b/home/toast/modules/nixvim/default.nix
similarity index 100%
rename from home/toast/programs/nixvim/default.nix
rename to home/toast/modules/nixvim/default.nix
diff --git a/home/toast/programs/nixvim/keymaps.nix b/home/toast/modules/nixvim/keymaps.nix
similarity index 100%
rename from home/toast/programs/nixvim/keymaps.nix
rename to home/toast/modules/nixvim/keymaps.nix
diff --git a/home/toast/programs/nixvim/plugins/bufferline.nix b/home/toast/modules/nixvim/plugins/bufferline.nix
similarity index 100%
rename from home/toast/programs/nixvim/plugins/bufferline.nix
rename to home/toast/modules/nixvim/plugins/bufferline.nix
diff --git a/home/toast/programs/nixvim/plugins/cmp.nix b/home/toast/modules/nixvim/plugins/cmp.nix
similarity index 100%
rename from home/toast/programs/nixvim/plugins/cmp.nix
rename to home/toast/modules/nixvim/plugins/cmp.nix
diff --git a/home/toast/programs/nixvim/plugins/colorizer.nix b/home/toast/modules/nixvim/plugins/colorizer.nix
similarity index 100%
rename from home/toast/programs/nixvim/plugins/colorizer.nix
rename to home/toast/modules/nixvim/plugins/colorizer.nix
diff --git a/home/toast/programs/nixvim/plugins/comment.nix b/home/toast/modules/nixvim/plugins/comment.nix
similarity index 100%
rename from home/toast/programs/nixvim/plugins/comment.nix
rename to home/toast/modules/nixvim/plugins/comment.nix
diff --git a/home/toast/programs/nixvim/plugins/gitsigns.nix b/home/toast/modules/nixvim/plugins/gitsigns.nix
similarity index 100%
rename from home/toast/programs/nixvim/plugins/gitsigns.nix
rename to home/toast/modules/nixvim/plugins/gitsigns.nix
diff --git a/home/toast/programs/nixvim/plugins/lsp.nix b/home/toast/modules/nixvim/plugins/lsp.nix
similarity index 100%
rename from home/toast/programs/nixvim/plugins/lsp.nix
rename to home/toast/modules/nixvim/plugins/lsp.nix
diff --git a/home/toast/programs/nixvim/plugins/lualine.nix b/home/toast/modules/nixvim/plugins/lualine.nix
similarity index 100%
rename from home/toast/programs/nixvim/plugins/lualine.nix
rename to home/toast/modules/nixvim/plugins/lualine.nix
diff --git a/home/toast/programs/nixvim/plugins/nvim-autopairs.nix b/home/toast/modules/nixvim/plugins/nvim-autopairs.nix
similarity index 100%
rename from home/toast/programs/nixvim/plugins/nvim-autopairs.nix
rename to home/toast/modules/nixvim/plugins/nvim-autopairs.nix
diff --git a/home/toast/programs/nixvim/plugins/nvim-tree.nix b/home/toast/modules/nixvim/plugins/nvim-tree.nix
similarity index 100%
rename from home/toast/programs/nixvim/plugins/nvim-tree.nix
rename to home/toast/modules/nixvim/plugins/nvim-tree.nix
diff --git a/home/toast/programs/nixvim/plugins/telescope.nix b/home/toast/modules/nixvim/plugins/telescope.nix
similarity index 100%
rename from home/toast/programs/nixvim/plugins/telescope.nix
rename to home/toast/modules/nixvim/plugins/telescope.nix
diff --git a/home/toast/programs/nixvim/plugins/treesitter.nix b/home/toast/modules/nixvim/plugins/treesitter.nix
similarity index 100%
rename from home/toast/programs/nixvim/plugins/treesitter.nix
rename to home/toast/modules/nixvim/plugins/treesitter.nix
diff --git a/home/toast/programs/nixvim/plugins/wakatime.nix b/home/toast/modules/nixvim/plugins/wakatime.nix
similarity index 100%
rename from home/toast/programs/nixvim/plugins/wakatime.nix
rename to home/toast/modules/nixvim/plugins/wakatime.nix
diff --git a/home/toast/programs/nixvim/plugins/web-devicons.nix b/home/toast/modules/nixvim/plugins/web-devicons.nix
similarity index 100%
rename from home/toast/programs/nixvim/plugins/web-devicons.nix
rename to home/toast/modules/nixvim/plugins/web-devicons.nix
diff --git a/home/toast/programs/nixvim/plugins/which-key.nix b/home/toast/modules/nixvim/plugins/which-key.nix
similarity index 100%
rename from home/toast/programs/nixvim/plugins/which-key.nix
rename to home/toast/modules/nixvim/plugins/which-key.nix
diff --git a/home/toast/programs/nodejs.nix b/home/toast/modules/nodejs.nix
similarity index 100%
rename from home/toast/programs/nodejs.nix
rename to home/toast/modules/nodejs.nix
diff --git a/home/toast/programs/tofi.nix b/home/toast/modules/tofi.nix
similarity index 100%
rename from home/toast/programs/tofi.nix
rename to home/toast/modules/tofi.nix
diff --git a/home/toast/programs/waybar/default.nix b/home/toast/modules/waybar/default.nix
similarity index 100%
rename from home/toast/programs/waybar/default.nix
rename to home/toast/modules/waybar/default.nix
diff --git a/home/toast/programs/waybar/style.css b/home/toast/modules/waybar/style.css
similarity index 100%
rename from home/toast/programs/waybar/style.css
rename to home/toast/modules/waybar/style.css
diff --git a/home/toast/programs/yazi.nix b/home/toast/modules/yazi.nix
similarity index 100%
rename from home/toast/programs/yazi.nix
rename to home/toast/modules/yazi.nix
diff --git a/home/toast/programs/zsh.nix b/home/toast/modules/zsh.nix
similarity index 100%
rename from home/toast/programs/zsh.nix
rename to home/toast/modules/zsh.nix