diff --git a/flake.nix b/flake.nix
index 31082b6..8a8d7ba 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,7 @@
       mkSystem = { host, lxc ? true }:
         nixpkgs.lib.nixosSystem {
           inherit system;
-          modules = [ ./hosts/${host}/configuration.nix ./common.nix ] ++ (if lxc then
+          modules = [ ./nixos/hosts/${host}/configuration.nix ./nixos/common.nix ] ++ (if lxc then
             [ "${nixpkgs}/nixos/modules/virtualisation/lxc-container.nix" ]
           else
             [ ]);
diff --git a/common.nix b/nixos/common.nix
similarity index 100%
rename from common.nix
rename to nixos/common.nix
diff --git a/common/default.nix b/nixos/common/default.nix
similarity index 100%
rename from common/default.nix
rename to nixos/common/default.nix
diff --git a/common/generic-lxc.nix b/nixos/common/generic-lxc.nix
similarity index 100%
rename from common/generic-lxc.nix
rename to nixos/common/generic-lxc.nix
diff --git a/common/generic-vm.nix b/nixos/common/generic-vm.nix
similarity index 100%
rename from common/generic-vm.nix
rename to nixos/common/generic-vm.nix
diff --git a/common/services/default.nix b/nixos/common/services/default.nix
similarity index 100%
rename from common/services/default.nix
rename to nixos/common/services/default.nix
diff --git a/common/services/flood.nix b/nixos/common/services/flood.nix
similarity index 100%
rename from common/services/flood.nix
rename to nixos/common/services/flood.nix
diff --git a/common/services/unpackerr.nix b/nixos/common/services/unpackerr.nix
similarity index 100%
rename from common/services/unpackerr.nix
rename to nixos/common/services/unpackerr.nix
diff --git a/common/services/vmagent.nix b/nixos/common/services/vmagent.nix
similarity index 100%
rename from common/services/vmagent.nix
rename to nixos/common/services/vmagent.nix
diff --git a/common/users/default.nix b/nixos/common/users/default.nix
similarity index 100%
rename from common/users/default.nix
rename to nixos/common/users/default.nix
diff --git a/hosts/bastion/configuration.nix b/nixos/hosts/bastion/configuration.nix
similarity index 100%
rename from hosts/bastion/configuration.nix
rename to nixos/hosts/bastion/configuration.nix
diff --git a/hosts/bastion/hardware-configuration.nix b/nixos/hosts/bastion/hardware-configuration.nix
similarity index 100%
rename from hosts/bastion/hardware-configuration.nix
rename to nixos/hosts/bastion/hardware-configuration.nix
diff --git a/hosts/consul/configuration.nix b/nixos/hosts/consul/configuration.nix
similarity index 100%
rename from hosts/consul/configuration.nix
rename to nixos/hosts/consul/configuration.nix
diff --git a/hosts/k3s/configuration.nix b/nixos/hosts/k3s/configuration.nix
similarity index 100%
rename from hosts/k3s/configuration.nix
rename to nixos/hosts/k3s/configuration.nix
diff --git a/hosts/k3s/hardware-configuration.nix b/nixos/hosts/k3s/hardware-configuration.nix
similarity index 100%
rename from hosts/k3s/hardware-configuration.nix
rename to nixos/hosts/k3s/hardware-configuration.nix
diff --git a/hosts/mosquitto/configuration.nix b/nixos/hosts/mosquitto/configuration.nix
similarity index 100%
rename from hosts/mosquitto/configuration.nix
rename to nixos/hosts/mosquitto/configuration.nix
diff --git a/hosts/nginx/configuration.nix b/nixos/hosts/nginx/configuration.nix
similarity index 100%
rename from hosts/nginx/configuration.nix
rename to nixos/hosts/nginx/configuration.nix
diff --git a/hosts/vault/configuration.nix b/nixos/hosts/vault/configuration.nix
similarity index 100%
rename from hosts/vault/configuration.nix
rename to nixos/hosts/vault/configuration.nix