diff --git a/base-hw/src/core/kernel.cc b/base-hw/src/core/kernel/kernel.cc
similarity index 100%
rename from base-hw/src/core/kernel.cc
rename to base-hw/src/core/kernel/kernel.cc
diff --git a/base-hw/src/core/target.inc b/base-hw/src/core/target.inc
index 882139d901..c1ae4e2562 100644
--- a/base-hw/src/core/target.inc
+++ b/base-hw/src/core/target.inc
@@ -46,7 +46,7 @@ SRC_CC += console.cc \
           signal_session_component.cc \
           trace_session_component.cc \
           thread.cc \
-          kernel.cc \
+          kernel/kernel.cc \
           kernel/thread.cc \
           kernel/vm.cc \
           kernel/signal_receiver.cc \