diff --git a/.gitattributes b/.gitattributes
index 78df606..4037332 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-/etcnixos/secrets/** filter=git-crypt diff=git-crypt
+/system/secrets/** filter=git-crypt diff=git-crypt
 /home-manager/secrets/** filter=git-crypt diff=git-crypt
diff --git a/flake.nix b/flake.nix
index 3af431d..850f8b4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -118,7 +118,7 @@
                   home-manager.users.${username} = import ./home-manager/home-${hostname}.nix;
                 }
               )
-              ./etcnixos/system-${hostname}.nix
+              ./system/system-${hostname}.nix
             ];
           };
         }
diff --git a/etcnixos/common.nix b/system/common.nix
similarity index 100%
rename from etcnixos/common.nix
rename to system/common.nix
diff --git a/etcnixos/declarative-nm.nix b/system/declarative-nm.nix
similarity index 100%
rename from etcnixos/declarative-nm.nix
rename to system/declarative-nm.nix
diff --git a/etcnixos/hardware_laptop.nix b/system/hardware_laptop.nix
similarity index 100%
rename from etcnixos/hardware_laptop.nix
rename to system/hardware_laptop.nix
diff --git a/etcnixos/impermanence-disk-config.nix b/system/impermanence-disk-config.nix
similarity index 100%
rename from etcnixos/impermanence-disk-config.nix
rename to system/impermanence-disk-config.nix
diff --git a/etcnixos/impermanence.nix b/system/impermanence.nix
similarity index 100%
rename from etcnixos/impermanence.nix
rename to system/impermanence.nix
diff --git a/etcnixos/networking.nix b/system/networking.nix
similarity index 100%
rename from etcnixos/networking.nix
rename to system/networking.nix
diff --git a/etcnixos/no-rgb.nix b/system/no-rgb.nix
similarity index 100%
rename from etcnixos/no-rgb.nix
rename to system/no-rgb.nix
diff --git a/etcnixos/secrets/disk-password b/system/secrets/disk-password
similarity index 100%
rename from etcnixos/secrets/disk-password
rename to system/secrets/disk-password
diff --git a/etcnixos/secrets/password-hash b/system/secrets/password-hash
similarity index 100%
rename from etcnixos/secrets/password-hash
rename to system/secrets/password-hash
diff --git a/etcnixos/secrets/secureboot.tar b/system/secrets/secureboot.tar
similarity index 100%
rename from etcnixos/secrets/secureboot.tar
rename to system/secrets/secureboot.tar
diff --git a/etcnixos/secrets/wifi-passwords.nix b/system/secrets/wifi-passwords.nix
similarity index 100%
rename from etcnixos/secrets/wifi-passwords.nix
rename to system/secrets/wifi-passwords.nix
diff --git a/etcnixos/steam.nix b/system/steam.nix
similarity index 100%
rename from etcnixos/steam.nix
rename to system/steam.nix
diff --git a/etcnixos/system-mreow.nix b/system/system-mreow.nix
similarity index 100%
rename from etcnixos/system-mreow.nix
rename to system/system-mreow.nix
diff --git a/etcnixos/system-yarn.nix b/system/system-yarn.nix
similarity index 100%
rename from etcnixos/system-yarn.nix
rename to system/system-yarn.nix
diff --git a/etcnixos/vm.nix b/system/vm.nix
similarity index 100%
rename from etcnixos/vm.nix
rename to system/vm.nix
diff --git a/etcnixos/vr.nix b/system/vr.nix
similarity index 100%
rename from etcnixos/vr.nix
rename to system/vr.nix