diff --git a/configuration/activate-configuration.sh b/system/activate-configuration.sh
similarity index 100%
rename from configuration/activate-configuration.sh
rename to system/activate-configuration.sh
diff --git a/configuration/config.nix b/system/config.nix
similarity index 100%
rename from configuration/config.nix
rename to system/config.nix
diff --git a/configuration/etc.nix b/system/etc.nix
similarity index 100%
rename from configuration/etc.nix
rename to system/etc.nix
diff --git a/configuration/etc/default/passwd b/system/etc/default/passwd
similarity index 100%
rename from configuration/etc/default/passwd
rename to system/etc/default/passwd
diff --git a/configuration/etc/dhclient-exit-hooks b/system/etc/dhclient-exit-hooks
similarity index 100%
rename from configuration/etc/dhclient-exit-hooks
rename to system/etc/dhclient-exit-hooks
diff --git a/configuration/etc/hosts b/system/etc/hosts
similarity index 100%
rename from configuration/etc/hosts
rename to system/etc/hosts
diff --git a/configuration/etc/issue b/system/etc/issue
similarity index 100%
rename from configuration/etc/issue
rename to system/etc/issue
diff --git a/configuration/etc/login.defs b/system/etc/login.defs
similarity index 100%
rename from configuration/etc/login.defs
rename to system/etc/login.defs
diff --git a/configuration/etc/nsswitch.conf b/system/etc/nsswitch.conf
similarity index 100%
rename from configuration/etc/nsswitch.conf
rename to system/etc/nsswitch.conf
diff --git a/configuration/etc/pam.d/login b/system/etc/pam.d/login
similarity index 100%
rename from configuration/etc/pam.d/login
rename to system/etc/pam.d/login
diff --git a/configuration/etc/pam.d/other b/system/etc/pam.d/other
similarity index 100%
rename from configuration/etc/pam.d/other
rename to system/etc/pam.d/other
diff --git a/configuration/etc/pam.d/passwd b/system/etc/pam.d/passwd
similarity index 100%
rename from configuration/etc/pam.d/passwd
rename to system/etc/pam.d/passwd
diff --git a/configuration/etc/pam.d/shadow b/system/etc/pam.d/shadow
similarity index 100%
rename from configuration/etc/pam.d/shadow
rename to system/etc/pam.d/shadow
diff --git a/configuration/etc/pam.d/sshd b/system/etc/pam.d/sshd
similarity index 100%
rename from configuration/etc/pam.d/sshd
rename to system/etc/pam.d/sshd
diff --git a/configuration/etc/pam.d/useradd b/system/etc/pam.d/useradd
similarity index 100%
rename from configuration/etc/pam.d/useradd
rename to system/etc/pam.d/useradd
diff --git a/configuration/etc/syslog.conf b/system/etc/syslog.conf
similarity index 100%
rename from configuration/etc/syslog.conf
rename to system/etc/syslog.conf
diff --git a/configuration/options.nix b/system/options.nix
similarity index 100%
rename from configuration/options.nix
rename to system/options.nix
diff --git a/configuration/splash-themes.nix b/system/splash-themes.nix
similarity index 100%
rename from configuration/splash-themes.nix
rename to system/splash-themes.nix
diff --git a/configuration/switch-to-configuration.sh b/system/switch-to-configuration.sh
similarity index 100%
rename from configuration/switch-to-configuration.sh
rename to system/switch-to-configuration.sh
diff --git a/configuration/system.nix b/system/system.nix
similarity index 100%
rename from configuration/system.nix
rename to system/system.nix
diff --git a/configuration/system.sh b/system/system.sh
similarity index 100%
rename from configuration/system.sh
rename to system/system.sh
diff --git a/configuration/upstart.nix b/system/upstart.nix
similarity index 100%
rename from configuration/upstart.nix
rename to system/upstart.nix
diff --git a/test.sh b/test.sh
index cbb97bc700d7..af9cb3c81e41 100755
--- a/test.sh
+++ b/test.sh
@@ -2,7 +2,7 @@
 if test -z "$NIXOS_CONFIG"; then
     NIXOS_CONFIG=/etc/nixos/configuration.nix
 fi
-nix-build configuration/system.nix \
+nix-build system/system.nix \
     --arg configuration "import $NIXOS_CONFIG" \
     -A system -K -k
 ./result/bin/switch-to-configuration test
diff --git a/upgrade.sh b/upgrade.sh
index 7bd921f3d833..259e30fe31e2 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -2,7 +2,7 @@
 if test -z "$NIXOS_CONFIG"; then
     NIXOS_CONFIG=/etc/nixos/configuration.nix
 fi
-nix-env -p /nix/var/nix/profiles/system -f configuration/system.nix \
+nix-env -p /nix/var/nix/profiles/system -f system/system.nix \
     --arg configuration "import $NIXOS_CONFIG" \
     --set -A system
 /nix/var/nix/profiles/system/bin/switch-to-configuration switch