diff --git a/k/Makefile b/k/Makefile
index 6dcdf99..f56fdfa 100644
--- a/k/Makefile
+++ b/k/Makefile
@@ -32,16 +32,16 @@ OBJS	= \
 	  memory.o \
 	  serial.o \
 	  gdt.o \
-	  idt.o \
-	  isr.o \
-	  pic.o
+	  events/idt.o \
+	  events/isr.o \
+	  events/pic/pic.o
 
 
 DEPS = $(OBJS:.o=.d)
 
 all: $(TARGET)
 
-$(TARGET): CPPFLAGS += -MMD -Iinclude -I ../libs/libc/include/
+$(TARGET): CPPFLAGS += -MMD -Iinclude -I ../libs/libc/include/ -I.
 $(TARGET): CFLAGS += $(K_EXTRA_CFLAGS) -g
 $(TARGET): LDFLAGS += -Wl,-Tk.lds
 $(TARGET): LDLIBS = -L../libs/libc -lc
diff --git a/k/idt.c b/k/events/idt.c
similarity index 98%
rename from k/idt.c
rename to k/events/idt.c
index 3ec5f32..c13418a 100644
--- a/k/idt.c
+++ b/k/events/idt.c
@@ -1,5 +1,7 @@
 #include "idt.h"
 #include "stdio.h"
+#include "pic/pic.h"
+#include "io.h"
 
 static struct idt idt = { 0 };
 
diff --git a/k/idt.h b/k/events/idt.h
similarity index 100%
rename from k/idt.h
rename to k/events/idt.h
diff --git a/k/isr.S b/k/events/isr.S
similarity index 100%
rename from k/isr.S
rename to k/events/isr.S
diff --git a/k/isr.h b/k/events/isr.h
similarity index 100%
rename from k/isr.h
rename to k/events/isr.h
diff --git a/k/pic.c b/k/events/pic/pic.c
similarity index 97%
rename from k/pic.c
rename to k/events/pic/pic.c
index e04d533..64d73f1 100644
--- a/k/pic.c
+++ b/k/events/pic/pic.c
@@ -1,4 +1,4 @@
-#include "idt.h"
+#include "events/idt.h"
 #include "io.h"
 #include "pic.h"
 #include "stdio.h"
diff --git a/k/pic.h b/k/events/pic/pic.h
similarity index 100%
rename from k/pic.h
rename to k/events/pic/pic.h
diff --git a/k/k.c b/k/k.c
index 87091cf..b26d602 100644
--- a/k/k.c
+++ b/k/k.c
@@ -24,9 +24,9 @@
 #include <k/kstd.h>
 
 #include "gdt.h"
-#include "idt.h"
+#include "events/idt.h"
 #include "multiboot.h"
-#include "pic.h"
+#include "events/pic/pic.h"
 #include "serial.h"
 #include "stdio.h"