diff --git a/home/modules/default.nix b/home/modules/default.nix
index 4873c37..0c4f7a8 100644
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@@ -10,27 +10,7 @@
     ])
     ++ [
       ./nix.nix
-      ./helix
-      ./chromium.nix
-      ./gpg
-      ./git.nix
-      ./shell
-      ./ghostty.nix
-      ./foot
-      ./starship
-      ./sops.nix
-      ./fuzzel.nix
-      ./firefox.nix
-      ./niri.nix
-      ./wluma.nix
-      ./waybar.nix
-      ./mpv.nix
-      ./kvm.nix
-      ./atuin.nix
-      ./swaync.nix
-      ./swaylock.nix
-      ./thunderbird.nix
-      ./obs.nix
+      ./programs
     ];
 
   options = {
diff --git a/home/modules/atuin.nix b/home/modules/programs/atuin.nix
similarity index 100%
rename from home/modules/atuin.nix
rename to home/modules/programs/atuin.nix
diff --git a/home/modules/chromium.nix b/home/modules/programs/chromium.nix
similarity index 100%
rename from home/modules/chromium.nix
rename to home/modules/programs/chromium.nix
diff --git a/home/modules/programs/default.nix b/home/modules/programs/default.nix
new file mode 100644
index 0000000..9e38361
--- /dev/null
+++ b/home/modules/programs/default.nix
@@ -0,0 +1,26 @@
+{ ... }:
+{
+  imports = [
+    ./atuin.nix
+    ./firefox.nix
+    ./shell
+    ./kvm.nix
+    ./ghostty.nix
+    ./wluma.nix
+    ./niri.nix
+    ./starship
+    ./obs.nix
+    ./fuzzel.nix
+    ./mpv.nix
+    ./swaylock.nix
+    ./thunderbird.nix
+    ./chromium.nix
+    ./gpg
+    ./foot
+    ./sops.nix
+    ./git.nix
+    ./swaync.nix
+    ./helix
+    ./waybar.nix
+  ];
+}
diff --git a/home/modules/firefox.nix b/home/modules/programs/firefox.nix
similarity index 100%
rename from home/modules/firefox.nix
rename to home/modules/programs/firefox.nix
diff --git a/home/modules/foot/default.nix b/home/modules/programs/foot/default.nix
similarity index 100%
rename from home/modules/foot/default.nix
rename to home/modules/programs/foot/default.nix
diff --git a/home/modules/foot/foot.ini b/home/modules/programs/foot/foot.ini
similarity index 100%
rename from home/modules/foot/foot.ini
rename to home/modules/programs/foot/foot.ini
diff --git a/home/modules/fuzzel.nix b/home/modules/programs/fuzzel.nix
similarity index 100%
rename from home/modules/fuzzel.nix
rename to home/modules/programs/fuzzel.nix
diff --git a/home/modules/ghostty.nix b/home/modules/programs/ghostty.nix
similarity index 100%
rename from home/modules/ghostty.nix
rename to home/modules/programs/ghostty.nix
diff --git a/home/modules/git.nix b/home/modules/programs/git.nix
similarity index 100%
rename from home/modules/git.nix
rename to home/modules/programs/git.nix
diff --git a/home/modules/gpg/default.nix b/home/modules/programs/gpg/default.nix
similarity index 100%
rename from home/modules/gpg/default.nix
rename to home/modules/programs/gpg/default.nix
diff --git a/home/modules/gpg/public-key.txt b/home/modules/programs/gpg/public-key.txt
similarity index 100%
rename from home/modules/gpg/public-key.txt
rename to home/modules/programs/gpg/public-key.txt
diff --git a/home/modules/helix/config.toml b/home/modules/programs/helix/config.toml
similarity index 100%
rename from home/modules/helix/config.toml
rename to home/modules/programs/helix/config.toml
diff --git a/home/modules/helix/default.nix b/home/modules/programs/helix/default.nix
similarity index 100%
rename from home/modules/helix/default.nix
rename to home/modules/programs/helix/default.nix
diff --git a/home/modules/kvm.nix b/home/modules/programs/kvm.nix
similarity index 100%
rename from home/modules/kvm.nix
rename to home/modules/programs/kvm.nix
diff --git a/home/modules/mpv.nix b/home/modules/programs/mpv.nix
similarity index 100%
rename from home/modules/mpv.nix
rename to home/modules/programs/mpv.nix
diff --git a/home/modules/niri.nix b/home/modules/programs/niri.nix
similarity index 100%
rename from home/modules/niri.nix
rename to home/modules/programs/niri.nix
diff --git a/home/modules/obs.nix b/home/modules/programs/obs.nix
similarity index 100%
rename from home/modules/obs.nix
rename to home/modules/programs/obs.nix
diff --git a/home/modules/shell/default.nix b/home/modules/programs/shell/default.nix
similarity index 100%
rename from home/modules/shell/default.nix
rename to home/modules/programs/shell/default.nix
diff --git a/home/modules/sops.nix b/home/modules/programs/sops.nix
similarity index 100%
rename from home/modules/sops.nix
rename to home/modules/programs/sops.nix
diff --git a/home/modules/starship/config.toml b/home/modules/programs/starship/config.toml
similarity index 100%
rename from home/modules/starship/config.toml
rename to home/modules/programs/starship/config.toml
diff --git a/home/modules/starship/default.nix b/home/modules/programs/starship/default.nix
similarity index 100%
rename from home/modules/starship/default.nix
rename to home/modules/programs/starship/default.nix
diff --git a/home/modules/swaylock.nix b/home/modules/programs/swaylock.nix
similarity index 100%
rename from home/modules/swaylock.nix
rename to home/modules/programs/swaylock.nix
diff --git a/home/modules/swaync.nix b/home/modules/programs/swaync.nix
similarity index 100%
rename from home/modules/swaync.nix
rename to home/modules/programs/swaync.nix
diff --git a/home/modules/thunderbird.nix b/home/modules/programs/thunderbird.nix
similarity index 100%
rename from home/modules/thunderbird.nix
rename to home/modules/programs/thunderbird.nix
diff --git a/home/modules/waybar.nix b/home/modules/programs/waybar.nix
similarity index 100%
rename from home/modules/waybar.nix
rename to home/modules/programs/waybar.nix
diff --git a/home/modules/wluma.nix b/home/modules/programs/wluma.nix
similarity index 100%
rename from home/modules/wluma.nix
rename to home/modules/programs/wluma.nix