diff --git a/.gitignore b/.gitignore
index 97d14fb..a7ac7fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-boot.bin
+target/boot.bin
diff --git a/Makefile b/Makefile
index a675331..da18ed2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-compile_and_run: compile run
+compile_and_run: compile_bootloader run_bootloader
 
-compile:
-	rm -rf boot.bin
-	nasm -f bin -o boot.bin main.asm
+compile_bootloader:
+	rm -rf target/boot.bin
+	nasm -f bin -o target/boot.bin bootloader/main.asm
 
-run:
-	qemu-system-x86_64 -drive format=raw,file=boot.bin -drive format=raw,file=drive.bin -monitor stdio
+run_bootloader:
+	qemu-system-x86_64 -drive format=raw,file=target/boot.bin -drive format=raw,file=target/kernel.bin -monitor stdio
diff --git a/main.asm b/bootloader/main.asm
similarity index 98%
rename from main.asm
rename to bootloader/main.asm
index ebc909e..6dd8f4a 100644
--- a/main.asm
+++ b/bootloader/main.asm
@@ -90,7 +90,7 @@ call .puthex
 .reset_disk_no_error:
 
 push byte 0
-.read_disk_loop
+.read_disk_loop:
 pop cx
 inc cl
 push cx
diff --git a/drive.bin b/target/kernel.bin
similarity index 100%
rename from drive.bin
rename to target/kernel.bin