diff --git a/sys/boot/i386/efi/bootinfo.c b/sys/boot/efi/loader/arch/i386/bootinfo.c
similarity index 100%
rename from sys/boot/i386/efi/bootinfo.c
rename to sys/boot/efi/loader/arch/i386/bootinfo.c
diff --git a/sys/boot/i386/efi/efimd.c b/sys/boot/efi/loader/arch/i386/efimd.c
similarity index 100%
rename from sys/boot/i386/efi/efimd.c
rename to sys/boot/efi/loader/arch/i386/efimd.c
diff --git a/sys/boot/i386/efi/elf32_freebsd.c b/sys/boot/efi/loader/arch/i386/elf32_freebsd.c
similarity index 100%
rename from sys/boot/i386/efi/elf32_freebsd.c
rename to sys/boot/efi/loader/arch/i386/elf32_freebsd.c
diff --git a/sys/boot/i386/efi/exec.c b/sys/boot/efi/loader/arch/i386/exec.c
similarity index 100%
rename from sys/boot/i386/efi/exec.c
rename to sys/boot/efi/loader/arch/i386/exec.c
diff --git a/sys/boot/i386/efi/i386_copy.c b/sys/boot/efi/loader/arch/i386/i386_copy.c
similarity index 100%
rename from sys/boot/i386/efi/i386_copy.c
rename to sys/boot/efi/loader/arch/i386/i386_copy.c
diff --git a/sys/boot/i386/efi/ldscript.i386 b/sys/boot/efi/loader/arch/i386/ldscript.i386
similarity index 100%
rename from sys/boot/i386/efi/ldscript.i386
rename to sys/boot/efi/loader/arch/i386/ldscript.i386
diff --git a/sys/boot/i386/efi/start.S b/sys/boot/efi/loader/arch/i386/start.S
similarity index 100%
rename from sys/boot/i386/efi/start.S
rename to sys/boot/efi/loader/arch/i386/start.S