diff --git a/flake.nix b/flake.nix
index adfdeb3..468b505 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,7 +56,7 @@
           impermanence.nixosModules.impermanence
           lanzaboote.nixosModules.lanzaboote
 
-          ./system
+          ./hosts/skipper
           ./users
           ./home
         ];
@@ -72,8 +72,8 @@
             system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
           }
 
+          ./hosts/rico
           ./users
-          ./system.rico
         ];
       };
     };
diff --git a/system.rico/default.nix b/hosts/rico/default.nix
similarity index 100%
rename from system.rico/default.nix
rename to hosts/rico/default.nix
diff --git a/system.rico/hardware/default.nix b/hosts/rico/hardware/default.nix
similarity index 100%
rename from system.rico/hardware/default.nix
rename to hosts/rico/hardware/default.nix
diff --git a/system.rico/hardware/filesystem.nix b/hosts/rico/hardware/filesystem.nix
similarity index 100%
rename from system.rico/hardware/filesystem.nix
rename to hosts/rico/hardware/filesystem.nix
diff --git a/system.rico/hardware/kernel.nix b/hosts/rico/hardware/kernel.nix
similarity index 100%
rename from system.rico/hardware/kernel.nix
rename to hosts/rico/hardware/kernel.nix
diff --git a/system.rico/programs/default.nix b/hosts/rico/programs/default.nix
similarity index 100%
rename from system.rico/programs/default.nix
rename to hosts/rico/programs/default.nix
diff --git a/system.rico/programs/neovim.nix b/hosts/rico/programs/neovim.nix
similarity index 100%
rename from system.rico/programs/neovim.nix
rename to hosts/rico/programs/neovim.nix
diff --git a/system.rico/security.nix b/hosts/rico/security.nix
similarity index 100%
rename from system.rico/security.nix
rename to hosts/rico/security.nix
diff --git a/system.rico/services/default.nix b/hosts/rico/services/default.nix
similarity index 100%
rename from system.rico/services/default.nix
rename to hosts/rico/services/default.nix
diff --git a/system/default.nix b/hosts/skipper/default.nix
similarity index 100%
rename from system/default.nix
rename to hosts/skipper/default.nix
diff --git a/system/hardware/default.nix b/hosts/skipper/hardware/default.nix
similarity index 100%
rename from system/hardware/default.nix
rename to hosts/skipper/hardware/default.nix
diff --git a/system/hardware/filesystem.nix b/hosts/skipper/hardware/filesystem.nix
similarity index 100%
rename from system/hardware/filesystem.nix
rename to hosts/skipper/hardware/filesystem.nix
diff --git a/system/hardware/kernel.nix b/hosts/skipper/hardware/kernel.nix
similarity index 88%
rename from system/hardware/kernel.nix
rename to hosts/skipper/hardware/kernel.nix
index fa769e2..d0f30a8 100644
--- a/system/hardware/kernel.nix
+++ b/hosts/skipper/hardware/kernel.nix
@@ -15,7 +15,7 @@
       systemd.enable = true;
     };
     kernelModules = [ "kvm-intel" ];
-    kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;
+    kernelPackages = pkgs.linuxPackages_xanmod_latest;
     kernelParams = [ "quiet" ];
     kernel.sysctl = {
       "vm.swappiness" = 0;
diff --git a/system/persistence.nix b/hosts/skipper/persistence.nix
similarity index 100%
rename from system/persistence.nix
rename to hosts/skipper/persistence.nix
diff --git a/system/plymouth.nix b/hosts/skipper/plymouth.nix
similarity index 100%
rename from system/plymouth.nix
rename to hosts/skipper/plymouth.nix
diff --git a/system/programs/default.nix b/hosts/skipper/programs/default.nix
similarity index 100%
rename from system/programs/default.nix
rename to hosts/skipper/programs/default.nix
diff --git a/system/programs/gnupg.nix b/hosts/skipper/programs/gnupg.nix
similarity index 100%
rename from system/programs/gnupg.nix
rename to hosts/skipper/programs/gnupg.nix
diff --git a/system/programs/neovim.nix b/hosts/skipper/programs/neovim.nix
similarity index 100%
rename from system/programs/neovim.nix
rename to hosts/skipper/programs/neovim.nix
diff --git a/system/secureboot.nix b/hosts/skipper/secureboot.nix
similarity index 100%
rename from system/secureboot.nix
rename to hosts/skipper/secureboot.nix
diff --git a/system/security.nix b/hosts/skipper/security.nix
similarity index 100%
rename from system/security.nix
rename to hosts/skipper/security.nix
diff --git a/system/services/dbus.nix b/hosts/skipper/services/dbus.nix
similarity index 100%
rename from system/services/dbus.nix
rename to hosts/skipper/services/dbus.nix
diff --git a/system/services/default.nix b/hosts/skipper/services/default.nix
similarity index 93%
rename from system/services/default.nix
rename to hosts/skipper/services/default.nix
index ed1036a..55e3c93 100644
--- a/system/services/default.nix
+++ b/hosts/skipper/services/default.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 let
-  user = import ../../users/user.nix;
+  user = import ../../../users/user.nix;
 in
 {
   imports = [
diff --git a/system/services/pipewire.nix b/hosts/skipper/services/pipewire.nix
similarity index 100%
rename from system/services/pipewire.nix
rename to hosts/skipper/services/pipewire.nix
diff --git a/system/services/tlp.nix b/hosts/skipper/services/tlp.nix
similarity index 100%
rename from system/services/tlp.nix
rename to hosts/skipper/services/tlp.nix
diff --git a/system/services/udev.nix b/hosts/skipper/services/udev.nix
similarity index 100%
rename from system/services/udev.nix
rename to hosts/skipper/services/udev.nix
diff --git a/system/virtualisation.nix b/hosts/skipper/virtualisation.nix
similarity index 100%
rename from system/virtualisation.nix
rename to hosts/skipper/virtualisation.nix