diff --git a/porthos/boot.nix b/machines/porthos/boot.nix
similarity index 100%
rename from porthos/boot.nix
rename to machines/porthos/boot.nix
diff --git a/porthos/default.nix b/machines/porthos/default.nix
similarity index 100%
rename from porthos/default.nix
rename to machines/porthos/default.nix
diff --git a/porthos/hardware.nix b/machines/porthos/hardware.nix
similarity index 100%
rename from porthos/hardware.nix
rename to machines/porthos/hardware.nix
diff --git a/porthos/networking.nix b/machines/porthos/networking.nix
similarity index 100%
rename from porthos/networking.nix
rename to machines/porthos/networking.nix
diff --git a/porthos/services.nix b/machines/porthos/services.nix
similarity index 100%
rename from porthos/services.nix
rename to machines/porthos/services.nix
diff --git a/porthos/users.nix b/machines/porthos/users.nix
similarity index 100%
rename from porthos/users.nix
rename to machines/porthos/users.nix
diff --git a/porthos.nix b/porthos.nix
index 2eda025..ce3a200 100644
--- a/porthos.nix
+++ b/porthos.nix
@@ -6,7 +6,7 @@
     # Include generic settings
     ./modules
     # Include porthos-specific modules
-    ./porthos
+    ./machines/porthos
     # Include my secrets
     ./secrets
     # Include my services