diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index 0f2c04145..8408c0a00 100644
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -193,9 +193,9 @@ endif
 # platform boot component
 BOOT_S_SRCS += arch/x86/boot/cpu_primary.S
 BOOT_S_SRCS += arch/x86/boot/trampoline.S
-BOOT_C_SRCS += boot/multiboot.c
+BOOT_C_SRCS += boot/multiboot/multiboot.c
 ifeq ($(CONFIG_MULTIBOOT2),y)
-BOOT_C_SRCS += boot/multiboot2.c
+BOOT_C_SRCS += boot/multiboot/multiboot2.c
 endif
 BOOT_C_SRCS += boot/reloc.c
 BOOT_C_SRCS += arch/x86/ptcm.c
diff --git a/hypervisor/boot/multiboot.c b/hypervisor/boot/multiboot/multiboot.c
similarity index 100%
rename from hypervisor/boot/multiboot.c
rename to hypervisor/boot/multiboot/multiboot.c
diff --git a/hypervisor/boot/multiboot2.c b/hypervisor/boot/multiboot/multiboot2.c
similarity index 100%
rename from hypervisor/boot/multiboot2.c
rename to hypervisor/boot/multiboot/multiboot2.c