diff --git a/flake.nix b/flake.nix
index 4f3b354..f1cdab7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,19 +49,19 @@
       freun-dev = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
-        modules = [ ./freun.dev ];
+        modules = [ ./hosts/freun.dev ];
       };
 
       radish = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
-        modules = [ ./radish ];
+        modules = [ ./hosts/radish ];
       };
 
       apu = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
-        modules = [ ./apu ];
+        modules = [ ./hosts/apu ];
       };
     };
   };
diff --git a/apu/configuration.nix b/hosts/apu/configuration.nix
similarity index 100%
rename from apu/configuration.nix
rename to hosts/apu/configuration.nix
diff --git a/apu/default.nix b/hosts/apu/default.nix
similarity index 100%
rename from apu/default.nix
rename to hosts/apu/default.nix
diff --git a/apu/hardware-configuration.nix b/hosts/apu/hardware-configuration.nix
similarity index 100%
rename from apu/hardware-configuration.nix
rename to hosts/apu/hardware-configuration.nix
diff --git a/freun.dev/configuration.nix b/hosts/freun.dev/configuration.nix
similarity index 100%
rename from freun.dev/configuration.nix
rename to hosts/freun.dev/configuration.nix
diff --git a/freun.dev/default.nix b/hosts/freun.dev/default.nix
similarity index 100%
rename from freun.dev/default.nix
rename to hosts/freun.dev/default.nix
diff --git a/freun.dev/gotosocial.nix b/hosts/freun.dev/gotosocial.nix
similarity index 100%
rename from freun.dev/gotosocial.nix
rename to hosts/freun.dev/gotosocial.nix
diff --git a/freun.dev/grafana.nix b/hosts/freun.dev/grafana.nix
similarity index 100%
rename from freun.dev/grafana.nix
rename to hosts/freun.dev/grafana.nix
diff --git a/freun.dev/gtrackmap.nix b/hosts/freun.dev/gtrackmap.nix
similarity index 100%
rename from freun.dev/gtrackmap.nix
rename to hosts/freun.dev/gtrackmap.nix
diff --git a/freun.dev/hardware-configuration.nix b/hosts/freun.dev/hardware-configuration.nix
similarity index 100%
rename from freun.dev/hardware-configuration.nix
rename to hosts/freun.dev/hardware-configuration.nix
diff --git a/freun.dev/hydra.nix b/hosts/freun.dev/hydra.nix
similarity index 100%
rename from freun.dev/hydra.nix
rename to hosts/freun.dev/hydra.nix
diff --git a/freun.dev/immich.nix b/hosts/freun.dev/immich.nix
similarity index 100%
rename from freun.dev/immich.nix
rename to hosts/freun.dev/immich.nix
diff --git a/freun.dev/invidious.nix b/hosts/freun.dev/invidious.nix
similarity index 100%
rename from freun.dev/invidious.nix
rename to hosts/freun.dev/invidious.nix
diff --git a/freun.dev/owncast.nix b/hosts/freun.dev/owncast.nix
similarity index 100%
rename from freun.dev/owncast.nix
rename to hosts/freun.dev/owncast.nix
diff --git a/freun.dev/services.nix b/hosts/freun.dev/services.nix
similarity index 100%
rename from freun.dev/services.nix
rename to hosts/freun.dev/services.nix
diff --git a/freun.dev/syncthing.nix b/hosts/freun.dev/syncthing.nix
similarity index 100%
rename from freun.dev/syncthing.nix
rename to hosts/freun.dev/syncthing.nix
diff --git a/freun.dev/tailscale.nix b/hosts/freun.dev/tailscale.nix
similarity index 100%
rename from freun.dev/tailscale.nix
rename to hosts/freun.dev/tailscale.nix
diff --git a/freun.dev/vaultwarden.nix b/hosts/freun.dev/vaultwarden.nix
similarity index 100%
rename from freun.dev/vaultwarden.nix
rename to hosts/freun.dev/vaultwarden.nix
diff --git a/freun.dev/workout-tracker.nix b/hosts/freun.dev/workout-tracker.nix
similarity index 100%
rename from freun.dev/workout-tracker.nix
rename to hosts/freun.dev/workout-tracker.nix
diff --git a/radish/boot.nix b/hosts/radish/boot.nix
similarity index 100%
rename from radish/boot.nix
rename to hosts/radish/boot.nix
diff --git a/radish/configuration.nix b/hosts/radish/configuration.nix
similarity index 100%
rename from radish/configuration.nix
rename to hosts/radish/configuration.nix
diff --git a/radish/containers.nix b/hosts/radish/containers.nix
similarity index 100%
rename from radish/containers.nix
rename to hosts/radish/containers.nix
diff --git a/radish/default.nix b/hosts/radish/default.nix
similarity index 96%
rename from radish/default.nix
rename to hosts/radish/default.nix
index ac558cc..5b40005 100644
--- a/radish/default.nix
+++ b/hosts/radish/default.nix
@@ -17,6 +17,6 @@ in
     nixos-hardware.nixosModules.framework-13-7040-amd
     auto-cpufreq.nixosModules.default
     home-manager.nixosModules.home-manager
-    ../home
+    ../../home
   ];
 }
diff --git a/radish/desktop.nix b/hosts/radish/desktop.nix
similarity index 100%
rename from radish/desktop.nix
rename to hosts/radish/desktop.nix
diff --git a/radish/hardware-configuration.nix b/hosts/radish/hardware-configuration.nix
similarity index 100%
rename from radish/hardware-configuration.nix
rename to hosts/radish/hardware-configuration.nix
diff --git a/radish/hardware.nix b/hosts/radish/hardware.nix
similarity index 100%
rename from radish/hardware.nix
rename to hosts/radish/hardware.nix
diff --git a/radish/host.nix b/hosts/radish/host.nix
similarity index 100%
rename from radish/host.nix
rename to hosts/radish/host.nix
diff --git a/radish/packages.nix b/hosts/radish/packages.nix
similarity index 90%
rename from radish/packages.nix
rename to hosts/radish/packages.nix
index 9c42480..9765430 100644
--- a/radish/packages.nix
+++ b/hosts/radish/packages.nix
@@ -1,7 +1,7 @@
 { pkgs, lib, inputs, ... }:
 {
   nixpkgs.config.allowUnfree = true;
-  nixpkgs.overlays = [ (import ../custom-pkgs { inherit lib inputs; }) ];
+  nixpkgs.overlays = [ (import ../../custom-pkgs { inherit lib inputs; }) ];
 
   environment = {
     systemPackages = with pkgs; [
diff --git a/radish/users.nix b/hosts/radish/users.nix
similarity index 100%
rename from radish/users.nix
rename to hosts/radish/users.nix