diff --git a/flake.nix b/flake.nix
index fe2a5f1..98c1f7d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -115,23 +115,27 @@
           system = "x86_64-linux";
           hostName = "levitation";
           extraModules = [
-            ./hardware/levitation.nix
             ./machines/levitation/configuration.nix
+            ./machines/levitation/hardware.nix
           ];
         };
 
         oracles = makeNixosSystem {
           system = "x86_64-linux";
           hostName = "oracles";
-          extraModules =
-            [ ./hardware/oracles.nix ./machines/oracles/configuration.nix ];
+          extraModules = [
+            ./machines/oracles/hardware.nix
+            ./machines/oracles/configuration.nix
+          ];
         };
 
         matrix = makeNixosSystem {
           system = "x86_64-linux";
           hostName = "matrix";
-          extraModules =
-            [ ./hardware/matrix.nix ./machines/matrix/configuration.nix ];
+          extraModules = [
+            ./machines/matrix/hardware.nix
+            ./machines/matrix/configuration.nix
+          ];
         };
 
         tounge = makeNixosSystem {
@@ -145,15 +149,17 @@
           hostName = "perception";
           extraModules = [
             ./machines/perception/configuration.nix
-            ./hardware/perception.nix
+            ./machines/perception/hardware.nix
           ];
         };
 
         fusion = makeNixosSystem {
           system = "aarch64-linux";
           hostName = "fusion";
-          extraModules =
-            [ ./machines/fusion/configuration.nix ./hardware/fusion.nix ];
+          extraModules = [
+            ./machines/fusion/hardware.nix
+            ./machines/fusion/configuration.nix
+          ];
         };
 
         x86vm = makeNixosSystem {
@@ -180,7 +186,7 @@
           hostName = "productivity-vm";
           extraModules = [
             ./machines/productivity-vm/configuration.nix
-            ./hardware/productivity-vm.nix
+            ./machines/productivity-vm/hardware.nix
           ];
         };
 
diff --git a/hardware/shadowchild.nix b/hardware/shadowchild.nix
deleted file mode 100644
index 926c63a..0000000
--- a/hardware/shadowchild.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ modulesPath, ... }: {
-  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-  boot.loader.grub = {
-    efiSupport = true;
-    efiInstallAsRemovable = true;
-    device = "nodev";
-  };
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/94E8-7477";
-    fsType = "vfat";
-  };
-  boot.initrd.kernelModules = [ "nvme" ];
-  fileSystems."/" = {
-    device = "/dev/sda1";
-    fsType = "ext4";
-  };
-
-  swapDevices = [{ device = "/swapfile"; }];
-}
diff --git a/hardware/fusion.nix b/machines/fusion/hardware.nix
similarity index 100%
rename from hardware/fusion.nix
rename to machines/fusion/hardware.nix
diff --git a/hardware/levitation.nix b/machines/levitation/hardware.nix
similarity index 100%
rename from hardware/levitation.nix
rename to machines/levitation/hardware.nix
diff --git a/hardware/matrix.nix b/machines/matrix/hardware.nix
similarity index 100%
rename from hardware/matrix.nix
rename to machines/matrix/hardware.nix
diff --git a/hardware/oracles.nix b/machines/oracles/hardware.nix
similarity index 100%
rename from hardware/oracles.nix
rename to machines/oracles/hardware.nix
diff --git a/hardware/perception.nix b/machines/perception/hardware.nix
similarity index 100%
rename from hardware/perception.nix
rename to machines/perception/hardware.nix
diff --git a/hardware/productivity-vm.nix b/machines/productivity-vm/hardware.nix
similarity index 100%
rename from hardware/productivity-vm.nix
rename to machines/productivity-vm/hardware.nix