diff --git a/legacy/dotfiles/system/system-mreow.nix b/hosts/mreow/default.nix
similarity index 100%
rename from legacy/dotfiles/system/system-mreow.nix
rename to hosts/mreow/default.nix
diff --git a/legacy/dotfiles/system/disk_mreow.nix b/hosts/mreow/disk.nix
similarity index 100%
rename from legacy/dotfiles/system/disk_mreow.nix
rename to hosts/mreow/disk.nix
diff --git a/legacy/dotfiles/home-manager/home-mreow.nix b/hosts/mreow/home.nix
similarity index 100%
rename from legacy/dotfiles/home-manager/home-mreow.nix
rename to hosts/mreow/home.nix
diff --git a/legacy/server-config/configuration.nix b/hosts/muffin/default.nix
similarity index 100%
rename from legacy/server-config/configuration.nix
rename to hosts/muffin/default.nix
diff --git a/legacy/server-config/disk-config.nix b/hosts/muffin/disk.nix
similarity index 100%
rename from legacy/server-config/disk-config.nix
rename to hosts/muffin/disk.nix
diff --git a/legacy/server-config/modules/hardware.nix b/hosts/muffin/hardware.nix
similarity index 100%
rename from legacy/server-config/modules/hardware.nix
rename to hosts/muffin/hardware.nix
diff --git a/legacy/server-config/modules/home.nix b/hosts/muffin/home.nix
similarity index 100%
rename from legacy/server-config/modules/home.nix
rename to hosts/muffin/home.nix
diff --git a/legacy/server-config/service-configs.nix b/hosts/muffin/service-configs.nix
similarity index 100%
rename from legacy/server-config/service-configs.nix
rename to hosts/muffin/service-configs.nix
diff --git a/legacy/dotfiles/system/system-yarn.nix b/hosts/yarn/default.nix
similarity index 100%
rename from legacy/dotfiles/system/system-yarn.nix
rename to hosts/yarn/default.nix
diff --git a/legacy/dotfiles/system/disk_yarn.nix b/hosts/yarn/disk.nix
similarity index 100%
rename from legacy/dotfiles/system/disk_yarn.nix
rename to hosts/yarn/disk.nix
diff --git a/legacy/dotfiles/home-manager/home-yarn.nix b/hosts/yarn/home.nix
similarity index 100%
rename from legacy/dotfiles/home-manager/home-yarn.nix
rename to hosts/yarn/home.nix
diff --git a/legacy/dotfiles/system/impermanence.nix b/hosts/yarn/impermanence.nix
similarity index 100%
rename from legacy/dotfiles/system/impermanence.nix
rename to hosts/yarn/impermanence.nix
diff --git a/legacy/dotfiles/system/vr.nix b/hosts/yarn/vr.nix
similarity index 100%
rename from legacy/dotfiles/system/vr.nix
rename to hosts/yarn/vr.nix