diff --git a/.gitignore b/.gitignore
index 4d6415b..8d5a1b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.o
-boot.bin
-boot.elf
+/boot.bin
+/boot.elf
+/serve
diff --git a/bootboot.h b/3rdparty/include/bootboot.h
similarity index 100%
rename from bootboot.h
rename to 3rdparty/include/bootboot.h
diff --git a/Makefile b/Makefile
index b5fe466..5b090db 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 all: boot.bin
 
 clean:
-	rm -f *.o boot.elf boot.bin
+	rm -f src/*.o boot.elf boot.bin
 
 config.mk: | config.default.mk
 	cp config.default.mk $@
@@ -14,8 +14,8 @@ boot.bin: boot.elf
 	objcopy -O binary -j .text -j .data boot.elf $@
 	wc -c $@
 
-boot.elf: Rnbp.o Ptftp.o Qcommon.o fernlader.ld
-	$(LD) $(LDFLAGS) -o $@ Rnbp.o Ptftp.o Qcommon.o
+boot.elf: src/Rnbp.o src/Ptftp.o src/Qcommon.o fernlader.ld
+	$(LD) $(LDFLAGS) -o $@ src/Rnbp.o src/Ptftp.o src/Qcommon.o
 
 %.o: %.S
 	$(CC) $(CFLAGS) -c -o $@ $(@:.o=.S)
diff --git a/fernlader.ld b/fernlader.ld
index e0357c5..2f14ffb 100644
--- a/fernlader.ld
+++ b/fernlader.ld
@@ -4,7 +4,7 @@ PHDRS {
 }
 SECTIONS {
     .text 0x7C00: {
-        Rnbp.o(.text)
+        src/Rnbp.o(.text)
         *(.text*, .rodata*)
     } :all
     .data : {
diff --git a/Ptftp.S b/src/Ptftp.S
similarity index 100%
rename from Ptftp.S
rename to src/Ptftp.S
diff --git a/Qcommon.c b/src/Qcommon.c
similarity index 100%
rename from Qcommon.c
rename to src/Qcommon.c
diff --git a/Rnbp.S b/src/Rnbp.S
similarity index 98%
rename from Rnbp.S
rename to src/Rnbp.S
index 09a82aa..2997aac 100644
--- a/Rnbp.S
+++ b/src/Rnbp.S
@@ -136,7 +136,6 @@ bios_write: push        %ebp
             mov         8+4(%ebp), %ecx
 
             PROT16
-            .code16
             REAL
 
 .bwloop:    test        %ecx, %ecx
@@ -159,7 +158,6 @@ bios_write: push        %ebp
 
 .bwreturn:  PROT
             PROT32
-            .code32
 
             pop         %ebx
             mov         %ebp, %esp
@@ -176,7 +174,6 @@ bios_getmap:push        %ebp
             mov         8+0(%ebp), %edi
 
             PROT16
-            .code16
             REAL
 
             xor         %ebx, %ebx
@@ -195,7 +192,6 @@ _gmdone:    add         $24, %di
 
             PROT
             PROT32
-            .code32
 
             mov         %edi, %eax