diff --git a/modules/home/brightnessctl.nix b/modules/home/programs/brightnessctl.nix
similarity index 100%
rename from modules/home/brightnessctl.nix
rename to modules/home/programs/brightnessctl.nix
diff --git a/modules/home/firefox.nix b/modules/home/programs/firefox.nix
similarity index 100%
rename from modules/home/firefox.nix
rename to modules/home/programs/firefox.nix
diff --git a/modules/home/git.nix b/modules/home/programs/git.nix
similarity index 100%
rename from modules/home/git.nix
rename to modules/home/programs/git.nix
diff --git a/modules/home/hyprlock.nix b/modules/home/programs/hyprlock.nix
similarity index 100%
rename from modules/home/hyprlock.nix
rename to modules/home/programs/hyprlock.nix
diff --git a/modules/home/kitty.nix b/modules/home/programs/kitty.nix
similarity index 100%
rename from modules/home/kitty.nix
rename to modules/home/programs/kitty.nix
diff --git a/modules/home/rofi/config.rasi b/modules/home/programs/rofi/config.rasi
similarity index 100%
rename from modules/home/rofi/config.rasi
rename to modules/home/programs/rofi/config.rasi
diff --git a/modules/home/rofi/dark-theme.rasi b/modules/home/programs/rofi/dark-theme.rasi
similarity index 100%
rename from modules/home/rofi/dark-theme.rasi
rename to modules/home/programs/rofi/dark-theme.rasi
diff --git a/modules/home/rofi/default.nix b/modules/home/programs/rofi/default.nix
similarity index 100%
rename from modules/home/rofi/default.nix
rename to modules/home/programs/rofi/default.nix
diff --git a/modules/home/rofi/light-theme.rasi b/modules/home/programs/rofi/light-theme.rasi
similarity index 100%
rename from modules/home/rofi/light-theme.rasi
rename to modules/home/programs/rofi/light-theme.rasi
diff --git a/modules/home/virt-manager.nix b/modules/home/programs/virt-manager.nix
similarity index 100%
rename from modules/home/virt-manager.nix
rename to modules/home/programs/virt-manager.nix
diff --git a/modules/home/vscode.nix b/modules/home/programs/vscode.nix
similarity index 100%
rename from modules/home/vscode.nix
rename to modules/home/programs/vscode.nix
diff --git a/modules/home/cliphist.nix b/modules/home/services/cliphist.nix
similarity index 100%
rename from modules/home/cliphist.nix
rename to modules/home/services/cliphist.nix
diff --git a/modules/home/gammastep.nix b/modules/home/services/gammastep.nix
similarity index 100%
rename from modules/home/gammastep.nix
rename to modules/home/services/gammastep.nix
diff --git a/modules/home/hypridle.nix b/modules/home/services/hypridle.nix
similarity index 100%
rename from modules/home/hypridle.nix
rename to modules/home/services/hypridle.nix
diff --git a/modules/home/hyprpaper.nix b/modules/home/services/hyprpaper.nix
similarity index 100%
rename from modules/home/hyprpaper.nix
rename to modules/home/services/hyprpaper.nix
diff --git a/modules/home/tailscale.nix b/modules/home/services/tailscale.nix
similarity index 100%
rename from modules/home/tailscale.nix
rename to modules/home/services/tailscale.nix
diff --git a/modules/home/waybar.nix b/modules/home/services/waybar.nix
similarity index 100%
rename from modules/home/waybar.nix
rename to modules/home/services/waybar.nix
diff --git a/modules/system/steam.nix b/modules/system/programs/steam.nix
similarity index 100%
rename from modules/system/steam.nix
rename to modules/system/programs/steam.nix
diff --git a/modules/system/actualbudget/backups.nix b/modules/system/services/actualbudget/backups.nix
similarity index 100%
rename from modules/system/actualbudget/backups.nix
rename to modules/system/services/actualbudget/backups.nix
diff --git a/modules/system/actualbudget/default.nix b/modules/system/services/actualbudget/default.nix
similarity index 100%
rename from modules/system/actualbudget/default.nix
rename to modules/system/services/actualbudget/default.nix
diff --git a/modules/system/bluetooth.nix b/modules/system/services/bluetooth.nix
similarity index 100%
rename from modules/system/bluetooth.nix
rename to modules/system/services/bluetooth.nix
diff --git a/modules/system/crowdsec/default.nix b/modules/system/services/crowdsec/default.nix
similarity index 100%
rename from modules/system/crowdsec/default.nix
rename to modules/system/services/crowdsec/default.nix
diff --git a/modules/system/crowdsec/firewall-bouncer.nix b/modules/system/services/crowdsec/firewall-bouncer.nix
similarity index 100%
rename from modules/system/crowdsec/firewall-bouncer.nix
rename to modules/system/services/crowdsec/firewall-bouncer.nix
diff --git a/modules/system/forgejo/default.nix b/modules/system/services/forgejo/default.nix
similarity index 100%
rename from modules/system/forgejo/default.nix
rename to modules/system/services/forgejo/default.nix
diff --git a/modules/system/gc.nix b/modules/system/services/gc.nix
similarity index 100%
rename from modules/system/gc.nix
rename to modules/system/services/gc.nix
diff --git a/modules/system/geoclue.nix b/modules/system/services/geoclue.nix
similarity index 100%
rename from modules/system/geoclue.nix
rename to modules/system/services/geoclue.nix
diff --git a/modules/system/hedgedoc/backups.nix b/modules/system/services/hedgedoc/backups.nix
similarity index 100%
rename from modules/system/hedgedoc/backups.nix
rename to modules/system/services/hedgedoc/backups.nix
diff --git a/modules/system/hedgedoc/default.nix b/modules/system/services/hedgedoc/default.nix
similarity index 100%
rename from modules/system/hedgedoc/default.nix
rename to modules/system/services/hedgedoc/default.nix
diff --git a/modules/system/nextcloud/backups.nix b/modules/system/services/nextcloud/backups.nix
similarity index 100%
rename from modules/system/nextcloud/backups.nix
rename to modules/system/services/nextcloud/backups.nix
diff --git a/modules/system/nextcloud/default.nix b/modules/system/services/nextcloud/default.nix
similarity index 100%
rename from modules/system/nextcloud/default.nix
rename to modules/system/services/nextcloud/default.nix
diff --git a/modules/system/printing.nix b/modules/system/services/printing.nix
similarity index 100%
rename from modules/system/printing.nix
rename to modules/system/services/printing.nix
diff --git a/modules/system/restic-backup.nix b/modules/system/services/restic-backup.nix
similarity index 100%
rename from modules/system/restic-backup.nix
rename to modules/system/services/restic-backup.nix
diff --git a/modules/system/sound.nix b/modules/system/services/sound.nix
similarity index 100%
rename from modules/system/sound.nix
rename to modules/system/services/sound.nix
diff --git a/modules/system/syncthing/backups.nix b/modules/system/services/syncthing/backups.nix
similarity index 100%
rename from modules/system/syncthing/backups.nix
rename to modules/system/services/syncthing/backups.nix
diff --git a/modules/system/syncthing/default.nix b/modules/system/services/syncthing/default.nix
similarity index 100%
rename from modules/system/syncthing/default.nix
rename to modules/system/services/syncthing/default.nix
diff --git a/modules/system/tailscale/caddy-serve.nix b/modules/system/services/tailscale/caddy-serve.nix
similarity index 100%
rename from modules/system/tailscale/caddy-serve.nix
rename to modules/system/services/tailscale/caddy-serve.nix
diff --git a/modules/system/tailscale/default.nix b/modules/system/services/tailscale/default.nix
similarity index 100%
rename from modules/system/tailscale/default.nix
rename to modules/system/services/tailscale/default.nix
diff --git a/modules/system/wlan.nix b/modules/system/services/wlan.nix
similarity index 100%
rename from modules/system/wlan.nix
rename to modules/system/services/wlan.nix