diff --git a/modules/module-list.nix b/modules/module-list.nix
index 2e6f77afa1f..f5296ccf942 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -14,6 +14,7 @@
   ./config/timezone.nix
   ./config/unix-odbc-drivers.nix
   ./config/users-groups.nix
+  ./hardware/all-firmware.nix
   ./hardware/cpu/intel-microcode.nix
   ./hardware/network/b43.nix
   ./hardware/network/intel-2100bg.nix
@@ -22,11 +23,6 @@
   ./hardware/network/rt73.nix
   ./hardware/network/rtl8192c.nix
   ./hardware/pcmcia.nix
-  ./hardware/all-firmware.nix
-  ./installer/efi-boot-stub/efi-boot-stub.nix
-  ./installer/generations-dir/generations-dir.nix
-  ./installer/grub/grub.nix
-  ./installer/grub/memtest.nix
   ./installer/init-script/init-script.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
@@ -34,8 +30,8 @@
   ./misc/check-config.nix
   ./misc/crashdump.nix
   ./misc/ids.nix
-  ./misc/locate.nix
   ./misc/lib.nix
+  ./misc/locate.nix
   ./misc/nixpkgs.nix
   ./misc/passthru.nix
   ./misc/version.nix
@@ -60,8 +56,8 @@
   ./services/amqp/rabbitmq.nix
   ./services/audio/alsa.nix
   ./services/audio/fuppes.nix
-  ./services/audio/pulseaudio.nix
   ./services/audio/mpd.nix
+  ./services/audio/pulseaudio.nix
   ./services/backup/mysql-backup.nix
   ./services/backup/postgresql-backup.nix
   ./services/backup/sitecopy-backup.nix
@@ -199,6 +195,10 @@
   ./system/activation/activation-script.nix
   ./system/activation/top-level.nix
   ./system/boot/kernel.nix
+  ./system/boot/loader/efi-boot-stub/efi-boot-stub.nix
+  ./system/boot/loader/generations-dir/generations-dir.nix
+  ./system/boot/loader/grub/grub.nix
+  ./system/boot/loader/grub/memtest.nix
   ./system/boot/luksroot.nix
   ./system/boot/modprobe.nix
   ./system/boot/stage-1.nix
diff --git a/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh
similarity index 100%
rename from modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
rename to modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh
diff --git a/modules/installer/efi-boot-stub/efi-boot-stub.nix b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
similarity index 100%
rename from modules/installer/efi-boot-stub/efi-boot-stub.nix
rename to modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
diff --git a/modules/installer/generations-dir/generations-dir-builder.sh b/modules/system/boot/loader/generations-dir/generations-dir-builder.sh
similarity index 100%
rename from modules/installer/generations-dir/generations-dir-builder.sh
rename to modules/system/boot/loader/generations-dir/generations-dir-builder.sh
diff --git a/modules/installer/generations-dir/generations-dir.nix b/modules/system/boot/loader/generations-dir/generations-dir.nix
similarity index 95%
rename from modules/installer/generations-dir/generations-dir.nix
rename to modules/system/boot/loader/generations-dir/generations-dir.nix
index b67cf7e56e7..8184b9c0a98 100644
--- a/modules/installer/generations-dir/generations-dir.nix
+++ b/modules/system/boot/loader/generations-dir/generations-dir.nix
@@ -19,7 +19,7 @@ let
               point to the current generation's kernel image, initial RAM
               disk, and other bootstrap files.
 
-              This optional is not necessary with bootloads such as GNU GRUB
+              This optional is not necessary with boot loaders such as GNU GRUB
               for which the menu is updated to point to the latest bootstrap
               files.  However, it is needed for U-Boot on platforms where the
               boot command line is stored in flash memory rather than in a
diff --git a/modules/installer/grub/grub.nix b/modules/system/boot/loader/grub/grub.nix
similarity index 100%
rename from modules/installer/grub/grub.nix
rename to modules/system/boot/loader/grub/grub.nix
diff --git a/modules/installer/grub/install-grub.pl b/modules/system/boot/loader/grub/install-grub.pl
similarity index 100%
rename from modules/installer/grub/install-grub.pl
rename to modules/system/boot/loader/grub/install-grub.pl
diff --git a/modules/installer/grub/memtest.nix b/modules/system/boot/loader/grub/memtest.nix
similarity index 100%
rename from modules/installer/grub/memtest.nix
rename to modules/system/boot/loader/grub/memtest.nix
diff --git a/modules/installer/grub/winkler-gnu-blue-640x480.png b/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png
similarity index 100%
rename from modules/installer/grub/winkler-gnu-blue-640x480.png
rename to modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png
diff --git a/modules/installer/grub/winkler-gnu-blue.README b/modules/system/boot/loader/grub/winkler-gnu-blue.README
similarity index 100%
rename from modules/installer/grub/winkler-gnu-blue.README
rename to modules/system/boot/loader/grub/winkler-gnu-blue.README