diff --git a/flake.nix b/flake.nix
index 0b547c8..3bb99a9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,7 @@
       };
     in {
       nixosConfigurations = {
-        c1 = mkNixos "c1" [ ./c1.nix ];
+        c1 = mkNixos "c1" [ ./hosts/c1 ];
       };
 
       deploy = {
diff --git a/c1.nix b/hosts/c1/default.nix
similarity index 85%
rename from c1.nix
rename to hosts/c1/default.nix
index 64c77e2..2228d9b 100644
--- a/c1.nix
+++ b/hosts/c1/default.nix
@@ -2,8 +2,8 @@
 {
   imports = [ 
     inputs.impermanence.nixosModules.impermanence
-    ./compute-node.nix
-    ./c1-hardware.nix
+    ../common/compute-node.nix
+    ./hardware.nix
   ];
 
   networking.hostName = hostname;
diff --git a/c1-hardware.nix b/hosts/c1/hardware.nix
similarity index 100%
rename from c1-hardware.nix
rename to hosts/c1/hardware.nix
diff --git a/compute-node.nix b/hosts/common/compute-node.nix
similarity index 100%
rename from compute-node.nix
rename to hosts/common/compute-node.nix