diff --git a/flake.nix b/flake.nix
index 722e645..2684520 100644
--- a/flake.nix
+++ b/flake.nix
@@ -212,14 +212,14 @@
 
       nixosConfigurations = {
         triple-dezert = mkNixosConfig {
-          module = ./triple-dezert;
+          module = ./hosts/triple-dezert;
           inp = [
             "most-winningest"
             "sops-nix"
           ];
         };
         compute-deck = mkNixosConfig {
-          module = ./compute-deck;
+          module = ./hosts/compute-deck;
           inp = [
             "jovian"
             "home-manager"
@@ -229,14 +229,14 @@
           unstable = true;
         };
         liam = mkNixosConfig {
-          module = ./liam;
+          module = ./hosts/liam;
           inp = [ "sops-nix" ];
         };
-        lp0 = mkNixosConfig { module = ./lp0; };
-        shel-installer-iso = mkNixosConfig { module = ./installer/iso.nix; };
-        shel-installer-pxe = mkNixosConfig { module = ./installer/pxe.nix; };
+        lp0 = mkNixosConfig { module = ./hosts/lp0; };
+        shel-installer-iso = mkNixosConfig { module = ./hosts/installer/iso.nix; };
+        shel-installer-pxe = mkNixosConfig { module = ./hosts/installer/pxe.nix; };
         fw = mkNixosConfig {
-          module = ./fw;
+          module = ./hosts/fw;
           inp = [
             "nixos-hardware"
             "sops-nix"
@@ -244,17 +244,17 @@
           ];
         };
         legtop = mkNixosConfig {
-          module = ./legtop;
+          module = ./hosts/legtop;
           inp = [ "nixos-hardware" ];
         };
         mmm = mkNixosConfig {
-          module = ./mmm;
+          module = ./hosts/mmm;
           inp = [ "nixos-apple-silicon" ];
           system = "aarch64-linux";
           unstable = true;
         };
         prophecy = mkNixosConfig {
-          module = ./prophecy;
+          module = ./hosts/prophecy;
           system = "x86_64-linux";
           inp = [
             "impermanence"
@@ -263,7 +263,7 @@
           ];
         };
         solis = mkNixosConfig {
-          module = ./solis;
+          module = ./hosts/solis;
           system = "x86_64-linux";
           inp = [
             "disko"
@@ -280,7 +280,7 @@
         nix-on-droid.lib.nixOnDroidConfiguration {
           modules = [
             ./common
-            ./nix-on-droid
+            ./hosts/nix-on-droid
           ];
           extraSpecialArgs = common.specialArgs;
           inherit (common) pkgs;
@@ -298,12 +298,6 @@
             node.pkgs = pkgs;
             node.pkgsReadOnly = true;
             node.specialArgs = (lib.removeAttrs common.specialArgs [ "inputs" ]) // { selfPackages = self.packages.${system}; };
-            # node.specialArgs = {
-            #   inherit vacuModules;
-            #   selfPackages = self.packages.${system};
-            #   vaculib = import ./vaculib { inherit pkgs; };
-            #   vacuModuleType = "nixos";
-            # };
           };
           mkTest =
             name:
diff --git a/compute-deck/bluetooth.nix b/hosts/compute-deck/bluetooth.nix
similarity index 100%
rename from compute-deck/bluetooth.nix
rename to hosts/compute-deck/bluetooth.nix
diff --git a/compute-deck/default.nix b/hosts/compute-deck/default.nix
similarity index 100%
rename from compute-deck/default.nix
rename to hosts/compute-deck/default.nix
diff --git a/compute-deck/hardware.nix b/hosts/compute-deck/hardware.nix
similarity index 100%
rename from compute-deck/hardware.nix
rename to hosts/compute-deck/hardware.nix
diff --git a/compute-deck/home.nix b/hosts/compute-deck/home.nix
similarity index 100%
rename from compute-deck/home.nix
rename to hosts/compute-deck/home.nix
diff --git a/compute-deck/padtype.nix b/hosts/compute-deck/padtype.nix
similarity index 100%
rename from compute-deck/padtype.nix
rename to hosts/compute-deck/padtype.nix
diff --git a/compute-deck/partitioning.nix b/hosts/compute-deck/partitioning.nix
similarity index 100%
rename from compute-deck/partitioning.nix
rename to hosts/compute-deck/partitioning.nix
diff --git a/fw/android.nix b/hosts/fw/android.nix
similarity index 100%
rename from fw/android.nix
rename to hosts/fw/android.nix
diff --git a/fw/apex.nix b/hosts/fw/apex.nix
similarity index 100%
rename from fw/apex.nix
rename to hosts/fw/apex.nix
diff --git a/fw/default.nix b/hosts/fw/default.nix
similarity index 100%
rename from fw/default.nix
rename to hosts/fw/default.nix
diff --git a/fw/fwupd.nix b/hosts/fw/fwupd.nix
similarity index 100%
rename from fw/fwupd.nix
rename to hosts/fw/fwupd.nix
diff --git a/fw/podman.nix b/hosts/fw/podman.nix
similarity index 100%
rename from fw/podman.nix
rename to hosts/fw/podman.nix
diff --git a/fw/radicle.nix b/hosts/fw/radicle.nix
similarity index 100%
rename from fw/radicle.nix
rename to hosts/fw/radicle.nix
diff --git a/fw/sops.nix b/hosts/fw/sops.nix
similarity index 100%
rename from fw/sops.nix
rename to hosts/fw/sops.nix
diff --git a/fw/thunderbolt.nix b/hosts/fw/thunderbolt.nix
similarity index 100%
rename from fw/thunderbolt.nix
rename to hosts/fw/thunderbolt.nix
diff --git a/fw/tpm-fido.nix b/hosts/fw/tpm-fido.nix
similarity index 100%
rename from fw/tpm-fido.nix
rename to hosts/fw/tpm-fido.nix
diff --git a/fw/virtualbox.nix b/hosts/fw/virtualbox.nix
similarity index 100%
rename from fw/virtualbox.nix
rename to hosts/fw/virtualbox.nix
diff --git a/fw/waydroid.nix b/hosts/fw/waydroid.nix
similarity index 100%
rename from fw/waydroid.nix
rename to hosts/fw/waydroid.nix
diff --git a/fw/zfs.nix b/hosts/fw/zfs.nix
similarity index 100%
rename from fw/zfs.nix
rename to hosts/fw/zfs.nix
diff --git a/installer/common/default.nix b/hosts/installer/common/default.nix
similarity index 100%
rename from installer/common/default.nix
rename to hosts/installer/common/default.nix
diff --git a/installer/iso.nix b/hosts/installer/iso.nix
similarity index 100%
rename from installer/iso.nix
rename to hosts/installer/iso.nix
diff --git a/installer/pxe.nix b/hosts/installer/pxe.nix
similarity index 100%
rename from installer/pxe.nix
rename to hosts/installer/pxe.nix
diff --git a/legtop/bluetooth.nix b/hosts/legtop/bluetooth.nix
similarity index 100%
rename from legtop/bluetooth.nix
rename to hosts/legtop/bluetooth.nix
diff --git a/legtop/default.nix b/hosts/legtop/default.nix
similarity index 100%
rename from legtop/default.nix
rename to hosts/legtop/default.nix
diff --git a/legtop/hardware.nix b/hosts/legtop/hardware.nix
similarity index 100%
rename from legtop/hardware.nix
rename to hosts/legtop/hardware.nix
diff --git a/liam/backup.nix b/hosts/liam/backup.nix
similarity index 100%
rename from liam/backup.nix
rename to hosts/liam/backup.nix
diff --git a/liam/default.nix b/hosts/liam/default.nix
similarity index 100%
rename from liam/default.nix
rename to hosts/liam/default.nix
diff --git a/liam/dkim.nix b/hosts/liam/dkim.nix
similarity index 100%
rename from liam/dkim.nix
rename to hosts/liam/dkim.nix
diff --git a/liam/dovecot.nix b/hosts/liam/dovecot.nix
similarity index 100%
rename from liam/dovecot.nix
rename to hosts/liam/dovecot.nix
diff --git a/liam/mail.nix b/hosts/liam/mail.nix
similarity index 100%
rename from liam/mail.nix
rename to hosts/liam/mail.nix
diff --git a/liam/network.nix b/hosts/liam/network.nix
similarity index 100%
rename from liam/network.nix
rename to hosts/liam/network.nix
diff --git a/liam/nginx.nix b/hosts/liam/nginx.nix
similarity index 100%
rename from liam/nginx.nix
rename to hosts/liam/nginx.nix
diff --git a/liam/notes.txt b/hosts/liam/notes.txt
similarity index 100%
rename from liam/notes.txt
rename to hosts/liam/notes.txt
diff --git a/liam/sieve.nix b/hosts/liam/sieve.nix
similarity index 100%
rename from liam/sieve.nix
rename to hosts/liam/sieve.nix
diff --git a/liam/sops.nix b/hosts/liam/sops.nix
similarity index 100%
rename from liam/sops.nix
rename to hosts/liam/sops.nix
diff --git a/lp0/default.nix b/hosts/lp0/default.nix
similarity index 100%
rename from lp0/default.nix
rename to hosts/lp0/default.nix
diff --git a/lp0/hardware-config.nix b/hosts/lp0/hardware-config.nix
similarity index 100%
rename from lp0/hardware-config.nix
rename to hosts/lp0/hardware-config.nix
diff --git a/mmm/default.nix b/hosts/mmm/default.nix
similarity index 100%
rename from mmm/default.nix
rename to hosts/mmm/default.nix
diff --git a/mmm/firmware/all_firmware.tar.gz b/hosts/mmm/firmware/all_firmware.tar.gz
similarity index 100%
rename from mmm/firmware/all_firmware.tar.gz
rename to hosts/mmm/firmware/all_firmware.tar.gz
diff --git a/mmm/firmware/kernelcache.release.mac13g b/hosts/mmm/firmware/kernelcache.release.mac13g
similarity index 100%
rename from mmm/firmware/kernelcache.release.mac13g
rename to hosts/mmm/firmware/kernelcache.release.mac13g
diff --git a/mmm/hardware.nix b/hosts/mmm/hardware.nix
similarity index 100%
rename from mmm/hardware.nix
rename to hosts/mmm/hardware.nix
diff --git a/nix-on-droid/default.nix b/hosts/nix-on-droid/default.nix
similarity index 100%
rename from nix-on-droid/default.nix
rename to hosts/nix-on-droid/default.nix
diff --git a/nix-on-droid/flake-registry.nix b/hosts/nix-on-droid/flake-registry.nix
similarity index 100%
rename from nix-on-droid/flake-registry.nix
rename to hosts/nix-on-droid/flake-registry.nix
diff --git a/nix-on-droid/sshd.nix b/hosts/nix-on-droid/sshd.nix
similarity index 100%
rename from nix-on-droid/sshd.nix
rename to hosts/nix-on-droid/sshd.nix
diff --git a/prophecy/btrfs.nix b/hosts/prophecy/btrfs.nix
similarity index 100%
rename from prophecy/btrfs.nix
rename to hosts/prophecy/btrfs.nix
diff --git a/prophecy/caddy.nix b/hosts/prophecy/caddy.nix
similarity index 100%
rename from prophecy/caddy.nix
rename to hosts/prophecy/caddy.nix
diff --git a/prophecy/dav-experiment.nix b/hosts/prophecy/dav-experiment.nix
similarity index 100%
rename from prophecy/dav-experiment.nix
rename to hosts/prophecy/dav-experiment.nix
diff --git a/prophecy/default.nix b/hosts/prophecy/default.nix
similarity index 100%
rename from prophecy/default.nix
rename to hosts/prophecy/default.nix
diff --git a/prophecy/doof.nix b/hosts/prophecy/doof.nix
similarity index 100%
rename from prophecy/doof.nix
rename to hosts/prophecy/doof.nix
diff --git a/prophecy/garage.nix b/hosts/prophecy/garage.nix
similarity index 100%
rename from prophecy/garage.nix
rename to hosts/prophecy/garage.nix
diff --git a/prophecy/genieacs.nix b/hosts/prophecy/genieacs.nix
similarity index 100%
rename from prophecy/genieacs.nix
rename to hosts/prophecy/genieacs.nix
diff --git a/prophecy/gpu.nix b/hosts/prophecy/gpu.nix
similarity index 100%
rename from prophecy/gpu.nix
rename to hosts/prophecy/gpu.nix
diff --git a/prophecy/hardware.nix b/hosts/prophecy/hardware.nix
similarity index 100%
rename from prophecy/hardware.nix
rename to hosts/prophecy/hardware.nix
diff --git a/prophecy/hath.nix b/hosts/prophecy/hath.nix
similarity index 100%
rename from prophecy/hath.nix
rename to hosts/prophecy/hath.nix
diff --git a/prophecy/image-mounts.nix b/hosts/prophecy/image-mounts.nix
similarity index 100%
rename from prophecy/image-mounts.nix
rename to hosts/prophecy/image-mounts.nix
diff --git a/prophecy/impermanence.nix b/hosts/prophecy/impermanence.nix
similarity index 100%
rename from prophecy/impermanence.nix
rename to hosts/prophecy/impermanence.nix
diff --git a/prophecy/murmur.nix b/hosts/prophecy/murmur.nix
similarity index 100%
rename from prophecy/murmur.nix
rename to hosts/prophecy/murmur.nix
diff --git a/prophecy/networking.nix b/hosts/prophecy/networking.nix
similarity index 100%
rename from prophecy/networking.nix
rename to hosts/prophecy/networking.nix
diff --git a/prophecy/propdata.nix b/hosts/prophecy/propdata.nix
similarity index 100%
rename from prophecy/propdata.nix
rename to hosts/prophecy/propdata.nix
diff --git a/prophecy/silence.nix b/hosts/prophecy/silence.nix
similarity index 100%
rename from prophecy/silence.nix
rename to hosts/prophecy/silence.nix
diff --git a/prophecy/sops.nix b/hosts/prophecy/sops.nix
similarity index 100%
rename from prophecy/sops.nix
rename to hosts/prophecy/sops.nix
diff --git a/solis/caddy.nix b/hosts/solis/caddy.nix
similarity index 100%
rename from solis/caddy.nix
rename to hosts/solis/caddy.nix
diff --git a/solis/default.nix b/hosts/solis/default.nix
similarity index 100%
rename from solis/default.nix
rename to hosts/solis/default.nix
diff --git a/solis/disko.nix b/hosts/solis/disko.nix
similarity index 100%
rename from solis/disko.nix
rename to hosts/solis/disko.nix
diff --git a/solis/garage.nix b/hosts/solis/garage.nix
similarity index 100%
rename from solis/garage.nix
rename to hosts/solis/garage.nix
diff --git a/solis/hardware.nix b/hosts/solis/hardware.nix
similarity index 100%
rename from solis/hardware.nix
rename to hosts/solis/hardware.nix
diff --git a/solis/impermanence.nix b/hosts/solis/impermanence.nix
similarity index 100%
rename from solis/impermanence.nix
rename to hosts/solis/impermanence.nix
diff --git a/solis/sops.nix b/hosts/solis/sops.nix
similarity index 100%
rename from solis/sops.nix
rename to hosts/solis/sops.nix
diff --git a/triple-dezert/awootrip.nix b/hosts/triple-dezert/awootrip.nix
similarity index 100%
rename from triple-dezert/awootrip.nix
rename to hosts/triple-dezert/awootrip.nix
diff --git a/triple-dezert/database.nix b/hosts/triple-dezert/database.nix
similarity index 100%
rename from triple-dezert/database.nix
rename to hosts/triple-dezert/database.nix
diff --git a/triple-dezert/default.nix b/hosts/triple-dezert/default.nix
similarity index 100%
rename from triple-dezert/default.nix
rename to hosts/triple-dezert/default.nix
diff --git a/triple-dezert/disko.nix b/hosts/triple-dezert/disko.nix
similarity index 100%
rename from triple-dezert/disko.nix
rename to hosts/triple-dezert/disko.nix
diff --git a/triple-dezert/docker.nix b/hosts/triple-dezert/docker.nix
similarity index 100%
rename from triple-dezert/docker.nix
rename to hosts/triple-dezert/docker.nix
diff --git a/triple-dezert/dovecot-backup.nix b/hosts/triple-dezert/dovecot-backup.nix
similarity index 100%
rename from triple-dezert/dovecot-backup.nix
rename to hosts/triple-dezert/dovecot-backup.nix
diff --git a/triple-dezert/emily.nix b/hosts/triple-dezert/emily.nix
similarity index 100%
rename from triple-dezert/emily.nix
rename to hosts/triple-dezert/emily.nix
diff --git a/triple-dezert/gallerygrab.nix b/hosts/triple-dezert/gallerygrab.nix
similarity index 100%
rename from triple-dezert/gallerygrab.nix
rename to hosts/triple-dezert/gallerygrab.nix
diff --git a/triple-dezert/hardware-configuration.nix b/hosts/triple-dezert/hardware-configuration.nix
similarity index 100%
rename from triple-dezert/hardware-configuration.nix
rename to hosts/triple-dezert/hardware-configuration.nix
diff --git a/triple-dezert/networking.nix b/hosts/triple-dezert/networking.nix
similarity index 100%
rename from triple-dezert/networking.nix
rename to hosts/triple-dezert/networking.nix
diff --git a/triple-dezert/proxied/default.nix b/hosts/triple-dezert/proxied/default.nix
similarity index 100%
rename from triple-dezert/proxied/default.nix
rename to hosts/triple-dezert/proxied/default.nix
diff --git a/triple-dezert/proxied/frontproxy.nix b/hosts/triple-dezert/proxied/frontproxy.nix
similarity index 100%
rename from triple-dezert/proxied/frontproxy.nix
rename to hosts/triple-dezert/proxied/frontproxy.nix
diff --git a/triple-dezert/proxied/garage.nix b/hosts/triple-dezert/proxied/garage.nix
similarity index 100%
rename from triple-dezert/proxied/garage.nix
rename to hosts/triple-dezert/proxied/garage.nix
diff --git a/triple-dezert/proxied/haproxy-config.nix b/hosts/triple-dezert/proxied/haproxy-config.nix
similarity index 100%
rename from triple-dezert/proxied/haproxy-config.nix
rename to hosts/triple-dezert/proxied/haproxy-config.nix
diff --git a/triple-dezert/proxied/options.nix b/hosts/triple-dezert/proxied/options.nix
similarity index 100%
rename from triple-dezert/proxied/options.nix
rename to hosts/triple-dezert/proxied/options.nix
diff --git a/triple-dezert/proxied/services/default.nix b/hosts/triple-dezert/proxied/services/default.nix
similarity index 100%
rename from triple-dezert/proxied/services/default.nix
rename to hosts/triple-dezert/proxied/services/default.nix
diff --git a/triple-dezert/proxied/services/dufs.nix b/hosts/triple-dezert/proxied/services/dufs.nix
similarity index 100%
rename from triple-dezert/proxied/services/dufs.nix
rename to hosts/triple-dezert/proxied/services/dufs.nix
diff --git a/triple-dezert/proxied/services/habitat-fwd.nix b/hosts/triple-dezert/proxied/services/habitat-fwd.nix
similarity index 100%
rename from triple-dezert/proxied/services/habitat-fwd.nix
rename to hosts/triple-dezert/proxied/services/habitat-fwd.nix
diff --git a/triple-dezert/proxied/services/jellyfin.nix b/hosts/triple-dezert/proxied/services/jellyfin.nix
similarity index 100%
rename from triple-dezert/proxied/services/jellyfin.nix
rename to hosts/triple-dezert/proxied/services/jellyfin.nix
diff --git a/triple-dezert/proxied/services/jl-stats.nix b/hosts/triple-dezert/proxied/services/jl-stats.nix
similarity index 100%
rename from triple-dezert/proxied/services/jl-stats.nix
rename to hosts/triple-dezert/proxied/services/jl-stats.nix
diff --git a/triple-dezert/proxied/services/jobs.nix b/hosts/triple-dezert/proxied/services/jobs.nix
similarity index 100%
rename from triple-dezert/proxied/services/jobs.nix
rename to hosts/triple-dezert/proxied/services/jobs.nix
diff --git a/triple-dezert/proxied/services/kanidm.nix b/hosts/triple-dezert/proxied/services/kanidm.nix
similarity index 100%
rename from triple-dezert/proxied/services/kanidm.nix
rename to hosts/triple-dezert/proxied/services/kanidm.nix
diff --git a/triple-dezert/proxied/services/keycloak.nix b/hosts/triple-dezert/proxied/services/keycloak.nix
similarity index 100%
rename from triple-dezert/proxied/services/keycloak.nix
rename to hosts/triple-dezert/proxied/services/keycloak.nix
diff --git a/triple-dezert/proxied/services/llm.nix b/hosts/triple-dezert/proxied/services/llm.nix
similarity index 100%
rename from triple-dezert/proxied/services/llm.nix
rename to hosts/triple-dezert/proxied/services/llm.nix
diff --git a/triple-dezert/proxied/services/mira/default.nix b/hosts/triple-dezert/proxied/services/mira/default.nix
similarity index 100%
rename from triple-dezert/proxied/services/mira/default.nix
rename to hosts/triple-dezert/proxied/services/mira/default.nix
diff --git a/triple-dezert/proxied/services/mira/mira-auth.nix b/hosts/triple-dezert/proxied/services/mira/mira-auth.nix
similarity index 100%
rename from triple-dezert/proxied/services/mira/mira-auth.nix
rename to hosts/triple-dezert/proxied/services/mira/mira-auth.nix
diff --git a/triple-dezert/proxied/services/mira/mira-chat.nix b/hosts/triple-dezert/proxied/services/mira/mira-chat.nix
similarity index 100%
rename from triple-dezert/proxied/services/mira/mira-chat.nix
rename to hosts/triple-dezert/proxied/services/mira/mira-chat.nix
diff --git a/triple-dezert/proxied/services/mira/mira-git.nix b/hosts/triple-dezert/proxied/services/mira/mira-git.nix
similarity index 100%
rename from triple-dezert/proxied/services/mira/mira-git.nix
rename to hosts/triple-dezert/proxied/services/mira/mira-git.nix
diff --git a/triple-dezert/proxied/services/mira/mira-link-auth-git.nix b/hosts/triple-dezert/proxied/services/mira/mira-link-auth-git.nix
similarity index 100%
rename from triple-dezert/proxied/services/mira/mira-link-auth-git.nix
rename to hosts/triple-dezert/proxied/services/mira/mira-link-auth-git.nix
diff --git a/triple-dezert/proxied/services/mira/mira-wisdom.nix b/hosts/triple-dezert/proxied/services/mira/mira-wisdom.nix
similarity index 100%
rename from triple-dezert/proxied/services/mira/mira-wisdom.nix
rename to hosts/triple-dezert/proxied/services/mira/mira-wisdom.nix
diff --git a/triple-dezert/proxied/services/nix-cache-nginx.nix b/hosts/triple-dezert/proxied/services/nix-cache-nginx.nix
similarity index 100%
rename from triple-dezert/proxied/services/nix-cache-nginx.nix
rename to hosts/triple-dezert/proxied/services/nix-cache-nginx.nix
diff --git a/triple-dezert/proxied/services/radicle.nix b/hosts/triple-dezert/proxied/services/radicle.nix
similarity index 100%
rename from triple-dezert/proxied/services/radicle.nix
rename to hosts/triple-dezert/proxied/services/radicle.nix
diff --git a/triple-dezert/proxied/services/static-stuff.nix b/hosts/triple-dezert/proxied/services/static-stuff.nix
similarity index 100%
rename from triple-dezert/proxied/services/static-stuff.nix
rename to hosts/triple-dezert/proxied/services/static-stuff.nix
diff --git a/triple-dezert/proxied/services/template.nix b/hosts/triple-dezert/proxied/services/template.nix
similarity index 100%
rename from triple-dezert/proxied/services/template.nix
rename to hosts/triple-dezert/proxied/services/template.nix
diff --git a/triple-dezert/proxied/services/vacustore.nix b/hosts/triple-dezert/proxied/services/vacustore.nix
similarity index 100%
rename from triple-dezert/proxied/services/vacustore.nix
rename to hosts/triple-dezert/proxied/services/vacustore.nix
diff --git a/triple-dezert/proxied/services/vaultwarden.nix b/hosts/triple-dezert/proxied/services/vaultwarden.nix
similarity index 100%
rename from triple-dezert/proxied/services/vaultwarden.nix
rename to hosts/triple-dezert/proxied/services/vaultwarden.nix
diff --git a/triple-dezert/sops.nix b/hosts/triple-dezert/sops.nix
similarity index 100%
rename from triple-dezert/sops.nix
rename to hosts/triple-dezert/sops.nix
diff --git a/triple-dezert/yt-archiver.nix b/hosts/triple-dezert/yt-archiver.nix
similarity index 100%
rename from triple-dezert/yt-archiver.nix
rename to hosts/triple-dezert/yt-archiver.nix