diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix
index 0fcd2b8..4584228 100644
--- a/nixos/modules/default.nix
+++ b/nixos/modules/default.nix
@@ -17,24 +17,13 @@
     ])
     ++ [
       ./containers
-      ./postgresql.nix
-      ./forgejo.nix
       ./deploy
       ./nix.nix
       ./home.nix
       ./sops.nix
-      ./dae
-      ./openssh.nix
-      ./nh.nix
       ./i18n.nix
       ./gui
-      ./steam.nix
-      ./tailscale.nix
-      ./kanata.nix
-      ./kvm.nix
-      ./open-webui.nix
-      ./transmission.nix
-      ./caddy.nix
+      ./programs
     ];
 
   config = {
diff --git a/nixos/modules/caddy.nix b/nixos/modules/programs/caddy.nix
similarity index 100%
rename from nixos/modules/caddy.nix
rename to nixos/modules/programs/caddy.nix
diff --git a/nixos/modules/dae/config.dae b/nixos/modules/programs/dae/config.dae
similarity index 100%
rename from nixos/modules/dae/config.dae
rename to nixos/modules/programs/dae/config.dae
diff --git a/nixos/modules/dae/default.nix b/nixos/modules/programs/dae/default.nix
similarity index 100%
rename from nixos/modules/dae/default.nix
rename to nixos/modules/programs/dae/default.nix
diff --git a/nixos/modules/programs/default.nix b/nixos/modules/programs/default.nix
new file mode 100644
index 0000000..b0c02df
--- /dev/null
+++ b/nixos/modules/programs/default.nix
@@ -0,0 +1,17 @@
+{ config, lib, ... }:
+{
+  imports = [
+    ./caddy.nix
+    ./dae
+    ./forgejo.nix
+    ./kanata.nix
+    ./kvm.nix
+    ./nh.nix
+    ./open-webui.nix
+    ./openssh.nix
+    ./postgresql.nix
+    ./steam.nix
+    ./tailscale.nix
+    ./transmission.nix
+  ];
+}
diff --git a/nixos/modules/forgejo.nix b/nixos/modules/programs/forgejo.nix
similarity index 100%
rename from nixos/modules/forgejo.nix
rename to nixos/modules/programs/forgejo.nix
diff --git a/nixos/modules/kanata.nix b/nixos/modules/programs/kanata.nix
similarity index 100%
rename from nixos/modules/kanata.nix
rename to nixos/modules/programs/kanata.nix
diff --git a/nixos/modules/kvm.nix b/nixos/modules/programs/kvm.nix
similarity index 100%
rename from nixos/modules/kvm.nix
rename to nixos/modules/programs/kvm.nix
diff --git a/nixos/modules/nh.nix b/nixos/modules/programs/nh.nix
similarity index 100%
rename from nixos/modules/nh.nix
rename to nixos/modules/programs/nh.nix
diff --git a/nixos/modules/open-webui.nix b/nixos/modules/programs/open-webui.nix
similarity index 100%
rename from nixos/modules/open-webui.nix
rename to nixos/modules/programs/open-webui.nix
diff --git a/nixos/modules/openssh.nix b/nixos/modules/programs/openssh.nix
similarity index 100%
rename from nixos/modules/openssh.nix
rename to nixos/modules/programs/openssh.nix
diff --git a/nixos/modules/postgresql.nix b/nixos/modules/programs/postgresql.nix
similarity index 100%
rename from nixos/modules/postgresql.nix
rename to nixos/modules/programs/postgresql.nix
diff --git a/nixos/modules/steam.nix b/nixos/modules/programs/steam.nix
similarity index 100%
rename from nixos/modules/steam.nix
rename to nixos/modules/programs/steam.nix
diff --git a/nixos/modules/tailscale.nix b/nixos/modules/programs/tailscale.nix
similarity index 100%
rename from nixos/modules/tailscale.nix
rename to nixos/modules/programs/tailscale.nix
diff --git a/nixos/modules/transmission.nix b/nixos/modules/programs/transmission.nix
similarity index 100%
rename from nixos/modules/transmission.nix
rename to nixos/modules/programs/transmission.nix