diff --git a/hosts/north/default.nix b/hosts/desktop/default.nix
similarity index 100%
rename from hosts/north/default.nix
rename to hosts/desktop/default.nix
diff --git a/hosts/north/disko.nix b/hosts/desktop/disko.nix
similarity index 100%
rename from hosts/north/disko.nix
rename to hosts/desktop/disko.nix
diff --git a/hosts/north/hardware.nix b/hosts/desktop/hardware.nix
similarity index 100%
rename from hosts/north/hardware.nix
rename to hosts/desktop/hardware.nix
diff --git a/hosts/north/secrets.json b/hosts/desktop/secrets.json
similarity index 100%
rename from hosts/north/secrets.json
rename to hosts/desktop/secrets.json
diff --git a/hosts/fern/default.nix b/hosts/laptop/default.nix
similarity index 100%
rename from hosts/fern/default.nix
rename to hosts/laptop/default.nix
diff --git a/hosts/fern/disko.nix b/hosts/laptop/disko.nix
similarity index 100%
rename from hosts/fern/disko.nix
rename to hosts/laptop/disko.nix
diff --git a/hosts/fern/hardware.nix b/hosts/laptop/hardware.nix
similarity index 100%
rename from hosts/fern/hardware.nix
rename to hosts/laptop/hardware.nix
diff --git a/hosts/fern/secrets.json b/hosts/laptop/secrets.json
similarity index 100%
rename from hosts/fern/secrets.json
rename to hosts/laptop/secrets.json
diff --git a/hosts/cirrus/default.nix b/hosts/srv-external/default.nix
similarity index 100%
rename from hosts/cirrus/default.nix
rename to hosts/srv-external/default.nix
diff --git a/hosts/cirrus/disko.nix b/hosts/srv-external/disko.nix
similarity index 100%
rename from hosts/cirrus/disko.nix
rename to hosts/srv-external/disko.nix
diff --git a/hosts/cirrus/hardware.nix b/hosts/srv-external/hardware.nix
similarity index 100%
rename from hosts/cirrus/hardware.nix
rename to hosts/srv-external/hardware.nix
diff --git a/hosts/cirrus/secrets.json b/hosts/srv-external/secrets.json
similarity index 100%
rename from hosts/cirrus/secrets.json
rename to hosts/srv-external/secrets.json
diff --git a/hosts/alto/default.nix b/hosts/srv-internal/default.nix
similarity index 100%
rename from hosts/alto/default.nix
rename to hosts/srv-internal/default.nix
diff --git a/hosts/alto/disko.nix b/hosts/srv-internal/disko.nix
similarity index 100%
rename from hosts/alto/disko.nix
rename to hosts/srv-internal/disko.nix
diff --git a/hosts/alto/hardware.nix b/hosts/srv-internal/hardware.nix
similarity index 100%
rename from hosts/alto/hardware.nix
rename to hosts/srv-internal/hardware.nix
diff --git a/hosts/alto/secrets.json b/hosts/srv-internal/secrets.json
similarity index 100%
rename from hosts/alto/secrets.json
rename to hosts/srv-internal/secrets.json
diff --git a/hosts/cumulus/default.nix b/hosts/srv-monitor/default.nix
similarity index 100%
rename from hosts/cumulus/default.nix
rename to hosts/srv-monitor/default.nix
diff --git a/hosts/cumulus/disko.nix b/hosts/srv-monitor/disko.nix
similarity index 100%
rename from hosts/cumulus/disko.nix
rename to hosts/srv-monitor/disko.nix
diff --git a/hosts/cumulus/hardware.nix b/hosts/srv-monitor/hardware.nix
similarity index 100%
rename from hosts/cumulus/hardware.nix
rename to hosts/srv-monitor/hardware.nix
diff --git a/hosts/cumulus/secrets.json b/hosts/srv-monitor/secrets.json
similarity index 100%
rename from hosts/cumulus/secrets.json
rename to hosts/srv-monitor/secrets.json
diff --git a/users/seb/@north/home.nix b/users/seb/@desktop/home.nix
similarity index 100%
rename from users/seb/@north/home.nix
rename to users/seb/@desktop/home.nix
diff --git a/users/seb/@north/secrets.json b/users/seb/@desktop/secrets.json
similarity index 100%
rename from users/seb/@north/secrets.json
rename to users/seb/@desktop/secrets.json
diff --git a/users/seb/@fern/home.nix b/users/seb/@laptop/home.nix
similarity index 100%
rename from users/seb/@fern/home.nix
rename to users/seb/@laptop/home.nix
diff --git a/users/seb/@fern/secrets.json b/users/seb/@laptop/secrets.json
similarity index 100%
rename from users/seb/@fern/secrets.json
rename to users/seb/@laptop/secrets.json