diff --git a/hosts/MaxNixosLaptop/home.nix b/hosts/MaxNixosLaptop/home.nix
index 66a8dc9..38dc0df 100644
--- a/hosts/MaxNixosLaptop/home.nix
+++ b/hosts/MaxNixosLaptop/home.nix
@@ -4,21 +4,7 @@
   ...
 }: {
   imports = [
-    # sway as windowmanager
-    ../../modules/home-manager/sway.nix
-    # zsh config
-    ../../modules/home-manager/zsh.nix
-    # foot terminal emulator
-    ../../modules/home-manager/foot.nix
-    # often used terminal programs
-    ../../modules/home-manager/btop.nix
-    ../../modules/home-manager/bat.nix
-    ../../modules/home-manager/lazygit.nix
-    ../../modules/home-manager/git.nix
-    # use mpd for music
-    ../../modules/home-manager/mpd.nix
-    # email config
-    ../../modules/home-manager/thunderbird.nix
+    ../../modules/home
   ];
 
   # Home Manager needs a bit of information about you and the paths it should
diff --git a/modules/home/default.nix b/modules/home/default.nix
new file mode 100644
index 0000000..98aedf7
--- /dev/null
+++ b/modules/home/default.nix
@@ -0,0 +1,3 @@
+{...}: {
+  imports = [./git ./music ./programs ./shell ./sway];
+}
diff --git a/modules/home-manager/git.nix b/modules/home/git/default.nix
similarity index 100%
rename from modules/home-manager/git.nix
rename to modules/home/git/default.nix
diff --git a/modules/home-manager/lazygit.nix b/modules/home/git/lazygit.nix
similarity index 100%
rename from modules/home-manager/lazygit.nix
rename to modules/home/git/lazygit.nix
diff --git a/modules/home/music/default.nix b/modules/home/music/default.nix
new file mode 100644
index 0000000..44e1f27
--- /dev/null
+++ b/modules/home/music/default.nix
@@ -0,0 +1,3 @@
+{...}: {
+  imports = [./mpd.nix];
+}
diff --git a/modules/home-manager/mpd.nix b/modules/home/music/mpd.nix
similarity index 100%
rename from modules/home-manager/mpd.nix
rename to modules/home/music/mpd.nix
diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix
new file mode 100644
index 0000000..91d3801
--- /dev/null
+++ b/modules/home/programs/default.nix
@@ -0,0 +1,3 @@
+{...}: {
+  imports = [./foot.nix ./thunderbird.nix];
+}
diff --git a/modules/home-manager/foot.nix b/modules/home/programs/foot.nix
similarity index 100%
rename from modules/home-manager/foot.nix
rename to modules/home/programs/foot.nix
diff --git a/modules/home-manager/thunderbird.nix b/modules/home/programs/thunderbird.nix
similarity index 100%
rename from modules/home-manager/thunderbird.nix
rename to modules/home/programs/thunderbird.nix
diff --git a/modules/home-manager/bat.nix b/modules/home/shell/bat.nix
similarity index 100%
rename from modules/home-manager/bat.nix
rename to modules/home/shell/bat.nix
diff --git a/modules/home-manager/btop.nix b/modules/home/shell/btop.nix
similarity index 100%
rename from modules/home-manager/btop.nix
rename to modules/home/shell/btop.nix
diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix
new file mode 100644
index 0000000..115e88d
--- /dev/null
+++ b/modules/home/shell/default.nix
@@ -0,0 +1,3 @@
+{...}: {
+  imports = [./zsh.nix ./bat.nix ./btop.nix];
+}
diff --git a/modules/home-manager/zsh.nix b/modules/home/shell/zsh.nix
similarity index 100%
rename from modules/home-manager/zsh.nix
rename to modules/home/shell/zsh.nix
diff --git a/modules/home-manager/sway.nix b/modules/home/sway/default.nix
similarity index 100%
rename from modules/home-manager/sway.nix
rename to modules/home/sway/default.nix
diff --git a/modules/home-manager/waybar.css b/modules/home/sway/waybar.css
similarity index 100%
rename from modules/home-manager/waybar.css
rename to modules/home/sway/waybar.css