diff --git a/legacy/server-config/modules/lib.nix b/lib/default.nix
similarity index 100%
rename from legacy/server-config/modules/lib.nix
rename to lib/default.nix
diff --git a/legacy/server-config/modules/overlays.nix b/lib/overlays.nix
similarity index 100%
rename from legacy/server-config/modules/overlays.nix
rename to lib/overlays.nix
diff --git a/legacy/server-config/patches/nixpkgs/0001-firefox-syncserver-add-postgresql-backend-support.patch b/patches/nixpkgs/0001-firefox-syncserver-add-postgresql-backend-support.patch
similarity index 100%
rename from legacy/server-config/patches/nixpkgs/0001-firefox-syncserver-add-postgresql-backend-support.patch
rename to patches/nixpkgs/0001-firefox-syncserver-add-postgresql-backend-support.patch
diff --git a/legacy/server-config/patches/nixpkgs/0002-jellyfin-add-declarative-network-xml-options.patch b/patches/nixpkgs/0002-jellyfin-add-declarative-network-xml-options.patch
similarity index 100%
rename from legacy/server-config/patches/nixpkgs/0002-jellyfin-add-declarative-network-xml-options.patch
rename to patches/nixpkgs/0002-jellyfin-add-declarative-network-xml-options.patch
diff --git a/legacy/server-config/scripts/install.sh b/scripts/install-muffin.sh
similarity index 100%
rename from legacy/server-config/scripts/install.sh
rename to scripts/install-muffin.sh
diff --git a/legacy/server-config/services/arr/arr-search.nix b/services/arr/arr-search.nix
similarity index 100%
rename from legacy/server-config/services/arr/arr-search.nix
rename to services/arr/arr-search.nix
diff --git a/legacy/server-config/services/arr/bazarr.nix b/services/arr/bazarr.nix
similarity index 100%
rename from legacy/server-config/services/arr/bazarr.nix
rename to services/arr/bazarr.nix
diff --git a/legacy/server-config/services/arr/init.nix b/services/arr/init.nix
similarity index 100%
rename from legacy/server-config/services/arr/init.nix
rename to services/arr/init.nix
diff --git a/legacy/server-config/services/arr/jellyseerr.nix b/services/arr/jellyseerr.nix
similarity index 100%
rename from legacy/server-config/services/arr/jellyseerr.nix
rename to services/arr/jellyseerr.nix
diff --git a/legacy/server-config/services/arr/prowlarr.nix b/services/arr/prowlarr.nix
similarity index 100%
rename from legacy/server-config/services/arr/prowlarr.nix
rename to services/arr/prowlarr.nix
diff --git a/legacy/server-config/services/arr/radarr.nix b/services/arr/radarr.nix
similarity index 100%
rename from legacy/server-config/services/arr/radarr.nix
rename to services/arr/radarr.nix
diff --git a/legacy/server-config/services/arr/recyclarr.nix b/services/arr/recyclarr.nix
similarity index 100%
rename from legacy/server-config/services/arr/recyclarr.nix
rename to services/arr/recyclarr.nix
diff --git a/legacy/server-config/services/arr/sonarr.nix b/services/arr/sonarr.nix
similarity index 100%
rename from legacy/server-config/services/arr/sonarr.nix
rename to services/arr/sonarr.nix
diff --git a/legacy/server-config/services/arr/torrent-audit.nix b/services/arr/torrent-audit.nix
similarity index 100%
rename from legacy/server-config/services/arr/torrent-audit.nix
rename to services/arr/torrent-audit.nix
diff --git a/legacy/server-config/services/arr/torrent-audit.py b/services/arr/torrent-audit.py
similarity index 100%
rename from legacy/server-config/services/arr/torrent-audit.py
rename to services/arr/torrent-audit.py
diff --git a/legacy/server-config/services/bitmagnet.nix b/services/bitmagnet.nix
similarity index 100%
rename from legacy/server-config/services/bitmagnet.nix
rename to services/bitmagnet.nix
diff --git a/legacy/server-config/services/bitwarden.nix b/services/bitwarden.nix
similarity index 100%
rename from legacy/server-config/services/bitwarden.nix
rename to services/bitwarden.nix
diff --git a/legacy/server-config/services/caddy/caddy.nix b/services/caddy/caddy.nix
similarity index 100%
rename from legacy/server-config/services/caddy/caddy.nix
rename to services/caddy/caddy.nix
diff --git a/legacy/server-config/services/caddy/caddy_senior_project.nix b/services/caddy/caddy_senior_project.nix
similarity index 100%
rename from legacy/server-config/services/caddy/caddy_senior_project.nix
rename to services/caddy/caddy_senior_project.nix
diff --git a/legacy/server-config/services/caddy/default.nix b/services/caddy/default.nix
similarity index 100%
rename from legacy/server-config/services/caddy/default.nix
rename to services/caddy/default.nix
diff --git a/legacy/server-config/services/ddns-updater.nix b/services/ddns-updater.nix
similarity index 100%
rename from legacy/server-config/services/ddns-updater.nix
rename to services/ddns-updater.nix
diff --git a/legacy/server-config/services/firefox-syncserver.nix b/services/firefox-syncserver.nix
similarity index 100%
rename from legacy/server-config/services/firefox-syncserver.nix
rename to services/firefox-syncserver.nix
diff --git a/legacy/server-config/services/gitea-actions-runner.nix b/services/gitea-actions-runner.nix
similarity index 100%
rename from legacy/server-config/services/gitea-actions-runner.nix
rename to services/gitea-actions-runner.nix
diff --git a/legacy/server-config/services/gitea.nix b/services/gitea.nix
similarity index 100%
rename from legacy/server-config/services/gitea.nix
rename to services/gitea.nix
diff --git a/legacy/server-config/services/grafana/dashboard.nix b/services/grafana/dashboard.nix
similarity index 100%
rename from legacy/server-config/services/grafana/dashboard.nix
rename to services/grafana/dashboard.nix
diff --git a/legacy/server-config/services/grafana/default.nix b/services/grafana/default.nix
similarity index 100%
rename from legacy/server-config/services/grafana/default.nix
rename to services/grafana/default.nix
diff --git a/legacy/server-config/services/grafana/exporters.nix b/services/grafana/exporters.nix
similarity index 100%
rename from legacy/server-config/services/grafana/exporters.nix
rename to services/grafana/exporters.nix
diff --git a/legacy/server-config/services/grafana/grafana.nix b/services/grafana/grafana.nix
similarity index 100%
rename from legacy/server-config/services/grafana/grafana.nix
rename to services/grafana/grafana.nix
diff --git a/legacy/server-config/services/grafana/jellyfin-annotations.nix b/services/grafana/jellyfin-annotations.nix
similarity index 100%
rename from legacy/server-config/services/grafana/jellyfin-annotations.nix
rename to services/grafana/jellyfin-annotations.nix
diff --git a/legacy/server-config/services/grafana/jellyfin-annotations.py b/services/grafana/jellyfin-annotations.py
similarity index 100%
rename from legacy/server-config/services/grafana/jellyfin-annotations.py
rename to services/grafana/jellyfin-annotations.py
diff --git a/legacy/server-config/services/grafana/prometheus.nix b/services/grafana/prometheus.nix
similarity index 100%
rename from legacy/server-config/services/grafana/prometheus.nix
rename to services/grafana/prometheus.nix
diff --git a/legacy/server-config/services/grafana/zfs-scrub-annotations.nix b/services/grafana/zfs-scrub-annotations.nix
similarity index 100%
rename from legacy/server-config/services/grafana/zfs-scrub-annotations.nix
rename to services/grafana/zfs-scrub-annotations.nix
diff --git a/legacy/server-config/services/grafana/zfs-scrub-annotations.sh b/services/grafana/zfs-scrub-annotations.sh
similarity index 100%
rename from legacy/server-config/services/grafana/zfs-scrub-annotations.sh
rename to services/grafana/zfs-scrub-annotations.sh
diff --git a/legacy/server-config/services/graphing-calculator.nix b/services/graphing-calculator.nix
similarity index 100%
rename from legacy/server-config/services/graphing-calculator.nix
rename to services/graphing-calculator.nix
diff --git a/legacy/server-config/services/harmonia.nix b/services/harmonia.nix
similarity index 100%
rename from legacy/server-config/services/harmonia.nix
rename to services/harmonia.nix
diff --git a/legacy/server-config/services/immich.nix b/services/immich.nix
similarity index 100%
rename from legacy/server-config/services/immich.nix
rename to services/immich.nix
diff --git a/legacy/server-config/services/jellyfin/default.nix b/services/jellyfin/default.nix
similarity index 100%
rename from legacy/server-config/services/jellyfin/default.nix
rename to services/jellyfin/default.nix
diff --git a/legacy/server-config/services/jellyfin/jellyfin-qbittorrent-monitor.nix b/services/jellyfin/jellyfin-qbittorrent-monitor.nix
similarity index 100%
rename from legacy/server-config/services/jellyfin/jellyfin-qbittorrent-monitor.nix
rename to services/jellyfin/jellyfin-qbittorrent-monitor.nix
diff --git a/legacy/server-config/services/jellyfin/jellyfin-qbittorrent-monitor.py b/services/jellyfin/jellyfin-qbittorrent-monitor.py
similarity index 100%
rename from legacy/server-config/services/jellyfin/jellyfin-qbittorrent-monitor.py
rename to services/jellyfin/jellyfin-qbittorrent-monitor.py
diff --git a/legacy/server-config/services/jellyfin/jellyfin-webhook-plugin.nix b/services/jellyfin/jellyfin-webhook-plugin.nix
similarity index 100%
rename from legacy/server-config/services/jellyfin/jellyfin-webhook-plugin.nix
rename to services/jellyfin/jellyfin-webhook-plugin.nix
diff --git a/legacy/server-config/services/jellyfin/jellyfin.nix b/services/jellyfin/jellyfin.nix
similarity index 100%
rename from legacy/server-config/services/jellyfin/jellyfin.nix
rename to services/jellyfin/jellyfin.nix
diff --git a/legacy/server-config/services/llama-cpp.nix b/services/llama-cpp.nix
similarity index 100%
rename from legacy/server-config/services/llama-cpp.nix
rename to services/llama-cpp.nix
diff --git a/legacy/server-config/services/matrix/coturn.nix b/services/matrix/coturn.nix
similarity index 100%
rename from legacy/server-config/services/matrix/coturn.nix
rename to services/matrix/coturn.nix
diff --git a/legacy/server-config/services/matrix/default.nix b/services/matrix/default.nix
similarity index 100%
rename from legacy/server-config/services/matrix/default.nix
rename to services/matrix/default.nix
diff --git a/legacy/server-config/services/matrix/livekit.nix b/services/matrix/livekit.nix
similarity index 100%
rename from legacy/server-config/services/matrix/livekit.nix
rename to services/matrix/livekit.nix
diff --git a/legacy/server-config/services/matrix/matrix.nix b/services/matrix/matrix.nix
similarity index 100%
rename from legacy/server-config/services/matrix/matrix.nix
rename to services/matrix/matrix.nix
diff --git a/legacy/server-config/services/minecraft.nix b/services/minecraft.nix
similarity index 100%
rename from legacy/server-config/services/minecraft.nix
rename to services/minecraft.nix
diff --git a/legacy/server-config/services/mollysocket.nix b/services/mollysocket.nix
similarity index 100%
rename from legacy/server-config/services/mollysocket.nix
rename to services/mollysocket.nix
diff --git a/legacy/server-config/services/monero/default.nix b/services/monero/default.nix
similarity index 100%
rename from legacy/server-config/services/monero/default.nix
rename to services/monero/default.nix
diff --git a/legacy/server-config/services/monero/monero.nix b/services/monero/monero.nix
similarity index 100%
rename from legacy/server-config/services/monero/monero.nix
rename to services/monero/monero.nix
diff --git a/legacy/server-config/services/monero/p2pool.nix b/services/monero/p2pool.nix
similarity index 100%
rename from legacy/server-config/services/monero/p2pool.nix
rename to services/monero/p2pool.nix
diff --git a/legacy/server-config/services/monero/xmrig-auto-pause.nix b/services/monero/xmrig-auto-pause.nix
similarity index 100%
rename from legacy/server-config/services/monero/xmrig-auto-pause.nix
rename to services/monero/xmrig-auto-pause.nix
diff --git a/legacy/server-config/services/monero/xmrig-auto-pause.py b/services/monero/xmrig-auto-pause.py
similarity index 100%
rename from legacy/server-config/services/monero/xmrig-auto-pause.py
rename to services/monero/xmrig-auto-pause.py
diff --git a/legacy/server-config/services/monero/xmrig.nix b/services/monero/xmrig.nix
similarity index 100%
rename from legacy/server-config/services/monero/xmrig.nix
rename to services/monero/xmrig.nix
diff --git a/legacy/server-config/services/ntfy/default.nix b/services/ntfy/default.nix
similarity index 100%
rename from legacy/server-config/services/ntfy/default.nix
rename to services/ntfy/default.nix
diff --git a/legacy/server-config/services/ntfy/ntfy-alerts.nix b/services/ntfy/ntfy-alerts.nix
similarity index 100%
rename from legacy/server-config/services/ntfy/ntfy-alerts.nix
rename to services/ntfy/ntfy-alerts.nix
diff --git a/legacy/server-config/services/ntfy/ntfy.nix b/services/ntfy/ntfy.nix
similarity index 100%
rename from legacy/server-config/services/ntfy/ntfy.nix
rename to services/ntfy/ntfy.nix
diff --git a/legacy/server-config/services/postgresql.nix b/services/postgresql.nix
similarity index 100%
rename from legacy/server-config/services/postgresql.nix
rename to services/postgresql.nix
diff --git a/legacy/server-config/services/qbittorrent.nix b/services/qbittorrent.nix
similarity index 100%
rename from legacy/server-config/services/qbittorrent.nix
rename to services/qbittorrent.nix
diff --git a/legacy/server-config/services/soulseek.nix b/services/soulseek.nix
similarity index 100%
rename from legacy/server-config/services/soulseek.nix
rename to services/soulseek.nix
diff --git a/legacy/server-config/services/ssh.nix b/services/ssh.nix
similarity index 100%
rename from legacy/server-config/services/ssh.nix
rename to services/ssh.nix
diff --git a/legacy/server-config/services/syncthing.nix b/services/syncthing.nix
similarity index 100%
rename from legacy/server-config/services/syncthing.nix
rename to services/syncthing.nix
diff --git a/legacy/server-config/services/trilium.nix b/services/trilium.nix
similarity index 100%
rename from legacy/server-config/services/trilium.nix
rename to services/trilium.nix
diff --git a/legacy/server-config/services/ups.nix b/services/ups.nix
similarity index 100%
rename from legacy/server-config/services/ups.nix
rename to services/ups.nix
diff --git a/legacy/server-config/services/wg.nix b/services/wg.nix
similarity index 100%
rename from legacy/server-config/services/wg.nix
rename to services/wg.nix
diff --git a/legacy/server-config/tests/fail2ban-caddy.nix b/tests/fail2ban-caddy.nix
similarity index 100%
rename from legacy/server-config/tests/fail2ban-caddy.nix
rename to tests/fail2ban-caddy.nix
diff --git a/legacy/server-config/tests/fail2ban-gitea.nix b/tests/fail2ban-gitea.nix
similarity index 100%
rename from legacy/server-config/tests/fail2ban-gitea.nix
rename to tests/fail2ban-gitea.nix
diff --git a/legacy/server-config/tests/fail2ban-immich.nix b/tests/fail2ban-immich.nix
similarity index 100%
rename from legacy/server-config/tests/fail2ban-immich.nix
rename to tests/fail2ban-immich.nix
diff --git a/legacy/server-config/tests/fail2ban-jellyfin.nix b/tests/fail2ban-jellyfin.nix
similarity index 100%
rename from legacy/server-config/tests/fail2ban-jellyfin.nix
rename to tests/fail2ban-jellyfin.nix
diff --git a/legacy/server-config/tests/fail2ban-ssh.nix b/tests/fail2ban-ssh.nix
similarity index 100%
rename from legacy/server-config/tests/fail2ban-ssh.nix
rename to tests/fail2ban-ssh.nix
diff --git a/legacy/server-config/tests/fail2ban-vaultwarden.nix b/tests/fail2ban-vaultwarden.nix
similarity index 100%
rename from legacy/server-config/tests/fail2ban-vaultwarden.nix
rename to tests/fail2ban-vaultwarden.nix
diff --git a/legacy/server-config/tests/file-perms.nix b/tests/file-perms.nix
similarity index 100%
rename from legacy/server-config/tests/file-perms.nix
rename to tests/file-perms.nix
diff --git a/legacy/server-config/tests/gitea-runner.nix b/tests/gitea-runner.nix
similarity index 100%
rename from legacy/server-config/tests/gitea-runner.nix
rename to tests/gitea-runner.nix
diff --git a/legacy/server-config/tests/jellyfin-annotations.nix b/tests/jellyfin-annotations.nix
similarity index 100%
rename from legacy/server-config/tests/jellyfin-annotations.nix
rename to tests/jellyfin-annotations.nix
diff --git a/legacy/server-config/tests/jellyfin-qbittorrent-monitor.nix b/tests/jellyfin-qbittorrent-monitor.nix
similarity index 100%
rename from legacy/server-config/tests/jellyfin-qbittorrent-monitor.nix
rename to tests/jellyfin-qbittorrent-monitor.nix
diff --git a/legacy/server-config/tests/jellyfin-test-lib.nix b/tests/jellyfin-test-lib.nix
similarity index 100%
rename from legacy/server-config/tests/jellyfin-test-lib.nix
rename to tests/jellyfin-test-lib.nix
diff --git a/legacy/server-config/tests/jellyfin-test-lib.py b/tests/jellyfin-test-lib.py
similarity index 100%
rename from legacy/server-config/tests/jellyfin-test-lib.py
rename to tests/jellyfin-test-lib.py
diff --git a/legacy/server-config/tests/minecraft.nix b/tests/minecraft.nix
similarity index 100%
rename from legacy/server-config/tests/minecraft.nix
rename to tests/minecraft.nix
diff --git a/legacy/server-config/tests/mock-grafana-server.py b/tests/mock-grafana-server.py
similarity index 100%
rename from legacy/server-config/tests/mock-grafana-server.py
rename to tests/mock-grafana-server.py
diff --git a/legacy/server-config/tests/ntfy-alerts.nix b/tests/ntfy-alerts.nix
similarity index 100%
rename from legacy/server-config/tests/ntfy-alerts.nix
rename to tests/ntfy-alerts.nix
diff --git a/legacy/server-config/tests/testTest.nix b/tests/testTest.nix
similarity index 100%
rename from legacy/server-config/tests/testTest.nix
rename to tests/testTest.nix
diff --git a/legacy/server-config/tests/tests.nix b/tests/tests.nix
similarity index 100%
rename from legacy/server-config/tests/tests.nix
rename to tests/tests.nix
diff --git a/legacy/server-config/tests/torrent-audit.nix b/tests/torrent-audit.nix
similarity index 100%
rename from legacy/server-config/tests/torrent-audit.nix
rename to tests/torrent-audit.nix
diff --git a/legacy/server-config/tests/xmrig-auto-pause.nix b/tests/xmrig-auto-pause.nix
similarity index 100%
rename from legacy/server-config/tests/xmrig-auto-pause.nix
rename to tests/xmrig-auto-pause.nix
diff --git a/legacy/server-config/tests/zfs-scrub-annotations.nix b/tests/zfs-scrub-annotations.nix
similarity index 100%
rename from legacy/server-config/tests/zfs-scrub-annotations.nix
rename to tests/zfs-scrub-annotations.nix
diff --git a/legacy/server-config/tests/zfs.nix b/tests/zfs.nix
similarity index 100%
rename from legacy/server-config/tests/zfs.nix
rename to tests/zfs.nix