diff --git a/clients/quadraticpc/name.nix b/clients/quadraticpc/name.nix
deleted file mode 100755
index eda8ad5..0000000
--- a/clients/quadraticpc/name.nix
+++ /dev/null
@@ -1 +0,0 @@
-{networking.hostName = "quadraticpc";}
diff --git a/clients/quadraticserver/name.nix b/clients/quadraticserver/name.nix
deleted file mode 100644
index fa958aa..0000000
--- a/clients/quadraticserver/name.nix
+++ /dev/null
@@ -1 +0,0 @@
-{networking.hostName = "quadraticserver";}
diff --git a/clients/quadtop/name.nix b/clients/quadtop/name.nix
deleted file mode 100755
index 0d7bb8c..0000000
--- a/clients/quadtop/name.nix
+++ /dev/null
@@ -1 +0,0 @@
-{networking.hostName = "quadtop";}
diff --git a/flake.nix b/flake.nix
index f352e3f..14b6e38 100755
--- a/flake.nix
+++ b/flake.nix
@@ -40,12 +40,14 @@
         modules = with dirUtils;
           [
             ./wrappers
+            {networking.hostName = hostname;}
             inputs.agenix.nixosModules.default
           ]
           ++ dirFiles ".nix" "${./clients}/${hostname}"
           ++ dirFiles ".nix" ./modules/common
+          ++ opt (!isDesktop) (dirFiles ./modules/server)
           ++ opt isDesktop (
-            (dirFiles ".nix" ./modules/common-desktop)
+            (dirFiles ".nix" ./modules/desktop)
             ++ [
               inputs.stylix.nixosModules.stylix
               ./stylix.nix
@@ -56,10 +58,10 @@
           );
       };
   in {
-    nixosConfigurations = {
-      "quadraticserver" = system "quadraticserver" false;
-      "quadraticpc" = system "quadraticpc" true;
-      "quadtop" = system "quadtop" true;
+    nixosConfigurations = builtins.mapAttrs (name: value: system name value) {
+      "quadraticserver" = false;
+      "quadraticpc" = true;
+      "quadtop" = true;
     };
 
     formatter.x86_64-linux = inputs.nixpkgs.legacyPackages.x86_64-linux.alejandra;
diff --git a/modules/common/fish.nix b/modules/common/fish.nix
index 77fa24a..c2b2de7 100644
--- a/modules/common/fish.nix
+++ b/modules/common/fish.nix
@@ -28,6 +28,7 @@
       # NixOS
       clean = "nh clean all";
       rebuild = "nh os switch";
+      rebuildServer = "nixos-rebuild switch --flake ~/.config/nixos#quadraticserver --target-host quadradical@192.168.0.132 --use-remote-sudo";
       update = "pushd ~/.config/nixos && nix flake update && popd && rebuild";
     };
   };
