diff --git a/i386/build.bash b/i386/build.bash
index 3e27868..ec96363 100755
--- a/i386/build.bash
+++ b/i386/build.bash
@@ -11,8 +11,8 @@ cd $PROJECT_PATH/bootsector
 nasm -o $PROJECT_PATH/.build/objects/bootsector.bin \
     bootsector.asm
 
-bash $PROJECT_PATH/loader/build.bash
-mv $PROJECT_PATH/loader/loader.bin $PROJECT_PATH/.build/objects/loader.bin
+bash $PROJECT_PATH/legacy-boot/build.bash
+mv $PROJECT_PATH/legacy-boot/loader.bin $PROJECT_PATH/.build/objects/loader.bin
 
 cat $PROJECT_PATH/.build/objects/bootsector.bin > $PROJECT_PATH/nightloader.bin
 cat $PROJECT_PATH/.build/objects/loader.bin >> $PROJECT_PATH/nightloader.bin
diff --git a/i386/loader/README.md b/i386/legacy-boot/README.md
similarity index 100%
rename from i386/loader/README.md
rename to i386/legacy-boot/README.md
diff --git a/i386/loader/build.bash b/i386/legacy-boot/build.bash
similarity index 100%
rename from i386/loader/build.bash
rename to i386/legacy-boot/build.bash
diff --git a/i386/loader/src-asm/drivers/manager.asm b/i386/legacy-boot/src-asm/drivers/manager.asm
similarity index 100%
rename from i386/loader/src-asm/drivers/manager.asm
rename to i386/legacy-boot/src-asm/drivers/manager.asm
diff --git a/i386/loader/src-asm/drivers/pci/driver.asm b/i386/legacy-boot/src-asm/drivers/pci/driver.asm
similarity index 100%
rename from i386/loader/src-asm/drivers/pci/driver.asm
rename to i386/legacy-boot/src-asm/drivers/pci/driver.asm
diff --git a/i386/loader/src-asm/drivers/pci/enumerate.asm b/i386/legacy-boot/src-asm/drivers/pci/enumerate.asm
similarity index 100%
rename from i386/loader/src-asm/drivers/pci/enumerate.asm
rename to i386/legacy-boot/src-asm/drivers/pci/enumerate.asm
diff --git a/i386/loader/src-asm/drivers/pci/utility.asm b/i386/legacy-boot/src-asm/drivers/pci/utility.asm
similarity index 100%
rename from i386/loader/src-asm/drivers/pci/utility.asm
rename to i386/legacy-boot/src-asm/drivers/pci/utility.asm
diff --git a/i386/loader/src-asm/entry.asm b/i386/legacy-boot/src-asm/entry.asm
similarity index 100%
rename from i386/loader/src-asm/entry.asm
rename to i386/legacy-boot/src-asm/entry.asm
diff --git a/i386/loader/src-asm/memory/a20.asm b/i386/legacy-boot/src-asm/memory/a20.asm
similarity index 100%
rename from i386/loader/src-asm/memory/a20.asm
rename to i386/legacy-boot/src-asm/memory/a20.asm
diff --git a/i386/loader/src-asm/memory/gdt.asm b/i386/legacy-boot/src-asm/memory/gdt.asm
similarity index 100%
rename from i386/loader/src-asm/memory/gdt.asm
rename to i386/legacy-boot/src-asm/memory/gdt.asm
diff --git a/i386/loader/src-asm/utility/display.asm b/i386/legacy-boot/src-asm/utility/display.asm
similarity index 100%
rename from i386/loader/src-asm/utility/display.asm
rename to i386/legacy-boot/src-asm/utility/display.asm
diff --git a/i386/loader/src-asm/utility/math.asm b/i386/legacy-boot/src-asm/utility/math.asm
similarity index 100%
rename from i386/loader/src-asm/utility/math.asm
rename to i386/legacy-boot/src-asm/utility/math.asm
diff --git a/i386/loader/src-asm/utility/memory.asm b/i386/legacy-boot/src-asm/utility/memory.asm
similarity index 100%
rename from i386/loader/src-asm/utility/memory.asm
rename to i386/legacy-boot/src-asm/utility/memory.asm