diff --git a/Makefile b/Makefile
index f2cb23b..e4488da 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ CC=i686-elf-gcc
 bootstrap.o: bootstrap.s
 	i686-elf-as bootstrap.s -o bootstrap.o
 
-kernel.bin: bootstrap.o vga.o std/std.o std/kstd.o cpu/idt.o cpu/pic.o cpu/exception.o kernel.o
+kernel.bin: bootstrap.o gfx/terminal.o std/std.o std/kstd.o cpu/idt.o cpu/pic.o cpu/exception.o kernel.o
 	$(CC) -T linker.ld -o $@ -ffreestanding -O2 -nostdlib -lgcc $^
 
 iso: kernel.bin
diff --git a/vga.c b/gfx/terminal.c
similarity index 98%
rename from vga.c
rename to gfx/terminal.c
index 05148bd..96e2dae 100644
--- a/vga.c
+++ b/gfx/terminal.c
@@ -1,4 +1,4 @@
-#include "vga.h"
+#include "gfx/terminal.h"
 #include "std/std.h"
 
 size_t terminal_row;
diff --git a/vga.h b/gfx/terminal.h
similarity index 100%
rename from vga.h
rename to gfx/terminal.h
diff --git a/kernel.c b/kernel.c
index aaebfa3..76e60ed 100644
--- a/kernel.c
+++ b/kernel.c
@@ -1,7 +1,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include "vga.h"
+#include "gfx/terminal.h"
 #include "cpu/pic.h"
 #include "cpu/idt.h"
 #include "std/kstd.h"
diff --git a/std/kstd.c b/std/kstd.c
index 12b5083..2f3e89a 100644
--- a/std/kstd.c
+++ b/std/kstd.c
@@ -2,7 +2,7 @@
 #include <limits.h>
 #include "std/kstd.h"
 #include "std/std.h"
-#include "vga.h"
+#include "gfx/terminal.h"
 
 int putchar(int ic) {
 	char c = (char) ic;