diff --git a/system/common/base/auto-upgrade.nix b/hosts/common/base/auto-upgrade.nix
similarity index 100%
rename from system/common/base/auto-upgrade.nix
rename to hosts/common/base/auto-upgrade.nix
diff --git a/system/common/base/default.nix b/hosts/common/base/default.nix
similarity index 100%
rename from system/common/base/default.nix
rename to hosts/common/base/default.nix
diff --git a/system/common/base/fish.nix b/hosts/common/base/fish.nix
similarity index 100%
rename from system/common/base/fish.nix
rename to hosts/common/base/fish.nix
diff --git a/system/common/base/locale.nix b/hosts/common/base/locale.nix
similarity index 100%
rename from system/common/base/locale.nix
rename to hosts/common/base/locale.nix
diff --git a/system/common/base/nix.nix b/hosts/common/base/nix.nix
similarity index 100%
rename from system/common/base/nix.nix
rename to hosts/common/base/nix.nix
diff --git a/system/common/base/pipewire.nix b/hosts/common/base/pipewire.nix
similarity index 100%
rename from system/common/base/pipewire.nix
rename to hosts/common/base/pipewire.nix
diff --git a/system/common/base/security.nix b/hosts/common/base/security.nix
similarity index 100%
rename from system/common/base/security.nix
rename to hosts/common/base/security.nix
diff --git a/system/common/base/systemdboot.nix b/hosts/common/base/systemdboot.nix
similarity index 100%
rename from system/common/base/systemdboot.nix
rename to hosts/common/base/systemdboot.nix
diff --git a/system/common/features/bluetooth.nix b/hosts/common/features/bluetooth.nix
similarity index 100%
rename from system/common/features/bluetooth.nix
rename to hosts/common/features/bluetooth.nix
diff --git a/system/common/features/greetd.nix b/hosts/common/features/greetd.nix
similarity index 100%
rename from system/common/features/greetd.nix
rename to hosts/common/features/greetd.nix
diff --git a/system/common/features/vm.nix b/hosts/common/features/vm.nix
similarity index 100%
rename from system/common/features/vm.nix
rename to hosts/common/features/vm.nix
diff --git a/system/common/user/ooks/default.nix b/hosts/common/user/ooks/default.nix
similarity index 100%
rename from system/common/user/ooks/default.nix
rename to hosts/common/user/ooks/default.nix
diff --git a/system/ooksdesk/ooksdesk.nix b/hosts/ooksdesk/ooksdesk.nix
similarity index 100%
rename from system/ooksdesk/ooksdesk.nix
rename to hosts/ooksdesk/ooksdesk.nix
diff --git a/system/ooksmicro/hardware-configuration.nix b/hosts/ooksmicro/hardware-configuration.nix
similarity index 100%
rename from system/ooksmicro/hardware-configuration.nix
rename to hosts/ooksmicro/hardware-configuration.nix
diff --git a/system/ooksmicro/ooksmicro.nix b/hosts/ooksmicro/ooksmicro.nix
similarity index 100%
rename from system/ooksmicro/ooksmicro.nix
rename to hosts/ooksmicro/ooksmicro.nix
diff --git a/system/ookst480s/hardware-configuration.nix b/hosts/ookst480s/hardware-configuration.nix
similarity index 100%
rename from system/ookst480s/hardware-configuration.nix
rename to hosts/ookst480s/hardware-configuration.nix
diff --git a/system/ookst480s/ookst480s.nix b/hosts/ookst480s/ookst480s.nix
similarity index 100%
rename from system/ookst480s/ookst480s.nix
rename to hosts/ookst480s/ookst480s.nix
diff --git a/system/ooksx1/hardware-configuration.nix b/hosts/ooksx1/hardware-configuration.nix
similarity index 100%
rename from system/ooksx1/hardware-configuration.nix
rename to hosts/ooksx1/hardware-configuration.nix
diff --git a/system/ooksx1/ooksx1.nix b/hosts/ooksx1/ooksx1.nix
similarity index 100%
rename from system/ooksx1/ooksx1.nix
rename to hosts/ooksx1/ooksx1.nix