diff --git a/account.nix b/nix-os/account.nix
similarity index 100%
rename from account.nix
rename to nix-os/account.nix
diff --git a/adb.nix b/nix-os/adb.nix
similarity index 100%
rename from adb.nix
rename to nix-os/adb.nix
diff --git a/configuration.nix b/nix-os/core.nix
similarity index 100%
rename from configuration.nix
rename to nix-os/core.nix
diff --git a/desktop/gnome.nix b/nix-os/desktop/gnome.nix
similarity index 100%
rename from desktop/gnome.nix
rename to nix-os/desktop/gnome.nix
diff --git a/desktop/kde-plasma.nix b/nix-os/desktop/kde-plasma.nix
similarity index 100%
rename from desktop/kde-plasma.nix
rename to nix-os/desktop/kde-plasma.nix
diff --git a/docker.nix b/nix-os/docker.nix
similarity index 100%
rename from docker.nix
rename to nix-os/docker.nix
diff --git a/locale.nix b/nix-os/locale.nix
similarity index 100%
rename from locale.nix
rename to nix-os/locale.nix
diff --git a/nvidia.nix b/nix-os/nvidia.nix
similarity index 100%
rename from nvidia.nix
rename to nix-os/nvidia.nix
diff --git a/polkit/disable-shutdown.nix b/nix-os/polkit/disable-shutdown.nix
similarity index 100%
rename from polkit/disable-shutdown.nix
rename to nix-os/polkit/disable-shutdown.nix
diff --git a/razer.nix b/nix-os/razer.nix
similarity index 100%
rename from razer.nix
rename to nix-os/razer.nix
diff --git a/shell.nix b/nix-os/shell.nix
similarity index 100%
rename from shell.nix
rename to nix-os/shell.nix
diff --git a/virtualization.nix b/nix-os/virtualization.nix
similarity index 100%
rename from virtualization.nix
rename to nix-os/virtualization.nix
diff --git a/nixos-rebuild.sh b/nixos-rebuild.sh
index 801d203..68b09e1 100755
--- a/nixos-rebuild.sh
+++ b/nixos-rebuild.sh
@@ -1 +1 @@
-NIXOS_CONFIG="$(pwd)/configuration.nix" nixos-rebuild $@
+NIXOS_CONFIG="$(pwd)/nix-os/core.nix" nixos-rebuild $@
diff --git a/vm.sh b/vm.sh
index d8edd01..891de47 100755
--- a/vm.sh
+++ b/vm.sh
@@ -1 +1 @@
-nix-build '<nixpkgs/nixos>' -A vm -I nixpkgs=channel:nixos-23.11 -I nixos-config=./configuration.nix && $(ls ./result/bin/run-*) && rm *.qcow2
+nix-build '<nixpkgs/nixos>' -A vm -I nixpkgs=channel:nixos-23.11 -I nixos-config=./nix-os/core.nix && $(ls ./result/bin/run-*) && rm *.qcow2