diff --git a/kernel/Makefile b/kernel/Makefile
index 5809bd09..cce0a261 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -31,10 +31,6 @@ BUILDDIR=$(abspath build)
  
 KERNEL_OBJS=\
 $(KERNEL_ARCH_OBJS) \
-kernel/GDT.o \
-kernel/GDT_asm.o \
-kernel/IDT.o \
-kernel/IDT_asm.o \
 kernel/kernel.o \
 kernel/kmalloc.o \
 kernel/PIC.o \
diff --git a/kernel/kernel/GDT.cpp b/kernel/arch/i386/GDT.cpp
similarity index 100%
rename from kernel/kernel/GDT.cpp
rename to kernel/arch/i386/GDT.cpp
diff --git a/kernel/kernel/GDT_asm.S b/kernel/arch/i386/GDT_asm.S
similarity index 100%
rename from kernel/kernel/GDT_asm.S
rename to kernel/arch/i386/GDT_asm.S
diff --git a/kernel/kernel/IDT.cpp b/kernel/arch/i386/IDT.cpp
similarity index 100%
rename from kernel/kernel/IDT.cpp
rename to kernel/arch/i386/IDT.cpp
diff --git a/kernel/kernel/IDT_asm.S b/kernel/arch/i386/IDT_asm.S
similarity index 100%
rename from kernel/kernel/IDT_asm.S
rename to kernel/arch/i386/IDT_asm.S
diff --git a/kernel/arch/i386/make.config b/kernel/arch/i386/make.config
index a4cbb930..a452f1be 100644
--- a/kernel/arch/i386/make.config
+++ b/kernel/arch/i386/make.config
@@ -6,3 +6,7 @@ KERNEL_ARCH_LIBS=
 KERNEL_ARCH_OBJS=\
 $(ARCHDIR)/boot.o \
 $(ARCHDIR)/tty.o \
+$(ARCHDIR)/GDT.o \
+$(ARCHDIR)/GDT_asm.o \
+$(ARCHDIR)/IDT.o \
+$(ARCHDIR)/IDT_asm.o \