diff --git a/flake.nix b/flake.nix
index 41b4ca8..005f9f8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,13 +41,13 @@
   in {
     nixosConfigurations.fuji = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      modules = [./fuji.nix] ++ modules';
+      modules = [./fuji] ++ modules';
       specialArgs = inputs;
     };
 
     nixosConfigurations.kilimandjaro = inputs.nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      modules = [./kilimandjaro.nix] ++ modules';
+      modules = [./kilimandjaro] ++ modules';
       specialArgs = inputs;
     };
 
diff --git a/fuji.nix b/fuji/default.nix
similarity index 93%
rename from fuji.nix
rename to fuji/default.nix
index 5029ac4..32f4e45 100644
--- a/fuji.nix
+++ b/fuji/default.nix
@@ -1,7 +1,7 @@
 {...}: {
   imports = [
-    ./common.nix
-    ./hardware/fuji.nix
+    ../common.nix
+    ./hardware-configuration.nix
   ];
 
   networking.hostName = "fuji";
diff --git a/hardware/fuji.nix b/fuji/hardware-configuration.nix
similarity index 100%
rename from hardware/fuji.nix
rename to fuji/hardware-configuration.nix
diff --git a/kilimandjaro.nix b/kilimandjaro/default.nix
similarity index 86%
rename from kilimandjaro.nix
rename to kilimandjaro/default.nix
index d34c793..12b7e2d 100644
--- a/kilimandjaro.nix
+++ b/kilimandjaro/default.nix
@@ -1,7 +1,7 @@
 {pkgs, ...}: {
   imports = [
-    ./common.nix
-    ./hardware/kilimandjaro.nix
+    ../common.nix
+    ./hardware-configuration.nix
   ];
 
   networking.hostName = "kilimandjaro";
diff --git a/hardware/kilimandjaro.nix b/kilimandjaro/hardware-configuration.nix
similarity index 100%
rename from hardware/kilimandjaro.nix
rename to kilimandjaro/hardware-configuration.nix