diff --git a/Makefile b/Makefile
index 2e1165b..519d28a 100644
--- a/Makefile
+++ b/Makefile
@@ -41,11 +41,11 @@ cp437.bin: cp437.bmp utils/bmp2font
 vga11.com: cp437.bin
 
 # COM programs
-%.com: %.asm
+%.com: com/%.asm
 	$(NASM) $(NASM_ARGS) -DBASE=0x0100 -DCOM -o $@ $<
 
 # Bootloaders, first sector on partition
-%.bs: %.asm
+%.bs: boot/%.asm
 	$(NASM) $(NASM_ARGS) -DBASE=0x7C00 -DBOOT -o $@ $<
 
 # BIOS option roms
diff --git a/fat.asm b/boot/fat.asm
similarity index 100%
rename from fat.asm
rename to boot/fat.asm
diff --git a/fat32.asm b/boot/fat32.asm
similarity index 100%
rename from fat32.asm
rename to boot/fat32.asm
diff --git a/kernel.asm b/boot/kernel.asm
similarity index 100%
rename from kernel.asm
rename to boot/kernel.asm
diff --git a/mbr.asm b/boot/mbr.asm
similarity index 100%
rename from mbr.asm
rename to boot/mbr.asm
diff --git a/pxeboot.asm b/boot/pxeboot.asm
similarity index 100%
rename from pxeboot.asm
rename to boot/pxeboot.asm
diff --git a/serial.asm b/boot/serial.asm
similarity index 100%
rename from serial.asm
rename to boot/serial.asm
diff --git a/vga11.asm b/boot/vga11.asm
similarity index 100%
rename from vga11.asm
rename to boot/vga11.asm
diff --git a/hello.asm b/com/hello.asm
similarity index 100%
rename from hello.asm
rename to com/hello.asm