diff --git a/Makefile b/Makefile
index 680ec92..0946426 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ kernel/kernel.o \
 kernel/debugging.o \
 kernel/elf.o \
 kernel/syscall.o \
-kernel/keyboard.o \
+kernel/io/keyboard.o \
 kernel/heap.o \
 
 LIB_OBJS=\
diff --git a/arch/i686/interrupts/interrupt.c b/arch/i686/interrupts/interrupt.c
index 20950ee..8e97996 100644
--- a/arch/i686/interrupts/interrupt.c
+++ b/arch/i686/interrupts/interrupt.c
@@ -1,7 +1,7 @@
 #include <kernel/tty.h>
 #include <stddef.h>
 #include <debugging.h>
-#include <kernel/keyboard.h>
+#include <kernel/io/keyboard.h>
 #include "../io.h"
 
 struct interrupt_frame {
diff --git a/include/kernel/io/fat.h b/include/kernel/io/fat.h
new file mode 100644
index 0000000..e69de29
diff --git a/include/kernel/keyboard.h b/include/kernel/io/keyboard.h
similarity index 100%
rename from include/kernel/keyboard.h
rename to include/kernel/io/keyboard.h
diff --git a/kernel/keyboard.c b/kernel/io/keyboard.c
similarity index 100%
rename from kernel/keyboard.c
rename to kernel/io/keyboard.c
diff --git a/kernel/syscall.c b/kernel/syscall.c
index 7b1d133..2ae69dc 100644
--- a/kernel/syscall.c
+++ b/kernel/syscall.c
@@ -1,5 +1,5 @@
 #include <kernel/tty.h>
-#include <kernel/keyboard.h>
+#include <kernel/io/keyboard.h>
 #include <debugging.h>
 
 static void print(char* buffer)