diff --git a/systems/x86_64-linux/aspi/default.nix b/hosts/aspi/default.nix
similarity index 100%
rename from systems/x86_64-linux/aspi/default.nix
rename to hosts/aspi/default.nix
diff --git a/systems/x86_64-linux/aspi/hardware-configuration.nix b/hosts/aspi/hardware-configuration.nix
similarity index 100%
rename from systems/x86_64-linux/aspi/hardware-configuration.nix
rename to hosts/aspi/hardware-configuration.nix
diff --git a/systems/x86_64-linux/builder/default.nix b/hosts/builder/default.nix
similarity index 100%
rename from systems/x86_64-linux/builder/default.nix
rename to hosts/builder/default.nix
diff --git a/systems/x86_64-linux/builder/hardware-configuration.nix b/hosts/builder/hardware-configuration.nix
similarity index 100%
rename from systems/x86_64-linux/builder/hardware-configuration.nix
rename to hosts/builder/hardware-configuration.nix
diff --git a/systems/x86_64-linux/kardorf/default.nix b/hosts/kardorf/default.nix
similarity index 100%
rename from systems/x86_64-linux/kardorf/default.nix
rename to hosts/kardorf/default.nix
diff --git a/systems/x86_64-linux/kardorf/hardware-configuration.nix b/hosts/kardorf/hardware-configuration.nix
similarity index 100%
rename from systems/x86_64-linux/kardorf/hardware-configuration.nix
rename to hosts/kardorf/hardware-configuration.nix
diff --git a/systems/aarch64-linux/pianonix/default.nix b/hosts/pianonix/default.nix
similarity index 100%
rename from systems/aarch64-linux/pianonix/default.nix
rename to hosts/pianonix/default.nix
diff --git a/systems/aarch64-linux/pianonix/hardware-configuration.nix b/hosts/pianonix/hardware-configuration.nix
similarity index 100%
rename from systems/aarch64-linux/pianonix/hardware-configuration.nix
rename to hosts/pianonix/hardware-configuration.nix