diff --git a/.gitignore b/.gitignore
index 43badcc..7818836 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,9 @@
-old.asm
-_old
-microcodes
 *.bin
-!F3DZEX2.data.bin
-!6102.bin
-*.z64
 *.c
+*.log
 *.tmp
 *.txt
+*.z64
+_old
+microcodes
+old.asm
diff --git a/F3DZEX.asm b/F3DZEX.asm
index 94fa63c..b81c9da 100644
--- a/F3DZEX.asm
+++ b/F3DZEX.asm
@@ -51,7 +51,7 @@ constant SP_COP_COMMAND_BUSY(13)    // 0x04100014
 constant SP_COP_PIPE_BUSY(14)       // 0x04100018
 constant SP_COP_TMEM_BUSY(15)       // 0x0410001C
 
-output "F3DZEX2.boot.bin", create
+output "bin/F3DZEX2.boot.bin", create
 fill 0xD0
 
 origin 0x00000000
@@ -126,7 +126,7 @@ label_1054:
     nop
     nop
 
-output "F3DZEX2.bin", create
+output "bin/F3DZEX2.bin", create
 fill 0xF80
 
 origin 0x00000000
diff --git a/bin/.gitignore b/bin/.gitignore
new file mode 100644
index 0000000..88f5125
--- /dev/null
+++ b/bin/.gitignore
@@ -0,0 +1,5 @@
+*
+!.gitignore
+# files without disassemblies yet:
+!6102.bin
+!F3DZEX.data.bin
diff --git a/6102.bin b/bin/6102.bin
similarity index 100%
rename from 6102.bin
rename to bin/6102.bin
diff --git a/F3DZEX2.data.bin b/bin/F3DZEX2.data.bin
similarity index 100%
rename from F3DZEX2.data.bin
rename to bin/F3DZEX2.data.bin
diff --git a/64drive.inc b/inc/64drive.inc
similarity index 100%
rename from 64drive.inc
rename to inc/64drive.inc
diff --git a/main.inc b/inc/main.inc
similarity index 100%
rename from main.inc
rename to inc/main.inc
diff --git a/n64.inc b/inc/n64.inc
similarity index 100%
rename from n64.inc
rename to inc/n64.inc
diff --git a/n64_gfx.inc b/inc/n64_gfx.inc
similarity index 100%
rename from n64_gfx.inc
rename to inc/n64_gfx.inc
diff --git a/main.asm b/main.asm
index 16b7b8e..8aaa931 100644
--- a/main.asm
+++ b/main.asm
@@ -1,9 +1,9 @@
 // built on the N64 ROM template by krom
 arch n64.cpu
 endian msb
-include "n64.inc"
-include "n64_gfx.inc"
-include "64drive.inc"
+include "inc/n64.inc"
+include "inc/n64_gfx.inc"
+include "inc/64drive.inc"
 
 output "test.z64", create
 fill 1052672 // Set ROM Size
@@ -12,11 +12,11 @@ origin 0x00000000
 base 0x80000000
 
 include "header.asm"
-insert "6102.bin"
+insert "bin/6102.bin"
 // after inserting the header and bootrom,
 // origin should be at 0x1000.
 
-include "main.inc"
+include "inc/main.inc"
 
 include "kernel.asm"
 
@@ -149,8 +149,8 @@ PushRSPTask:
     jr      ra
     nop
 
-align(16); insert F3DZEX_BOOT, "F3DZEX2.boot.bin"
-align(16); insert F3DZEX_DMEM, "F3DZEX2.data.bin"
-align(16); insert F3DZEX_IMEM, "F3DZEX2.bin"
-align(16); insert FONT, "dwarf.1bpp"
-align(16); insert LZ, "Image.lz"
+align(16); insert F3DZEX_BOOT, "bin/F3DZEX2.boot.bin"
+align(16); insert F3DZEX_DMEM, "bin/F3DZEX2.data.bin"
+align(16); insert F3DZEX_IMEM, "bin/F3DZEX2.bin"
+align(16); insert FONT, "res/dwarf.1bpp"
+align(16); insert LZ, "res/Image.lz"
diff --git a/Image.lz b/res/Image.lz
similarity index 100%
rename from Image.lz
rename to res/Image.lz
diff --git a/dwarf.1bpp b/res/dwarf.1bpp
similarity index 100%
rename from dwarf.1bpp
rename to res/dwarf.1bpp