diff --git a/flake.nix b/flake.nix
index c5c4766..e0296de 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
   outputs = { self, nixpkgs }: {
     nixosConfigurations.catacomb = nixpkgs.lib.nixosSystem {
       system = "aarch64-linux";
-      modules = [ ./configuration.nix ];
+      modules = [ ./machine/catacomb ];
     };
   };
 }
diff --git a/configuration.nix b/machine/catacomb/default.nix
similarity index 96%
rename from configuration.nix
rename to machine/catacomb/default.nix
index b793248..8f9eca9 100644
--- a/configuration.nix
+++ b/machine/catacomb/default.nix
@@ -200,11 +200,11 @@
     password = "badpassword";
     extraGroups = ["wheel" "nas"];
     openssh.authorizedKeys.keyFiles = [
-      ./keys/tvb.palamas.pub
-      ./keys/tvb.stagirite.pub
-      ./keys/tvb.vagrant.pub
-      ./keys/monitor.isidore.pub
-      ./keys/inquisitor.conduit.pub
+      ../../keys/tvb.palamas.pub
+      ../../keys/tvb.stagirite.pub
+      ../../keys/tvb.vagrant.pub
+      ../../keys/monitor.isidore.pub
+      ../../keys/inquisitor.conduit.pub
     ];
   };
   #./keys/tvb.empyrean.pub
diff --git a/fileserver.nix b/machine/catacomb/fileserver.nix
similarity index 100%
rename from fileserver.nix
rename to machine/catacomb/fileserver.nix
diff --git a/hardware-configuration.nix b/machine/catacomb/hardware-configuration.nix
similarity index 100%
rename from hardware-configuration.nix
rename to machine/catacomb/hardware-configuration.nix