diff --git a/yak-kernel/CMakeLists.txt b/yak-kernel/CMakeLists.txt
index b27d676..241272c 100644
--- a/yak-kernel/CMakeLists.txt
+++ b/yak-kernel/CMakeLists.txt
@@ -61,6 +61,8 @@ endif ()
 file(GLOB KERNEL_SOURCES
         src/rt/*.c
         src/ulibc/*.c)
+file(GLOB_RECURSE KERNEL_CORE_SOURCES
+        src/rt/core/**.c)
 file(GLOB PLATFORM_GENERIC_SOURCES src/platform/generic/*.c)
 
 if (${USE_DEBUG})
@@ -98,6 +100,7 @@ endforeach ()
 # Define aggregate sources
 set(KERNEL_SOURCE_FILES
         ${KERNEL_SOURCES}
+        ${KERNEL_CORE_SOURCES}
         ${LIMINE_KERNEL_SOURCES}
         ${DEBUG_KERNEL_SOURCES}
         ${PLATFORM_GENERIC_SOURCES}
diff --git a/yak-kernel/src/rt/kprint.c b/yak-kernel/src/rt/core/kprint.c
similarity index 100%
rename from yak-kernel/src/rt/kprint.c
rename to yak-kernel/src/rt/core/kprint.c
diff --git a/yak-kernel/src/rt/stack_protection.c b/yak-kernel/src/rt/core/stack_protection.c
similarity index 100%
rename from yak-kernel/src/rt/stack_protection.c
rename to yak-kernel/src/rt/core/stack_protection.c