diff --git a/cpu/x86/Makefile.x86_common b/cpu/x86/Makefile.x86_common
index ca14d0c96..b5ea26271 100644
--- a/cpu/x86/Makefile.x86_common
+++ b/cpu/x86/Makefile.x86_common
@@ -1,4 +1,4 @@
-CONTIKI_CPU_DIRS += .
+CONTIKI_CPU_DIRS += . init/common
 
 CONTIKI_SOURCEFILES += gdt.c helpers.S idt.c cpu.c
 
diff --git a/cpu/x86/cpu.c b/cpu/x86/init/common/cpu.c
similarity index 100%
rename from cpu/x86/cpu.c
rename to cpu/x86/init/common/cpu.c
diff --git a/cpu/x86/cpu.h b/cpu/x86/init/common/cpu.h
similarity index 100%
rename from cpu/x86/cpu.h
rename to cpu/x86/init/common/cpu.h
diff --git a/cpu/x86/gdt.c b/cpu/x86/init/common/gdt.c
similarity index 100%
rename from cpu/x86/gdt.c
rename to cpu/x86/init/common/gdt.c
diff --git a/cpu/x86/gdt.h b/cpu/x86/init/common/gdt.h
similarity index 100%
rename from cpu/x86/gdt.h
rename to cpu/x86/init/common/gdt.h
diff --git a/cpu/x86/idt.c b/cpu/x86/init/common/idt.c
similarity index 100%
rename from cpu/x86/idt.c
rename to cpu/x86/init/common/idt.c
diff --git a/cpu/x86/idt.h b/cpu/x86/init/common/idt.h
similarity index 100%
rename from cpu/x86/idt.h
rename to cpu/x86/init/common/idt.h
diff --git a/cpu/x86/interrupt.h b/cpu/x86/init/common/interrupt.h
similarity index 100%
rename from cpu/x86/interrupt.h
rename to cpu/x86/init/common/interrupt.h