diff --git a/legacy/dotfiles/system/no-rgb.nix b/legacy/dotfiles/system/no-rgb.nix
deleted file mode 100644
index 5f876ca..0000000
--- a/legacy/dotfiles/system/no-rgb.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  systemd.services.no-rgb =
-    let
-      no-rgb = (
-        pkgs.writeShellApplication {
-          name = "no-rgb";
-          runtimeInputs = with pkgs; [
-            openrgb
-            coreutils
-            gnugrep
-          ];
-
-          text = ''
-            #!/bin/sh
-            set -e
-
-            NUM_DEVICES=$(openrgb --noautoconnect --list-devices | grep -cE '^[0-9]+: ')
-
-            for i in $(seq 0 $((NUM_DEVICES - 1))); do
-              openrgb --noautoconnect --device "$i" --mode direct --color 000000
-            done
-          '';
-        }
-      );
-    in
-    {
-      description = "disable rgb";
-      serviceConfig = {
-        ExecStart = "${lib.getExe no-rgb}";
-        Type = "oneshot";
-      };
-      wantedBy = [ "multi-user.target" ];
-    };
-
-  services.hardware.openrgb.enable = true;
-  services.udev.packages = [ pkgs.openrgb ];
-  hardware.i2c.enable = true;
-
-  environment.systemPackages = with pkgs; [
-    openrgb-with-all-plugins
-  ];
-}
diff --git a/legacy/server-config/modules/age-secrets.nix b/modules/age-secrets.nix
similarity index 100%
rename from legacy/server-config/modules/age-secrets.nix
rename to modules/age-secrets.nix
diff --git a/legacy/dotfiles/system/networking.nix b/modules/desktop-networkmanager.nix
similarity index 100%
rename from legacy/dotfiles/system/networking.nix
rename to modules/desktop-networkmanager.nix
diff --git a/legacy/dotfiles/system/steam.nix b/modules/desktop-steam.nix
similarity index 100%
rename from legacy/dotfiles/system/steam.nix
rename to modules/desktop-steam.nix
diff --git a/legacy/dotfiles/system/vm.nix b/modules/desktop-vm.nix
similarity index 100%
rename from legacy/dotfiles/system/vm.nix
rename to modules/desktop-vm.nix
diff --git a/legacy/server-config/modules/no-rgb.nix b/modules/no-rgb.nix
similarity index 100%
rename from legacy/server-config/modules/no-rgb.nix
rename to modules/no-rgb.nix
diff --git a/legacy/server-config/modules/ntfy-alerts.nix b/modules/ntfy-alerts.nix
similarity index 100%
rename from legacy/server-config/modules/ntfy-alerts.nix
rename to modules/ntfy-alerts.nix
diff --git a/legacy/server-config/modules/impermanence.nix b/modules/server-impermanence.nix
similarity index 100%
rename from legacy/server-config/modules/impermanence.nix
rename to modules/server-impermanence.nix
diff --git a/legacy/server-config/modules/secureboot.nix b/modules/server-lanzaboote-agenix.nix
similarity index 100%
rename from legacy/server-config/modules/secureboot.nix
rename to modules/server-lanzaboote-agenix.nix
diff --git a/legacy/server-config/modules/power.nix b/modules/server-power.nix
similarity index 100%
rename from legacy/server-config/modules/power.nix
rename to modules/server-power.nix
diff --git a/legacy/server-config/modules/security.nix b/modules/server-security.nix
similarity index 100%
rename from legacy/server-config/modules/security.nix
rename to modules/server-security.nix
diff --git a/legacy/server-config/modules/usb-secrets.nix b/modules/usb-secrets.nix
similarity index 100%
rename from legacy/server-config/modules/usb-secrets.nix
rename to modules/usb-secrets.nix
diff --git a/legacy/server-config/modules/zfs.nix b/modules/zfs.nix
similarity index 100%
rename from legacy/server-config/modules/zfs.nix
rename to modules/zfs.nix