diff --git a/atauno/configuration.nix b/config/hosts/atauno/default.nix
similarity index 100%
rename from atauno/configuration.nix
rename to config/hosts/atauno/default.nix
diff --git a/atauno/hardware-configuration.nix b/config/hosts/atauno/hardware-configuration.nix
similarity index 100%
rename from atauno/hardware-configuration.nix
rename to config/hosts/atauno/hardware-configuration.nix
diff --git a/ursa-major/configuration.nix b/config/hosts/ursa-major/default.nix
similarity index 100%
rename from ursa-major/configuration.nix
rename to config/hosts/ursa-major/default.nix
diff --git a/ursa-major/hardware-configuration.nix b/config/hosts/ursa-major/hardware-configuration.nix
similarity index 100%
rename from ursa-major/hardware-configuration.nix
rename to config/hosts/ursa-major/hardware-configuration.nix
diff --git a/ursa-minor/README.md b/config/hosts/ursa-minor/README.md
similarity index 100%
rename from ursa-minor/README.md
rename to config/hosts/ursa-minor/README.md
diff --git a/ursa-minor/configuration.nix b/config/hosts/ursa-minor/default.nix
similarity index 100%
rename from ursa-minor/configuration.nix
rename to config/hosts/ursa-minor/default.nix
diff --git a/ursa-minor/hardware-configuration.nix b/config/hosts/ursa-minor/hardware-configuration.nix
similarity index 100%
rename from ursa-minor/hardware-configuration.nix
rename to config/hosts/ursa-minor/hardware-configuration.nix
diff --git a/ursa-minor/update-config.sh b/config/hosts/ursa-minor/update-config.sh
similarity index 100%
rename from ursa-minor/update-config.sh
rename to config/hosts/ursa-minor/update-config.sh
diff --git a/flake.nix b/flake.nix
index 341cf73..0b62e78 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,21 +45,15 @@
         ## ---- servers ----
         ursa-minor = nixpkgs.lib.nixosSystem {
           system = "aarch64-linux";
-          modules = [
-            ./ursa-minor/configuration.nix
-          ];
+          modules = [ ./config/hosts/ursa-minor ];
         };
         ursa-major = nixpkgs.lib.nixosSystem {
           system = "aarch64-linux";
-          modules = [
-            ./ursa-major/configuration.nix
-          ];
+          modules = [ ./config/hosts/ursa-major ];
         };
         atauno = nixpkgs.lib.nixosSystem {
           system = "aarch64-linux";
-          modules = [
-            ./atauno/configuration.nix
-          ];
+          modules = [ ./config/hosts/atauno ];
         };
       };
     };