diff --git a/flake/nixos.nix b/flake/nixos.nix
index 84dce54..2d9d18b 100644
--- a/flake/nixos.nix
+++ b/flake/nixos.nix
@@ -21,7 +21,7 @@ let
   buildHost = name: system: lib.nixosSystem {
     inherit system;
     modules = defaultModules ++ [
-      "${self}/machines/${name}"
+      "${self}/hosts/nixos/${name}"
     ];
     specialArgs = {
       # Use my extended lib in NixOS configuration
diff --git a/machines/aramis/boot.nix b/hosts/nixos/aramis/boot.nix
similarity index 100%
rename from machines/aramis/boot.nix
rename to hosts/nixos/aramis/boot.nix
diff --git a/machines/aramis/default.nix b/hosts/nixos/aramis/default.nix
similarity index 100%
rename from machines/aramis/default.nix
rename to hosts/nixos/aramis/default.nix
diff --git a/machines/aramis/hardware.nix b/hosts/nixos/aramis/hardware.nix
similarity index 100%
rename from machines/aramis/hardware.nix
rename to hosts/nixos/aramis/hardware.nix
diff --git a/machines/aramis/home.nix b/hosts/nixos/aramis/home.nix
similarity index 100%
rename from machines/aramis/home.nix
rename to hosts/nixos/aramis/home.nix
diff --git a/machines/aramis/install.sh b/hosts/nixos/aramis/install.sh
similarity index 100%
rename from machines/aramis/install.sh
rename to hosts/nixos/aramis/install.sh
diff --git a/machines/aramis/networking.nix b/hosts/nixos/aramis/networking.nix
similarity index 100%
rename from machines/aramis/networking.nix
rename to hosts/nixos/aramis/networking.nix
diff --git a/machines/aramis/profiles.nix b/hosts/nixos/aramis/profiles.nix
similarity index 100%
rename from machines/aramis/profiles.nix
rename to hosts/nixos/aramis/profiles.nix
diff --git a/machines/aramis/programs.nix b/hosts/nixos/aramis/programs.nix
similarity index 100%
rename from machines/aramis/programs.nix
rename to hosts/nixos/aramis/programs.nix
diff --git a/machines/aramis/services.nix b/hosts/nixos/aramis/services.nix
similarity index 100%
rename from machines/aramis/services.nix
rename to hosts/nixos/aramis/services.nix
diff --git a/machines/aramis/sound.nix b/hosts/nixos/aramis/sound.nix
similarity index 100%
rename from machines/aramis/sound.nix
rename to hosts/nixos/aramis/sound.nix
diff --git a/machines/porthos/boot.nix b/hosts/nixos/porthos/boot.nix
similarity index 100%
rename from machines/porthos/boot.nix
rename to hosts/nixos/porthos/boot.nix
diff --git a/machines/porthos/default.nix b/hosts/nixos/porthos/default.nix
similarity index 100%
rename from machines/porthos/default.nix
rename to hosts/nixos/porthos/default.nix
diff --git a/machines/porthos/hardware.nix b/hosts/nixos/porthos/hardware.nix
similarity index 100%
rename from machines/porthos/hardware.nix
rename to hosts/nixos/porthos/hardware.nix
diff --git a/machines/porthos/home.nix b/hosts/nixos/porthos/home.nix
similarity index 100%
rename from machines/porthos/home.nix
rename to hosts/nixos/porthos/home.nix
diff --git a/machines/porthos/install.sh b/hosts/nixos/porthos/install.sh
similarity index 100%
rename from machines/porthos/install.sh
rename to hosts/nixos/porthos/install.sh
diff --git a/machines/porthos/networking.nix b/hosts/nixos/porthos/networking.nix
similarity index 100%
rename from machines/porthos/networking.nix
rename to hosts/nixos/porthos/networking.nix
diff --git a/machines/porthos/services.nix b/hosts/nixos/porthos/services.nix
similarity index 100%
rename from machines/porthos/services.nix
rename to hosts/nixos/porthos/services.nix
diff --git a/machines/porthos/ssh/drone.pub b/hosts/nixos/porthos/ssh/drone.pub
similarity index 100%
rename from machines/porthos/ssh/drone.pub
rename to hosts/nixos/porthos/ssh/drone.pub
diff --git a/machines/porthos/users.nix b/hosts/nixos/porthos/users.nix
similarity index 100%
rename from machines/porthos/users.nix
rename to hosts/nixos/porthos/users.nix