diff --git a/flake.nix b/flake.nix
index 20ee91c..f59094b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -164,9 +164,9 @@
 
       packages = let
         aws = system:
-          import ./generators/aws { inherit inputs globals overlays system; };
+          import ./hosts/aws { inherit inputs globals overlays system; };
         staff = system:
-          import ./generators/staff { inherit inputs globals overlays system; };
+          import ./hosts/staff { inherit inputs globals overlays system; };
         neovim = system:
           let pkgs = import nixpkgs { inherit system overlays; };
           in import ./modules/common/neovim/package {
diff --git a/hosts/README.md b/hosts/README.md
index 8199301..052c3b4 100644
--- a/hosts/README.md
+++ b/hosts/README.md
@@ -2,6 +2,8 @@
 
 | Host                                       | Purpose             |
 | ---                                        | ---                 |
+| [aws](./aws/default.nix)                   | AWS AMI             |
+| [staff](./staff/default.nix)               | Live USB stick      |
 | [flame](./flame/default.nix)               | Oracle cloud server |
 | [hydra](./hydra/default.nix)               | WSL config          |
 | [lookingglass](./lookingglass/default.nix) | Work MacBook        |
diff --git a/generators/aws/default.nix b/hosts/aws/default.nix
similarity index 90%
rename from generators/aws/default.nix
rename to hosts/aws/default.nix
index 25087c0..45b9285 100644
--- a/generators/aws/default.nix
+++ b/hosts/aws/default.nix
@@ -1,12 +1,10 @@
 { inputs, system, globals, overlays, ... }:
 
-with inputs;
-
-nixos-generators.nixosGenerate {
+inputs.nixos-generators.nixosGenerate {
   inherit system;
   format = "amazon";
   modules = [
-    home-manager.nixosModules.home-manager
+    inputs.home-manager.nixosModules.home-manager
     {
       nixpkgs.overlays = overlays;
       user = globals.user;
diff --git a/generators/aws/main.tf b/hosts/aws/main.tf
similarity index 100%
rename from generators/aws/main.tf
rename to hosts/aws/main.tf
diff --git a/generators/aws/workflow.yml b/hosts/aws/workflow.yml
similarity index 100%
rename from generators/aws/workflow.yml
rename to hosts/aws/workflow.yml
diff --git a/generators/staff/default.nix b/hosts/staff/default.nix
similarity index 100%
rename from generators/staff/default.nix
rename to hosts/staff/default.nix