diff --git a/Makefile b/Makefile
index b780b65..9e93572 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ fs.img: kernel.bin tools/mkfs
 image.bin: mbr.bin fs.img
 	cat $^ >$@
 
-kernel.bin: kernel.o vga.o string.o drivers/ata.o
+kernel.bin: kernel.o drivers/vga.o string.o drivers/ata.o
 	$(LD) -m elf_i386 -o $@ -Ttext 0x1000 $^
 
 %.o: %.c
@@ -41,7 +41,7 @@ mbr.elf: mbr.o
 	$(LD) -m elf_i386 -Ttext=0x7c00 $^ -o $@
 
 clean:
-	rm -f *.bin *.o tools/mkfs
+	rm -f *.elf *.bin *.o tools/mkfs
 
 tools/%: tools/%.c
 	gcc -Wall -Werror -g $^ -o $@
diff --git a/drivers/ata.c b/drivers/ata.c
index 693dac5..5abee68 100644
--- a/drivers/ata.c
+++ b/drivers/ata.c
@@ -3,7 +3,7 @@
 #include <stdint.h>
 
 #include "ata.h"
-#include "../port.h"
+#include "port.h"
 
 /*
  BSY: a 1 means that the controller is busy executing a command. No register should be accessed (except the digital output register) while this bit is set.
diff --git a/drivers/misc.h b/drivers/misc.h
index ff6ee08..0d790d7 100644
--- a/drivers/misc.h
+++ b/drivers/misc.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../port.h"
+#include "port.h"
 
 __attribute__((noreturn))
 static inline void qemu_shutdown() {
diff --git a/port.h b/drivers/port.h
similarity index 100%
rename from port.h
rename to drivers/port.h
diff --git a/vga.c b/drivers/vga.c
similarity index 98%
rename from vga.c
rename to drivers/vga.c
index 18e9619..844892d 100644
--- a/vga.c
+++ b/drivers/vga.c
@@ -1,5 +1,5 @@
 #include "port.h"
-#include "string.h"
+#include "../string.h"
 
 char* const video_memory = (char*) 0xb8000;
 
diff --git a/vga.h b/drivers/vga.h
similarity index 100%
rename from vga.h
rename to drivers/vga.h
diff --git a/kernel.c b/kernel.c
index c17ed02..7d6f4ed 100644
--- a/kernel.c
+++ b/kernel.c
@@ -1,6 +1,6 @@
 asm(".asciz \"kernel start\"");
 
-#include "vga.h"
+#include "drivers/vga.h"
 #include "drivers/ata.h"
 #include "drivers/misc.h"