diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1c548d2..f99ce55e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.15..3.20)
 
+set(CPU_ARCH i386)
 set(CROSS_ARCH i386-elf)
 set(CROSS_GCC_VERSION 12.2.0)
 set(CROSS_PREFIX "$ENV{HOME}/.local/opt/cross")
diff --git a/src/cpu/CMakeLists.txt b/src/cpu/CMakeLists.txt
index ac7b9420..2e08f4f5 100644
--- a/src/cpu/CMakeLists.txt
+++ b/src/cpu/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(TARGET cpu)
 
-add_subdirectory(${CROSS_ARCH}) # defined in root CMakeLists.txt
+add_subdirectory(${CPU_ARCH}) # defined in root CMakeLists.txt
 target_link_libraries(${TARGET} libc util kernel)
 target_include_directories(${TARGET} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
diff --git a/src/cpu/i386-elf/CMakeLists.txt b/src/cpu/i386/CMakeLists.txt
similarity index 100%
rename from src/cpu/i386-elf/CMakeLists.txt
rename to src/cpu/i386/CMakeLists.txt
diff --git a/src/cpu/i386-elf/src/cpu.asm b/src/cpu/i386/src/cpu.asm
similarity index 100%
rename from src/cpu/i386-elf/src/cpu.asm
rename to src/cpu/i386/src/cpu.asm
diff --git a/src/cpu/i386-elf/src/gdt.c b/src/cpu/i386/src/gdt.c
similarity index 100%
rename from src/cpu/i386-elf/src/gdt.c
rename to src/cpu/i386/src/gdt.c
diff --git a/src/cpu/i386-elf/src/idt.c b/src/cpu/i386/src/idt.c
similarity index 100%
rename from src/cpu/i386-elf/src/idt.c
rename to src/cpu/i386/src/idt.c
diff --git a/src/cpu/i386-elf/src/interrupt.asm b/src/cpu/i386/src/interrupt.asm
similarity index 100%
rename from src/cpu/i386-elf/src/interrupt.asm
rename to src/cpu/i386/src/interrupt.asm
diff --git a/src/cpu/i386-elf/src/isr.c b/src/cpu/i386/src/isr.c
similarity index 100%
rename from src/cpu/i386-elf/src/isr.c
rename to src/cpu/i386/src/isr.c
diff --git a/src/cpu/i386-elf/src/mmu.c b/src/cpu/i386/src/mmu.c
similarity index 100%
rename from src/cpu/i386-elf/src/mmu.c
rename to src/cpu/i386/src/mmu.c
diff --git a/src/cpu/i386-elf/src/paging.asm b/src/cpu/i386/src/paging.asm
similarity index 100%
rename from src/cpu/i386-elf/src/paging.asm
rename to src/cpu/i386/src/paging.asm
diff --git a/src/cpu/i386-elf/src/ports.asm b/src/cpu/i386/src/ports.asm
similarity index 100%
rename from src/cpu/i386-elf/src/ports.asm
rename to src/cpu/i386/src/ports.asm
diff --git a/src/cpu/i386-elf/src/tss.c b/src/cpu/i386/src/tss.c
similarity index 100%
rename from src/cpu/i386-elf/src/tss.c
rename to src/cpu/i386/src/tss.c
diff --git a/tests/src/cpu/CMakeLists.txt b/tests/src/cpu/CMakeLists.txt
index 35b396b2..8e88efdd 100644
--- a/tests/src/cpu/CMakeLists.txt
+++ b/tests/src/cpu/CMakeLists.txt
@@ -1,11 +1,11 @@
 unit_test(
     TARGET test_mmu
     TEST_FILES test_mmu.cpp
-    TARGET_FILES cpu/i386-elf/src/mmu.c
+    TARGET_FILES cpu/i386/src/mmu.c
 )
 
 unit_test(
     TARGET test_gdt
     TEST_FILES test_gdt.cpp
-    TARGET_FILES cpu/i386-elf/src/gdt.c
+    TARGET_FILES cpu/i386/src/gdt.c
 )