diff --git a/flake.nix b/flake.nix
index 2fd599c..c4809ff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,14 +11,14 @@
     nixosConfigurations.torch = inputs.nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-        (import ./torch inputs)
+        (import ./machines/torch inputs)
         inputs.home-manager.nixosModules.home-manager
       ];
     };
 
     nixosConfigurations.nixos-dev = inputs.nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      modules = [ (import ./vbox inputs) ];
+      modules = [ (import ./machines/nixos-dev inputs) ];
     };
   };
 }
diff --git a/torch.sh b/machines.sh
similarity index 100%
rename from torch.sh
rename to machines.sh
diff --git a/vbox/default.nix b/machines/nixos-dev/default.nix
similarity index 99%
rename from vbox/default.nix
rename to machines/nixos-dev/default.nix
index f22f1cf..bc8abb1 100644
--- a/vbox/default.nix
+++ b/machines/nixos-dev/default.nix
@@ -8,7 +8,7 @@ inputs:
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ../nixos/nix
+      ../../nixos/nix
     ];
 
   # Use the GRUB 2 boot loader.
diff --git a/vbox/hardware-configuration.nix b/machines/nixos-dev/hardware-configuration.nix
similarity index 100%
rename from vbox/hardware-configuration.nix
rename to machines/nixos-dev/hardware-configuration.nix
diff --git a/torch/bluetooth/default.nix b/machines/torch/bluetooth/default.nix
similarity index 100%
rename from torch/bluetooth/default.nix
rename to machines/torch/bluetooth/default.nix
diff --git a/torch/brian/default.nix b/machines/torch/brian/default.nix
similarity index 100%
rename from torch/brian/default.nix
rename to machines/torch/brian/default.nix
diff --git a/torch/default.nix b/machines/torch/default.nix
similarity index 100%
rename from torch/default.nix
rename to machines/torch/default.nix
diff --git a/torch/gnome-keyring/default.nix b/machines/torch/gnome-keyring/default.nix
similarity index 100%
rename from torch/gnome-keyring/default.nix
rename to machines/torch/gnome-keyring/default.nix
diff --git a/torch/hardware-configuration.nix b/machines/torch/hardware-configuration.nix
similarity index 100%
rename from torch/hardware-configuration.nix
rename to machines/torch/hardware-configuration.nix
diff --git a/torch/networkmanager/default.nix b/machines/torch/networkmanager/default.nix
similarity index 100%
rename from torch/networkmanager/default.nix
rename to machines/torch/networkmanager/default.nix
diff --git a/torch/upower/default.nix b/machines/torch/upower/default.nix
similarity index 100%
rename from torch/upower/default.nix
rename to machines/torch/upower/default.nix
diff --git a/torch/xmonad/default.nix b/machines/torch/xmonad/default.nix
similarity index 100%
rename from torch/xmonad/default.nix
rename to machines/torch/xmonad/default.nix