diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index 31ec2b5..03cccab 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -6,7 +6,7 @@
   home.username = "joshuaelm";
   home.homeDirectory = "/home/joshuaelm";
 
-  imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr ../../modules/ashell ../../modules/waybar/waybar.nix ../../modules/zen ../../modules/rofi ../../modules/kitty ../../modules/cava ../../modules/starship ../../modules/noctalia ../../modules/yazi ../../modules/fuzzel ../../modules/ghostty ../../modules/nushell ];
+  imports = [ ./modules ];
 
 
   home.packages = [
diff --git a/hosts/mac-laptop/home.nix b/hosts/mac-laptop/home.nix
index 1dd24ae..d4e853e 100644
--- a/hosts/mac-laptop/home.nix
+++ b/hosts/mac-laptop/home.nix
@@ -6,7 +6,7 @@
   home.username = "joshuaelm";
   home.homeDirectory = "/home/joshuaelm";
 
-  imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr/hyprland_laptop.nix ../../modules/waybar/waybar.nix ../../modules/ashell ../../modules/zen ../../modules/rofi ../../modules/kitty ../../modules/starship  ];
+  imports = [ ../../modules  ];
 
 
   home.packages = [
diff --git a/modules/default.nix b/modules/default.nix
new file mode 100644
index 0000000..f7d3258
--- /dev/null
+++ b/modules/default.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, inputs, ... }:
+
+{
+	imports = [ ./stylix ./cava ./hypr ./kitty ./noctalia ./nushell ./nvim ./starship ./yazi ./zen];
+}
diff --git a/modules/stylix.nix b/modules/stylix/stylix.nix
similarity index 100%
rename from modules/stylix.nix
rename to modules/stylix/stylix.nix