diff --git a/flake.nix b/flake.nix
index c69e880..92d1c05 100644
--- a/flake.nix
+++ b/flake.nix
@@ -60,7 +60,7 @@
             inherit automapaper;
           };
           modules = [
-            ./hosts/default/configuration.nix
+            ./hosts/lambdaos/configuration.nix
             inputs.home-manager.nixosModules.default
           ];
         };
@@ -72,7 +72,7 @@
           modules = [
             disko.nixosModules.disko
             inputs.mailserver.nixosModules.default
-            ./hosts/server/configuration.nix
+            ./hosts/nuos/configuration.nix
             inputs.home-manager.nixosModules.default
           ];
         };
diff --git a/hosts/default/configuration.nix b/hosts/lambdaos/configuration.nix
similarity index 100%
rename from hosts/default/configuration.nix
rename to hosts/lambdaos/configuration.nix
diff --git a/hosts/default/hardware-configuration.nix b/hosts/lambdaos/hardware-configuration.nix
similarity index 100%
rename from hosts/default/hardware-configuration.nix
rename to hosts/lambdaos/hardware-configuration.nix
diff --git a/hosts/default/home.nix b/hosts/lambdaos/home.nix
similarity index 100%
rename from hosts/default/home.nix
rename to hosts/lambdaos/home.nix
diff --git a/hosts/default/root.nix b/hosts/lambdaos/root.nix
similarity index 100%
rename from hosts/default/root.nix
rename to hosts/lambdaos/root.nix
diff --git a/hosts/server/configuration.nix b/hosts/nuos/configuration.nix
similarity index 100%
rename from hosts/server/configuration.nix
rename to hosts/nuos/configuration.nix
diff --git a/hosts/server/disk-config.nix b/hosts/nuos/disk-config.nix
similarity index 100%
rename from hosts/server/disk-config.nix
rename to hosts/nuos/disk-config.nix
diff --git a/hosts/server/hardware-configuration.nix b/hosts/nuos/hardware-configuration.nix
similarity index 100%
rename from hosts/server/hardware-configuration.nix
rename to hosts/nuos/hardware-configuration.nix
diff --git a/hosts/server/home.nix b/hosts/nuos/home.nix
similarity index 100%
rename from hosts/server/home.nix
rename to hosts/nuos/home.nix
diff --git a/hosts/server/root.nix b/hosts/nuos/root.nix
similarity index 100%
rename from hosts/server/root.nix
rename to hosts/nuos/root.nix