diff --git a/modules/common-desktop/adb.nix b/modules/desktop/adb.nix
similarity index 100%
rename from modules/common-desktop/adb.nix
rename to modules/desktop/adb.nix
diff --git a/modules/common-desktop/dconf/burn-my-windows.conf b/modules/desktop/dconf/burn-my-windows.conf
similarity index 100%
rename from modules/common-desktop/dconf/burn-my-windows.conf
rename to modules/desktop/dconf/burn-my-windows.conf
diff --git a/modules/common-desktop/dconf/default.nix b/modules/desktop/dconf/default.nix
similarity index 100%
rename from modules/common-desktop/dconf/default.nix
rename to modules/desktop/dconf/default.nix
diff --git a/modules/common-desktop/desktop.nix b/modules/desktop/desktop.nix
similarity index 100%
rename from modules/common-desktop/desktop.nix
rename to modules/desktop/desktop.nix
diff --git a/modules/common-desktop/firefox/customChrome.css b/modules/desktop/firefox/customChrome.css
similarity index 100%
rename from modules/common-desktop/firefox/customChrome.css
rename to modules/desktop/firefox/customChrome.css
diff --git a/modules/common-desktop/firefox/customContent.css b/modules/desktop/firefox/customContent.css
similarity index 100%
rename from modules/common-desktop/firefox/customContent.css
rename to modules/desktop/firefox/customContent.css
diff --git a/modules/common-desktop/firefox/default.nix b/modules/desktop/firefox/default.nix
similarity index 100%
rename from modules/common-desktop/firefox/default.nix
rename to modules/desktop/firefox/default.nix
diff --git a/modules/common-desktop/flatpak.nix b/modules/desktop/flatpak.nix
similarity index 100%
rename from modules/common-desktop/flatpak.nix
rename to modules/desktop/flatpak.nix
diff --git a/modules/common-desktop/gnome.nix b/modules/desktop/gnome.nix
similarity index 100%
rename from modules/common-desktop/gnome.nix
rename to modules/desktop/gnome.nix
diff --git a/modules/common-desktop/graphics.nix b/modules/desktop/graphics.nix
similarity index 100%
rename from modules/common-desktop/graphics.nix
rename to modules/desktop/graphics.nix
diff --git a/modules/common-desktop/ipad.nix b/modules/desktop/ipad.nix
similarity index 100%
rename from modules/common-desktop/ipad.nix
rename to modules/desktop/ipad.nix
diff --git a/modules/common-desktop/keyboard.nix b/modules/desktop/keyboard.nix
similarity index 100%
rename from modules/common-desktop/keyboard.nix
rename to modules/desktop/keyboard.nix
diff --git a/modules/common-desktop/launch-rl/default.nix b/modules/desktop/launch-rl/default.nix
similarity index 100%
rename from modules/common-desktop/launch-rl/default.nix
rename to modules/desktop/launch-rl/default.nix
diff --git a/modules/common-desktop/launch-rl/launch-rl.bat b/modules/desktop/launch-rl/launch-rl.bat
similarity index 100%
rename from modules/common-desktop/launch-rl/launch-rl.bat
rename to modules/desktop/launch-rl/launch-rl.bat
diff --git a/modules/common-desktop/mac.nix b/modules/desktop/mac.nix
similarity index 100%
rename from modules/common-desktop/mac.nix
rename to modules/desktop/mac.nix
diff --git a/modules/common-desktop/mangohud/default.nix b/modules/desktop/mangohud/default.nix
similarity index 100%
rename from modules/common-desktop/mangohud/default.nix
rename to modules/desktop/mangohud/default.nix
diff --git a/modules/common-desktop/mangohud/mangohud.conf b/modules/desktop/mangohud/mangohud.conf
similarity index 100%
rename from modules/common-desktop/mangohud/mangohud.conf
rename to modules/desktop/mangohud/mangohud.conf
diff --git a/modules/common-desktop/noisetorch.nix b/modules/desktop/noisetorch.nix
similarity index 100%
rename from modules/common-desktop/noisetorch.nix
rename to modules/desktop/noisetorch.nix
diff --git a/modules/common-desktop/packages.nix b/modules/desktop/packages.nix
similarity index 100%
rename from modules/common-desktop/packages.nix
rename to modules/desktop/packages.nix
diff --git a/modules/common-desktop/piper.nix b/modules/desktop/piper.nix
similarity index 100%
rename from modules/common-desktop/piper.nix
rename to modules/desktop/piper.nix
diff --git a/modules/common-desktop/pipewire.nix b/modules/desktop/pipewire.nix
similarity index 100%
rename from modules/common-desktop/pipewire.nix
rename to modules/desktop/pipewire.nix
diff --git a/modules/common-desktop/plymouth.nix b/modules/desktop/plymouth.nix
similarity index 100%
rename from modules/common-desktop/plymouth.nix
rename to modules/desktop/plymouth.nix
diff --git a/modules/common-desktop/polkit.nix b/modules/desktop/polkit.nix
similarity index 100%
rename from modules/common-desktop/polkit.nix
rename to modules/desktop/polkit.nix
diff --git a/modules/common-desktop/print.nix b/modules/desktop/print.nix
similarity index 100%
rename from modules/common-desktop/print.nix
rename to modules/desktop/print.nix
diff --git a/modules/common-desktop/steam.nix b/modules/desktop/steam.nix
similarity index 100%
rename from modules/common-desktop/steam.nix
rename to modules/desktop/steam.nix
diff --git a/modules/common-desktop/virtualization.nix b/modules/desktop/virtualization.nix
similarity index 100%
rename from modules/common-desktop/virtualization.nix
rename to modules/desktop/virtualization.nix
diff --git a/modules/common-desktop/vscodium.nix b/modules/desktop/vscodium.nix
similarity index 100%
rename from modules/common-desktop/vscodium.nix
rename to modules/desktop/vscodium.nix
diff --git a/modules/common-desktop/wheel.nix b/modules/desktop/wheel.nix
similarity index 100%
rename from modules/common-desktop/wheel.nix
rename to modules/desktop/wheel.nix
diff --git a/clients/quadraticserver/sigs.nix b/modules/server/sigs.nix
similarity index 100%
rename from clients/quadraticserver/sigs.nix
rename to modules/server/sigs.nix
diff --git a/clients/quadraticserver/ssh.nix b/modules/server/ssh.nix
similarity index 100%
rename from clients/quadraticserver/ssh.nix
rename to modules/server/ssh.nix