diff --git a/src/kernel/core/Jamfile b/src/kernel/core/Jamfile
index 7eb0dd3f9d..e04584b53a 100644
--- a/src/kernel/core/Jamfile
+++ b/src/kernel/core/Jamfile
@@ -17,24 +17,18 @@ if $(OS) != BEOS {
 }
 
 KernelMergeObject kernel_core.o :
-	cbuf.c
-	console.c
 	cpu.c
-	debug.c
 	elf.c
 	faults.c
-	gdb.c
 	heap.c
 	image.c
 	int.c
 	kernel_daemon.c
-	khash.c
 	linkhack.c
 	lock.c
 	main.c
 	module.c
 	port.c
-	queue.c
 	real_time_clock.c
 	scheduler.c
 	sem.c
@@ -47,7 +41,6 @@ KernelMergeObject kernel_core.o :
 	team.c
 	thread.c
 	timer.c
-	user_debugger.cpp
 
 	$(buildSources)
 	: -fno-pic
diff --git a/src/kernel/core/debug/Jamfile b/src/kernel/core/debug/Jamfile
index 748241f9c5..b740bcd8ea 100644
--- a/src/kernel/core/debug/Jamfile
+++ b/src/kernel/core/debug/Jamfile
@@ -3,7 +3,11 @@ SubDir OBOS_TOP src kernel core debug ;
 UsePrivateHeaders [ FDirName kernel debug ] ;
 
 KernelMergeObject kernel_debug.o :
+	console.c
+	debug.c
 	frame_buffer_console.cpp
+	gdb.c
+	user_debugger.cpp
 
-	: -fno-pic -Wno-unused -D_KERNEL_MODE
+	: -fno-pic -Wno-unused
 	;
diff --git a/src/kernel/core/console.c b/src/kernel/core/debug/console.c
similarity index 100%
rename from src/kernel/core/console.c
rename to src/kernel/core/debug/console.c
diff --git a/src/kernel/core/debug.c b/src/kernel/core/debug/debug.c
similarity index 100%
rename from src/kernel/core/debug.c
rename to src/kernel/core/debug/debug.c
diff --git a/src/kernel/core/gdb.c b/src/kernel/core/debug/gdb.c
similarity index 100%
rename from src/kernel/core/gdb.c
rename to src/kernel/core/debug/gdb.c
diff --git a/src/kernel/core/user_debugger.cpp b/src/kernel/core/debug/user_debugger.cpp
similarity index 100%
rename from src/kernel/core/user_debugger.cpp
rename to src/kernel/core/debug/user_debugger.cpp
diff --git a/src/kernel/core/util/Jamfile b/src/kernel/core/util/Jamfile
index 3cd5a963e2..5827846d85 100644
--- a/src/kernel/core/util/Jamfile
+++ b/src/kernel/core/util/Jamfile
@@ -3,9 +3,12 @@ SubDir OBOS_TOP src kernel core util ;
 UsePrivateHeaders [ FDirName kernel util ] ;
 
 KernelMergeObject kernel_util.o :
-	list.c
+	cbuf.c
 	kernel_cpp.cpp
+	khash.c
 	KMessage.cpp
+	list.c
+	queue.c
 
-	: -fno-pic -Wno-unused -D_KERNEL_MODE -DUSING_LIBGCC
+	: -fno-pic -Wno-unused -DUSING_LIBGCC
 	;
diff --git a/src/kernel/core/cbuf.c b/src/kernel/core/util/cbuf.c
similarity index 100%
rename from src/kernel/core/cbuf.c
rename to src/kernel/core/util/cbuf.c
diff --git a/src/kernel/core/khash.c b/src/kernel/core/util/khash.c
similarity index 100%
rename from src/kernel/core/khash.c
rename to src/kernel/core/util/khash.c
diff --git a/src/kernel/core/misc.c b/src/kernel/core/util/misc.c
similarity index 100%
rename from src/kernel/core/misc.c
rename to src/kernel/core/util/misc.c
diff --git a/src/kernel/core/pools.c b/src/kernel/core/util/pools.c
similarity index 100%
rename from src/kernel/core/pools.c
rename to src/kernel/core/util/pools.c
diff --git a/src/kernel/core/queue.c b/src/kernel/core/util/queue.c
similarity index 100%
rename from src/kernel/core/queue.c
rename to src/kernel/core/util/queue.c