diff --git a/src/system/core/Jamfile b/src/system/kernel/Jamfile
similarity index 100%
rename from src/system/core/Jamfile
rename to src/system/kernel/Jamfile
diff --git a/src/system/core/arch/Jamfile b/src/system/kernel/arch/Jamfile
similarity index 100%
rename from src/system/core/arch/Jamfile
rename to src/system/kernel/arch/Jamfile
diff --git a/src/system/core/arch/m68k/arch_kernel.mk b/src/system/kernel/arch/m68k/arch_kernel.mk
similarity index 100%
rename from src/system/core/arch/m68k/arch_kernel.mk
rename to src/system/kernel/arch/m68k/arch_kernel.mk
diff --git a/src/system/core/arch/m68k/kernel.ld b/src/system/kernel/arch/m68k/kernel.ld
similarity index 100%
rename from src/system/core/arch/m68k/kernel.ld
rename to src/system/kernel/arch/m68k/kernel.ld
diff --git a/src/system/core/arch/mips/arch_asm.S b/src/system/kernel/arch/mips/arch_asm.S
similarity index 100%
rename from src/system/core/arch/mips/arch_asm.S
rename to src/system/kernel/arch/mips/arch_asm.S
diff --git a/src/system/core/arch/mips/arch_cpu.c b/src/system/kernel/arch/mips/arch_cpu.c
similarity index 100%
rename from src/system/core/arch/mips/arch_cpu.c
rename to src/system/kernel/arch/mips/arch_cpu.c
diff --git a/src/system/core/arch/mips/arch_dbg_console.c b/src/system/kernel/arch/mips/arch_dbg_console.c
similarity index 100%
rename from src/system/core/arch/mips/arch_dbg_console.c
rename to src/system/kernel/arch/mips/arch_dbg_console.c
diff --git a/src/system/core/arch/mips/arch_debug.c b/src/system/kernel/arch/mips/arch_debug.c
similarity index 100%
rename from src/system/core/arch/mips/arch_debug.c
rename to src/system/kernel/arch/mips/arch_debug.c
diff --git a/src/system/core/arch/mips/arch_faults.c b/src/system/kernel/arch/mips/arch_faults.c
similarity index 100%
rename from src/system/core/arch/mips/arch_faults.c
rename to src/system/kernel/arch/mips/arch_faults.c
diff --git a/src/system/core/arch/mips/arch_int.c b/src/system/kernel/arch/mips/arch_int.c
similarity index 100%
rename from src/system/core/arch/mips/arch_int.c
rename to src/system/kernel/arch/mips/arch_int.c
diff --git a/src/system/core/arch/mips/arch_kernel.mk b/src/system/kernel/arch/mips/arch_kernel.mk
similarity index 100%
rename from src/system/core/arch/mips/arch_kernel.mk
rename to src/system/kernel/arch/mips/arch_kernel.mk
diff --git a/src/system/core/arch/mips/arch_pmap.c b/src/system/kernel/arch/mips/arch_pmap.c
similarity index 100%
rename from src/system/core/arch/mips/arch_pmap.c
rename to src/system/kernel/arch/mips/arch_pmap.c
diff --git a/src/system/core/arch/mips/arch_smp.c b/src/system/kernel/arch/mips/arch_smp.c
similarity index 100%
rename from src/system/core/arch/mips/arch_smp.c
rename to src/system/kernel/arch/mips/arch_smp.c
diff --git a/src/system/core/arch/mips/arch_thread.c b/src/system/kernel/arch/mips/arch_thread.c
similarity index 100%
rename from src/system/core/arch/mips/arch_thread.c
rename to src/system/kernel/arch/mips/arch_thread.c
diff --git a/src/system/core/arch/mips/arch_timer.c b/src/system/kernel/arch/mips/arch_timer.c
similarity index 100%
rename from src/system/core/arch/mips/arch_timer.c
rename to src/system/kernel/arch/mips/arch_timer.c
diff --git a/src/system/core/arch/mips/arch_vm.c b/src/system/kernel/arch/mips/arch_vm.c
similarity index 100%
rename from src/system/core/arch/mips/arch_vm.c
rename to src/system/kernel/arch/mips/arch_vm.c
diff --git a/src/system/core/arch/mips/kernel.ld b/src/system/kernel/arch/mips/kernel.ld
similarity index 100%
rename from src/system/core/arch/mips/kernel.ld
rename to src/system/kernel/arch/mips/kernel.ld
diff --git a/src/system/core/arch/ppc/Jamfile b/src/system/kernel/arch/ppc/Jamfile
similarity index 100%
rename from src/system/core/arch/ppc/Jamfile
rename to src/system/kernel/arch/ppc/Jamfile
diff --git a/src/system/core/arch/ppc/arch_asm.S b/src/system/kernel/arch/ppc/arch_asm.S
similarity index 100%
rename from src/system/core/arch/ppc/arch_asm.S
rename to src/system/kernel/arch/ppc/arch_asm.S
diff --git a/src/system/core/arch/ppc/arch_atomic.c b/src/system/kernel/arch/ppc/arch_atomic.c
similarity index 100%
rename from src/system/core/arch/ppc/arch_atomic.c
rename to src/system/kernel/arch/ppc/arch_atomic.c
diff --git a/src/system/core/arch/ppc/arch_cpu.c b/src/system/kernel/arch/ppc/arch_cpu.c
similarity index 100%
rename from src/system/core/arch/ppc/arch_cpu.c
rename to src/system/kernel/arch/ppc/arch_cpu.c
diff --git a/src/system/core/arch/ppc/arch_cpu_asm.S b/src/system/kernel/arch/ppc/arch_cpu_asm.S
similarity index 100%
rename from src/system/core/arch/ppc/arch_cpu_asm.S
rename to src/system/kernel/arch/ppc/arch_cpu_asm.S
diff --git a/src/system/core/arch/ppc/arch_dbg_console.c b/src/system/kernel/arch/ppc/arch_dbg_console.c
similarity index 100%
rename from src/system/core/arch/ppc/arch_dbg_console.c
rename to src/system/kernel/arch/ppc/arch_dbg_console.c
diff --git a/src/system/core/arch/ppc/arch_debug.c b/src/system/kernel/arch/ppc/arch_debug.c
similarity index 100%
rename from src/system/core/arch/ppc/arch_debug.c
rename to src/system/kernel/arch/ppc/arch_debug.c
diff --git a/src/system/core/arch/ppc/arch_elf.c b/src/system/kernel/arch/ppc/arch_elf.c
similarity index 100%
rename from src/system/core/arch/ppc/arch_elf.c
rename to src/system/kernel/arch/ppc/arch_elf.c
diff --git a/src/system/core/arch/ppc/arch_exceptions.S b/src/system/kernel/arch/ppc/arch_exceptions.S
similarity index 100%
rename from src/system/core/arch/ppc/arch_exceptions.S
rename to src/system/kernel/arch/ppc/arch_exceptions.S
diff --git a/src/system/core/arch/ppc/arch_faults.c b/src/system/kernel/arch/ppc/arch_faults.c
similarity index 100%
rename from src/system/core/arch/ppc/arch_faults.c
rename to src/system/kernel/arch/ppc/arch_faults.c
diff --git a/src/system/core/arch/ppc/arch_int.c b/src/system/kernel/arch/ppc/arch_int.c
similarity index 100%
rename from src/system/core/arch/ppc/arch_int.c
rename to src/system/kernel/arch/ppc/arch_int.c
diff --git a/src/system/core/arch/ppc/arch_mmu.cpp b/src/system/kernel/arch/ppc/arch_mmu.cpp
similarity index 100%
rename from src/system/core/arch/ppc/arch_mmu.cpp
rename to src/system/kernel/arch/ppc/arch_mmu.cpp
diff --git a/src/system/core/arch/ppc/arch_real_time_clock.c b/src/system/kernel/arch/ppc/arch_real_time_clock.c
similarity index 100%
rename from src/system/core/arch/ppc/arch_real_time_clock.c
rename to src/system/kernel/arch/ppc/arch_real_time_clock.c
diff --git a/src/system/core/arch/ppc/arch_smp.c b/src/system/kernel/arch/ppc/arch_smp.c
similarity index 100%
rename from src/system/core/arch/ppc/arch_smp.c
rename to src/system/kernel/arch/ppc/arch_smp.c
diff --git a/src/system/core/arch/ppc/arch_system_info.c b/src/system/kernel/arch/ppc/arch_system_info.c
similarity index 100%
rename from src/system/core/arch/ppc/arch_system_info.c
rename to src/system/kernel/arch/ppc/arch_system_info.c
diff --git a/src/system/core/arch/ppc/arch_thread.c b/src/system/kernel/arch/ppc/arch_thread.c
similarity index 100%
rename from src/system/core/arch/ppc/arch_thread.c
rename to src/system/kernel/arch/ppc/arch_thread.c
diff --git a/src/system/core/arch/ppc/arch_timer.c b/src/system/kernel/arch/ppc/arch_timer.c
similarity index 100%
rename from src/system/core/arch/ppc/arch_timer.c
rename to src/system/kernel/arch/ppc/arch_timer.c
diff --git a/src/system/core/arch/ppc/arch_user_debugger.cpp b/src/system/kernel/arch/ppc/arch_user_debugger.cpp
similarity index 100%
rename from src/system/core/arch/ppc/arch_user_debugger.cpp
rename to src/system/kernel/arch/ppc/arch_user_debugger.cpp
diff --git a/src/system/core/arch/ppc/arch_vm.cpp b/src/system/kernel/arch/ppc/arch_vm.cpp
similarity index 100%
rename from src/system/core/arch/ppc/arch_vm.cpp
rename to src/system/kernel/arch/ppc/arch_vm.cpp
diff --git a/src/system/core/arch/ppc/arch_vm_translation_map.cpp b/src/system/kernel/arch/ppc/arch_vm_translation_map.cpp
similarity index 100%
rename from src/system/core/arch/ppc/arch_vm_translation_map.cpp
rename to src/system/kernel/arch/ppc/arch_vm_translation_map.cpp
diff --git a/src/system/core/arch/sh4/addon.ld b/src/system/kernel/arch/sh4/addon.ld
similarity index 100%
rename from src/system/core/arch/sh4/addon.ld
rename to src/system/kernel/arch/sh4/addon.ld
diff --git a/src/system/core/arch/sh4/arch_asm.S b/src/system/kernel/arch/sh4/arch_asm.S
similarity index 100%
rename from src/system/core/arch/sh4/arch_asm.S
rename to src/system/kernel/arch/sh4/arch_asm.S
diff --git a/src/system/core/arch/sh4/arch_atomic.c b/src/system/kernel/arch/sh4/arch_atomic.c
similarity index 100%
rename from src/system/core/arch/sh4/arch_atomic.c
rename to src/system/kernel/arch/sh4/arch_atomic.c
diff --git a/src/system/core/arch/sh4/arch_cpu.c b/src/system/kernel/arch/sh4/arch_cpu.c
similarity index 100%
rename from src/system/core/arch/sh4/arch_cpu.c
rename to src/system/kernel/arch/sh4/arch_cpu.c
diff --git a/src/system/core/arch/sh4/arch_dbg_console.c b/src/system/kernel/arch/sh4/arch_dbg_console.c
similarity index 100%
rename from src/system/core/arch/sh4/arch_dbg_console.c
rename to src/system/kernel/arch/sh4/arch_dbg_console.c
diff --git a/src/system/core/arch/sh4/arch_debug.c b/src/system/kernel/arch/sh4/arch_debug.c
similarity index 100%
rename from src/system/core/arch/sh4/arch_debug.c
rename to src/system/kernel/arch/sh4/arch_debug.c
diff --git a/src/system/core/arch/sh4/arch_faults.c b/src/system/kernel/arch/sh4/arch_faults.c
similarity index 100%
rename from src/system/core/arch/sh4/arch_faults.c
rename to src/system/kernel/arch/sh4/arch_faults.c
diff --git a/src/system/core/arch/sh4/arch_int.c b/src/system/kernel/arch/sh4/arch_int.c
similarity index 100%
rename from src/system/core/arch/sh4/arch_int.c
rename to src/system/kernel/arch/sh4/arch_int.c
diff --git a/src/system/core/arch/sh4/arch_pmap.c b/src/system/kernel/arch/sh4/arch_pmap.c
similarity index 100%
rename from src/system/core/arch/sh4/arch_pmap.c
rename to src/system/kernel/arch/sh4/arch_pmap.c
diff --git a/src/system/core/arch/sh4/arch_smp.c b/src/system/kernel/arch/sh4/arch_smp.c
similarity index 100%
rename from src/system/core/arch/sh4/arch_smp.c
rename to src/system/kernel/arch/sh4/arch_smp.c
diff --git a/src/system/core/arch/sh4/arch_thread.c b/src/system/kernel/arch/sh4/arch_thread.c
similarity index 100%
rename from src/system/core/arch/sh4/arch_thread.c
rename to src/system/kernel/arch/sh4/arch_thread.c
diff --git a/src/system/core/arch/sh4/arch_timer.c b/src/system/kernel/arch/sh4/arch_timer.c
similarity index 100%
rename from src/system/core/arch/sh4/arch_timer.c
rename to src/system/kernel/arch/sh4/arch_timer.c
diff --git a/src/system/core/arch/sh4/arch_vm.c b/src/system/kernel/arch/sh4/arch_vm.c
similarity index 100%
rename from src/system/core/arch/sh4/arch_vm.c
rename to src/system/kernel/arch/sh4/arch_vm.c
diff --git a/src/system/core/arch/sh4/arch_vm_translation_map.c b/src/system/kernel/arch/sh4/arch_vm_translation_map.c
similarity index 100%
rename from src/system/core/arch/sh4/arch_vm_translation_map.c
rename to src/system/kernel/arch/sh4/arch_vm_translation_map.c
diff --git a/src/system/core/arch/sh4/kernel.ld b/src/system/kernel/arch/sh4/kernel.ld
similarity index 100%
rename from src/system/core/arch/sh4/kernel.ld
rename to src/system/kernel/arch/sh4/kernel.ld
diff --git a/src/system/core/arch/sparc/arch_kernel.mk b/src/system/kernel/arch/sparc/arch_kernel.mk
similarity index 100%
rename from src/system/core/arch/sparc/arch_kernel.mk
rename to src/system/kernel/arch/sparc/arch_kernel.mk
diff --git a/src/system/core/arch/sparc64/arch_kernel.mk b/src/system/kernel/arch/sparc64/arch_kernel.mk
similarity index 100%
rename from src/system/core/arch/sparc64/arch_kernel.mk
rename to src/system/kernel/arch/sparc64/arch_kernel.mk
diff --git a/src/system/core/arch/x86/Jamfile b/src/system/kernel/arch/x86/Jamfile
similarity index 100%
rename from src/system/core/arch/x86/Jamfile
rename to src/system/kernel/arch/x86/Jamfile
diff --git a/src/system/core/arch/x86/arch_cpu.c b/src/system/kernel/arch/x86/arch_cpu.c
similarity index 100%
rename from src/system/core/arch/x86/arch_cpu.c
rename to src/system/kernel/arch/x86/arch_cpu.c
diff --git a/src/system/core/arch/x86/arch_dbg_console.c b/src/system/kernel/arch/x86/arch_dbg_console.c
similarity index 100%
rename from src/system/core/arch/x86/arch_dbg_console.c
rename to src/system/kernel/arch/x86/arch_dbg_console.c
diff --git a/src/system/core/arch/x86/arch_debug.c b/src/system/kernel/arch/x86/arch_debug.c
similarity index 100%
rename from src/system/core/arch/x86/arch_debug.c
rename to src/system/kernel/arch/x86/arch_debug.c
diff --git a/src/system/core/arch/x86/arch_elf.c b/src/system/kernel/arch/x86/arch_elf.c
similarity index 100%
rename from src/system/core/arch/x86/arch_elf.c
rename to src/system/kernel/arch/x86/arch_elf.c
diff --git a/src/system/core/arch/x86/arch_faults.c b/src/system/kernel/arch/x86/arch_faults.c
similarity index 100%
rename from src/system/core/arch/x86/arch_faults.c
rename to src/system/kernel/arch/x86/arch_faults.c
diff --git a/src/system/core/arch/x86/arch_int.c b/src/system/kernel/arch/x86/arch_int.c
similarity index 100%
rename from src/system/core/arch/x86/arch_int.c
rename to src/system/kernel/arch/x86/arch_int.c
diff --git a/src/system/core/arch/x86/arch_interrupts.S b/src/system/kernel/arch/x86/arch_interrupts.S
similarity index 100%
rename from src/system/core/arch/x86/arch_interrupts.S
rename to src/system/kernel/arch/x86/arch_interrupts.S
diff --git a/src/system/core/arch/x86/arch_real_time_clock.c b/src/system/kernel/arch/x86/arch_real_time_clock.c
similarity index 100%
rename from src/system/core/arch/x86/arch_real_time_clock.c
rename to src/system/kernel/arch/x86/arch_real_time_clock.c
diff --git a/src/system/core/arch/x86/arch_selector.c b/src/system/kernel/arch/x86/arch_selector.c
similarity index 100%
rename from src/system/core/arch/x86/arch_selector.c
rename to src/system/kernel/arch/x86/arch_selector.c
diff --git a/src/system/core/arch/x86/arch_smp.c b/src/system/kernel/arch/x86/arch_smp.c
similarity index 100%
rename from src/system/core/arch/x86/arch_smp.c
rename to src/system/kernel/arch/x86/arch_smp.c
diff --git a/src/system/core/arch/x86/arch_system_info.c b/src/system/kernel/arch/x86/arch_system_info.c
similarity index 100%
rename from src/system/core/arch/x86/arch_system_info.c
rename to src/system/kernel/arch/x86/arch_system_info.c
diff --git a/src/system/core/arch/x86/arch_thread.c b/src/system/kernel/arch/x86/arch_thread.c
similarity index 100%
rename from src/system/core/arch/x86/arch_thread.c
rename to src/system/kernel/arch/x86/arch_thread.c
diff --git a/src/system/core/arch/x86/arch_timer.c b/src/system/kernel/arch/x86/arch_timer.c
similarity index 100%
rename from src/system/core/arch/x86/arch_timer.c
rename to src/system/kernel/arch/x86/arch_timer.c
diff --git a/src/system/core/arch/x86/arch_user_debugger.cpp b/src/system/kernel/arch/x86/arch_user_debugger.cpp
similarity index 100%
rename from src/system/core/arch/x86/arch_user_debugger.cpp
rename to src/system/kernel/arch/x86/arch_user_debugger.cpp
diff --git a/src/system/core/arch/x86/arch_vm.c b/src/system/kernel/arch/x86/arch_vm.c
similarity index 100%
rename from src/system/core/arch/x86/arch_vm.c
rename to src/system/kernel/arch/x86/arch_vm.c
diff --git a/src/system/core/arch/x86/arch_vm_translation_map.c b/src/system/kernel/arch/x86/arch_vm_translation_map.c
similarity index 100%
rename from src/system/core/arch/x86/arch_vm_translation_map.c
rename to src/system/kernel/arch/x86/arch_vm_translation_map.c
diff --git a/src/system/core/arch/x86/arch_x86.S b/src/system/kernel/arch/x86/arch_x86.S
similarity index 100%
rename from src/system/core/arch/x86/arch_x86.S
rename to src/system/kernel/arch/x86/arch_x86.S
diff --git a/src/system/core/arch/x86/bios.cpp b/src/system/kernel/arch/x86/bios.cpp
similarity index 100%
rename from src/system/core/arch/x86/bios.cpp
rename to src/system/kernel/arch/x86/bios.cpp
diff --git a/src/system/core/arch/x86/cpuid.S b/src/system/kernel/arch/x86/cpuid.S
similarity index 100%
rename from src/system/core/arch/x86/cpuid.S
rename to src/system/kernel/arch/x86/cpuid.S
diff --git a/src/system/core/boot_item.cpp b/src/system/kernel/boot_item.cpp
similarity index 100%
rename from src/system/core/boot_item.cpp
rename to src/system/kernel/boot_item.cpp
diff --git a/src/system/core/cache/BlockMap.cpp b/src/system/kernel/cache/BlockMap.cpp
similarity index 100%
rename from src/system/core/cache/BlockMap.cpp
rename to src/system/kernel/cache/BlockMap.cpp
diff --git a/src/system/core/cache/BlockMap.h b/src/system/kernel/cache/BlockMap.h
similarity index 100%
rename from src/system/core/cache/BlockMap.h
rename to src/system/kernel/cache/BlockMap.h
diff --git a/src/system/core/cache/Jamfile b/src/system/kernel/cache/Jamfile
similarity index 100%
rename from src/system/core/cache/Jamfile
rename to src/system/kernel/cache/Jamfile
diff --git a/src/system/core/cache/block_cache.cpp b/src/system/kernel/cache/block_cache.cpp
similarity index 100%
rename from src/system/core/cache/block_cache.cpp
rename to src/system/kernel/cache/block_cache.cpp
diff --git a/src/system/core/cache/file_cache.cpp b/src/system/kernel/cache/file_cache.cpp
similarity index 100%
rename from src/system/core/cache/file_cache.cpp
rename to src/system/kernel/cache/file_cache.cpp
diff --git a/src/system/core/cache/vnode_store.cpp b/src/system/kernel/cache/vnode_store.cpp
similarity index 100%
rename from src/system/core/cache/vnode_store.cpp
rename to src/system/kernel/cache/vnode_store.cpp
diff --git a/src/system/core/cache/vnode_store.h b/src/system/kernel/cache/vnode_store.h
similarity index 100%
rename from src/system/core/cache/vnode_store.h
rename to src/system/kernel/cache/vnode_store.h
diff --git a/src/system/core/cpu.c b/src/system/kernel/cpu.c
similarity index 100%
rename from src/system/core/cpu.c
rename to src/system/kernel/cpu.c
diff --git a/src/system/core/debug/Jamfile b/src/system/kernel/debug/Jamfile
similarity index 100%
rename from src/system/core/debug/Jamfile
rename to src/system/kernel/debug/Jamfile
diff --git a/src/system/core/debug/console.c b/src/system/kernel/debug/console.c
similarity index 100%
rename from src/system/core/debug/console.c
rename to src/system/kernel/debug/console.c
diff --git a/src/system/core/debug/debug.c b/src/system/kernel/debug/debug.c
similarity index 100%
rename from src/system/core/debug/debug.c
rename to src/system/kernel/debug/debug.c
diff --git a/src/system/core/debug/font.h b/src/system/kernel/debug/font.h
similarity index 100%
rename from src/system/core/debug/font.h
rename to src/system/kernel/debug/font.h
diff --git a/src/system/core/debug/frame_buffer_console.cpp b/src/system/kernel/debug/frame_buffer_console.cpp
similarity index 100%
rename from src/system/core/debug/frame_buffer_console.cpp
rename to src/system/kernel/debug/frame_buffer_console.cpp
diff --git a/src/system/core/debug/gdb.c b/src/system/kernel/debug/gdb.c
similarity index 100%
rename from src/system/core/debug/gdb.c
rename to src/system/kernel/debug/gdb.c
diff --git a/src/system/core/debug/user_debugger.cpp b/src/system/kernel/debug/user_debugger.cpp
similarity index 100%
rename from src/system/core/debug/user_debugger.cpp
rename to src/system/kernel/debug/user_debugger.cpp
diff --git a/src/system/core/device_manager/Jamfile b/src/system/kernel/device_manager/Jamfile
similarity index 100%
rename from src/system/core/device_manager/Jamfile
rename to src/system/kernel/device_manager/Jamfile
diff --git a/src/system/core/device_manager/attributes.c b/src/system/kernel/device_manager/attributes.c
similarity index 100%
rename from src/system/core/device_manager/attributes.c
rename to src/system/kernel/device_manager/attributes.c
diff --git a/src/system/core/device_manager/device_manager.c b/src/system/kernel/device_manager/device_manager.c
similarity index 100%
rename from src/system/core/device_manager/device_manager.c
rename to src/system/kernel/device_manager/device_manager.c
diff --git a/src/system/core/device_manager/device_manager_private.h b/src/system/kernel/device_manager/device_manager_private.h
similarity index 100%
rename from src/system/core/device_manager/device_manager_private.h
rename to src/system/kernel/device_manager/device_manager_private.h
diff --git a/src/system/core/device_manager/dl_list.h b/src/system/kernel/device_manager/dl_list.h
similarity index 100%
rename from src/system/core/device_manager/dl_list.h
rename to src/system/kernel/device_manager/dl_list.h
diff --git a/src/system/core/device_manager/driver_loader.c b/src/system/kernel/device_manager/driver_loader.c
similarity index 100%
rename from src/system/core/device_manager/driver_loader.c
rename to src/system/kernel/device_manager/driver_loader.c
diff --git a/src/system/core/device_manager/id_generator.c b/src/system/kernel/device_manager/id_generator.c
similarity index 100%
rename from src/system/core/device_manager/id_generator.c
rename to src/system/kernel/device_manager/id_generator.c
diff --git a/src/system/core/device_manager/io_resources.c b/src/system/kernel/device_manager/io_resources.c
similarity index 100%
rename from src/system/core/device_manager/io_resources.c
rename to src/system/kernel/device_manager/io_resources.c
diff --git a/src/system/core/device_manager/nodes.c b/src/system/kernel/device_manager/nodes.c
similarity index 100%
rename from src/system/core/device_manager/nodes.c
rename to src/system/kernel/device_manager/nodes.c
diff --git a/src/system/core/device_manager/notifications.c b/src/system/kernel/device_manager/notifications.c
similarity index 100%
rename from src/system/core/device_manager/notifications.c
rename to src/system/kernel/device_manager/notifications.c
diff --git a/src/system/core/device_manager/patterns.c b/src/system/kernel/device_manager/patterns.c
similarity index 100%
rename from src/system/core/device_manager/patterns.c
rename to src/system/kernel/device_manager/patterns.c
diff --git a/src/system/core/device_manager/probe.cpp b/src/system/kernel/device_manager/probe.cpp
similarity index 100%
rename from src/system/core/device_manager/probe.cpp
rename to src/system/kernel/device_manager/probe.cpp
diff --git a/src/system/core/device_manager/registration.c b/src/system/kernel/device_manager/registration.c
similarity index 100%
rename from src/system/core/device_manager/registration.c
rename to src/system/kernel/device_manager/registration.c
diff --git a/src/system/core/device_manager/root_node.c b/src/system/kernel/device_manager/root_node.c
similarity index 100%
rename from src/system/core/device_manager/root_node.c
rename to src/system/kernel/device_manager/root_node.c
diff --git a/src/system/core/device_manager/scan.c b/src/system/kernel/device_manager/scan.c
similarity index 100%
rename from src/system/core/device_manager/scan.c
rename to src/system/kernel/device_manager/scan.c
diff --git a/src/system/core/device_manager/settings.cpp b/src/system/kernel/device_manager/settings.cpp
similarity index 100%
rename from src/system/core/device_manager/settings.cpp
rename to src/system/kernel/device_manager/settings.cpp
diff --git a/src/system/core/disk_device_manager/Jamfile b/src/system/kernel/disk_device_manager/Jamfile
similarity index 100%
rename from src/system/core/disk_device_manager/Jamfile
rename to src/system/kernel/disk_device_manager/Jamfile
diff --git a/src/system/core/disk_device_manager/KDiskDevice.cpp b/src/system/kernel/disk_device_manager/KDiskDevice.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/KDiskDevice.cpp
rename to src/system/kernel/disk_device_manager/KDiskDevice.cpp
diff --git a/src/system/core/disk_device_manager/KDiskDeviceJob.cpp b/src/system/kernel/disk_device_manager/KDiskDeviceJob.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/KDiskDeviceJob.cpp
rename to src/system/kernel/disk_device_manager/KDiskDeviceJob.cpp
diff --git a/src/system/core/disk_device_manager/KDiskDeviceJobFactory.cpp b/src/system/kernel/disk_device_manager/KDiskDeviceJobFactory.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/KDiskDeviceJobFactory.cpp
rename to src/system/kernel/disk_device_manager/KDiskDeviceJobFactory.cpp
diff --git a/src/system/core/disk_device_manager/KDiskDeviceJobGenerator.cpp b/src/system/kernel/disk_device_manager/KDiskDeviceJobGenerator.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/KDiskDeviceJobGenerator.cpp
rename to src/system/kernel/disk_device_manager/KDiskDeviceJobGenerator.cpp
diff --git a/src/system/core/disk_device_manager/KDiskDeviceJobGenerator.h b/src/system/kernel/disk_device_manager/KDiskDeviceJobGenerator.h
similarity index 100%
rename from src/system/core/disk_device_manager/KDiskDeviceJobGenerator.h
rename to src/system/kernel/disk_device_manager/KDiskDeviceJobGenerator.h
diff --git a/src/system/core/disk_device_manager/KDiskDeviceJobQueue.cpp b/src/system/kernel/disk_device_manager/KDiskDeviceJobQueue.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/KDiskDeviceJobQueue.cpp
rename to src/system/kernel/disk_device_manager/KDiskDeviceJobQueue.cpp
diff --git a/src/system/core/disk_device_manager/KDiskDeviceManager.cpp b/src/system/kernel/disk_device_manager/KDiskDeviceManager.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/KDiskDeviceManager.cpp
rename to src/system/kernel/disk_device_manager/KDiskDeviceManager.cpp
diff --git a/src/system/core/disk_device_manager/KDiskSystem.cpp b/src/system/kernel/disk_device_manager/KDiskSystem.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/KDiskSystem.cpp
rename to src/system/kernel/disk_device_manager/KDiskSystem.cpp
diff --git a/src/system/core/disk_device_manager/KFileDiskDevice.cpp b/src/system/kernel/disk_device_manager/KFileDiskDevice.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/KFileDiskDevice.cpp
rename to src/system/kernel/disk_device_manager/KFileDiskDevice.cpp
diff --git a/src/system/core/disk_device_manager/KFileSystem.cpp b/src/system/kernel/disk_device_manager/KFileSystem.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/KFileSystem.cpp
rename to src/system/kernel/disk_device_manager/KFileSystem.cpp
diff --git a/src/system/core/disk_device_manager/KPartition.cpp b/src/system/kernel/disk_device_manager/KPartition.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/KPartition.cpp
rename to src/system/kernel/disk_device_manager/KPartition.cpp
diff --git a/src/system/core/disk_device_manager/KPartitionListener.cpp b/src/system/kernel/disk_device_manager/KPartitionListener.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/KPartitionListener.cpp
rename to src/system/kernel/disk_device_manager/KPartitionListener.cpp
diff --git a/src/system/core/disk_device_manager/KPartitionVisitor.cpp b/src/system/kernel/disk_device_manager/KPartitionVisitor.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/KPartitionVisitor.cpp
rename to src/system/kernel/disk_device_manager/KPartitionVisitor.cpp
diff --git a/src/system/core/disk_device_manager/KPartitioningSystem.cpp b/src/system/kernel/disk_device_manager/KPartitioningSystem.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/KPartitioningSystem.cpp
rename to src/system/kernel/disk_device_manager/KPartitioningSystem.cpp
diff --git a/src/system/core/disk_device_manager/KPhysicalPartition.cpp b/src/system/kernel/disk_device_manager/KPhysicalPartition.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/KPhysicalPartition.cpp
rename to src/system/kernel/disk_device_manager/KPhysicalPartition.cpp
diff --git a/src/system/core/disk_device_manager/KShadowPartition.cpp b/src/system/kernel/disk_device_manager/KShadowPartition.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/KShadowPartition.cpp
rename to src/system/kernel/disk_device_manager/KShadowPartition.cpp
diff --git a/src/system/core/disk_device_manager/Locker.cpp b/src/system/kernel/disk_device_manager/Locker.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/Locker.cpp
rename to src/system/kernel/disk_device_manager/Locker.cpp
diff --git a/src/system/core/disk_device_manager/Locker.h b/src/system/kernel/disk_device_manager/Locker.h
similarity index 100%
rename from src/system/core/disk_device_manager/Locker.h
rename to src/system/kernel/disk_device_manager/Locker.h
diff --git a/src/system/core/disk_device_manager/RWLocker.cpp b/src/system/kernel/disk_device_manager/RWLocker.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/RWLocker.cpp
rename to src/system/kernel/disk_device_manager/RWLocker.cpp
diff --git a/src/system/core/disk_device_manager/UserDataWriter.cpp b/src/system/kernel/disk_device_manager/UserDataWriter.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/UserDataWriter.cpp
rename to src/system/kernel/disk_device_manager/UserDataWriter.cpp
diff --git a/src/system/core/disk_device_manager/UserDataWriter.h b/src/system/kernel/disk_device_manager/UserDataWriter.h
similarity index 100%
rename from src/system/core/disk_device_manager/UserDataWriter.h
rename to src/system/kernel/disk_device_manager/UserDataWriter.h
diff --git a/src/system/core/disk_device_manager/ddm_operation_validation.cpp b/src/system/kernel/disk_device_manager/ddm_operation_validation.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/ddm_operation_validation.cpp
rename to src/system/kernel/disk_device_manager/ddm_operation_validation.cpp
diff --git a/src/system/core/disk_device_manager/ddm_operation_validation.h b/src/system/kernel/disk_device_manager/ddm_operation_validation.h
similarity index 100%
rename from src/system/core/disk_device_manager/ddm_operation_validation.h
rename to src/system/kernel/disk_device_manager/ddm_operation_validation.h
diff --git a/src/system/core/disk_device_manager/ddm_userland_interface.cpp b/src/system/kernel/disk_device_manager/ddm_userland_interface.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/ddm_userland_interface.cpp
rename to src/system/kernel/disk_device_manager/ddm_userland_interface.cpp
diff --git a/src/system/core/disk_device_manager/disk_device_manager.cpp b/src/system/kernel/disk_device_manager/disk_device_manager.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/disk_device_manager.cpp
rename to src/system/kernel/disk_device_manager/disk_device_manager.cpp
diff --git a/src/system/core/disk_device_manager/jobs/KCreateChildJob.cpp b/src/system/kernel/disk_device_manager/jobs/KCreateChildJob.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KCreateChildJob.cpp
rename to src/system/kernel/disk_device_manager/jobs/KCreateChildJob.cpp
diff --git a/src/system/core/disk_device_manager/jobs/KCreateChildJob.h b/src/system/kernel/disk_device_manager/jobs/KCreateChildJob.h
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KCreateChildJob.h
rename to src/system/kernel/disk_device_manager/jobs/KCreateChildJob.h
diff --git a/src/system/core/disk_device_manager/jobs/KDefragmentJob.cpp b/src/system/kernel/disk_device_manager/jobs/KDefragmentJob.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KDefragmentJob.cpp
rename to src/system/kernel/disk_device_manager/jobs/KDefragmentJob.cpp
diff --git a/src/system/core/disk_device_manager/jobs/KDefragmentJob.h b/src/system/kernel/disk_device_manager/jobs/KDefragmentJob.h
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KDefragmentJob.h
rename to src/system/kernel/disk_device_manager/jobs/KDefragmentJob.h
diff --git a/src/system/core/disk_device_manager/jobs/KDeleteChildJob.cpp b/src/system/kernel/disk_device_manager/jobs/KDeleteChildJob.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KDeleteChildJob.cpp
rename to src/system/kernel/disk_device_manager/jobs/KDeleteChildJob.cpp
diff --git a/src/system/core/disk_device_manager/jobs/KDeleteChildJob.h b/src/system/kernel/disk_device_manager/jobs/KDeleteChildJob.h
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KDeleteChildJob.h
rename to src/system/kernel/disk_device_manager/jobs/KDeleteChildJob.h
diff --git a/src/system/core/disk_device_manager/jobs/KInitializeJob.cpp b/src/system/kernel/disk_device_manager/jobs/KInitializeJob.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KInitializeJob.cpp
rename to src/system/kernel/disk_device_manager/jobs/KInitializeJob.cpp
diff --git a/src/system/core/disk_device_manager/jobs/KInitializeJob.h b/src/system/kernel/disk_device_manager/jobs/KInitializeJob.h
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KInitializeJob.h
rename to src/system/kernel/disk_device_manager/jobs/KInitializeJob.h
diff --git a/src/system/core/disk_device_manager/jobs/KMoveJob.cpp b/src/system/kernel/disk_device_manager/jobs/KMoveJob.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KMoveJob.cpp
rename to src/system/kernel/disk_device_manager/jobs/KMoveJob.cpp
diff --git a/src/system/core/disk_device_manager/jobs/KMoveJob.h b/src/system/kernel/disk_device_manager/jobs/KMoveJob.h
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KMoveJob.h
rename to src/system/kernel/disk_device_manager/jobs/KMoveJob.h
diff --git a/src/system/core/disk_device_manager/jobs/KRepairJob.cpp b/src/system/kernel/disk_device_manager/jobs/KRepairJob.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KRepairJob.cpp
rename to src/system/kernel/disk_device_manager/jobs/KRepairJob.cpp
diff --git a/src/system/core/disk_device_manager/jobs/KRepairJob.h b/src/system/kernel/disk_device_manager/jobs/KRepairJob.h
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KRepairJob.h
rename to src/system/kernel/disk_device_manager/jobs/KRepairJob.h
diff --git a/src/system/core/disk_device_manager/jobs/KResizeJob.cpp b/src/system/kernel/disk_device_manager/jobs/KResizeJob.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KResizeJob.cpp
rename to src/system/kernel/disk_device_manager/jobs/KResizeJob.cpp
diff --git a/src/system/core/disk_device_manager/jobs/KResizeJob.h b/src/system/kernel/disk_device_manager/jobs/KResizeJob.h
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KResizeJob.h
rename to src/system/kernel/disk_device_manager/jobs/KResizeJob.h
diff --git a/src/system/core/disk_device_manager/jobs/KScanPartitionJob.cpp b/src/system/kernel/disk_device_manager/jobs/KScanPartitionJob.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KScanPartitionJob.cpp
rename to src/system/kernel/disk_device_manager/jobs/KScanPartitionJob.cpp
diff --git a/src/system/core/disk_device_manager/jobs/KScanPartitionJob.h b/src/system/kernel/disk_device_manager/jobs/KScanPartitionJob.h
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KScanPartitionJob.h
rename to src/system/kernel/disk_device_manager/jobs/KScanPartitionJob.h
diff --git a/src/system/core/disk_device_manager/jobs/KSetParametersJob.cpp b/src/system/kernel/disk_device_manager/jobs/KSetParametersJob.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KSetParametersJob.cpp
rename to src/system/kernel/disk_device_manager/jobs/KSetParametersJob.cpp
diff --git a/src/system/core/disk_device_manager/jobs/KSetParametersJob.h b/src/system/kernel/disk_device_manager/jobs/KSetParametersJob.h
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KSetParametersJob.h
rename to src/system/kernel/disk_device_manager/jobs/KSetParametersJob.h
diff --git a/src/system/core/disk_device_manager/jobs/KUninitializeJob.cpp b/src/system/kernel/disk_device_manager/jobs/KUninitializeJob.cpp
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KUninitializeJob.cpp
rename to src/system/kernel/disk_device_manager/jobs/KUninitializeJob.cpp
diff --git a/src/system/core/disk_device_manager/jobs/KUninitializeJob.h b/src/system/kernel/disk_device_manager/jobs/KUninitializeJob.h
similarity index 100%
rename from src/system/core/disk_device_manager/jobs/KUninitializeJob.h
rename to src/system/kernel/disk_device_manager/jobs/KUninitializeJob.h
diff --git a/src/system/core/elf.c b/src/system/kernel/elf.c
similarity index 100%
rename from src/system/core/elf.c
rename to src/system/kernel/elf.c
diff --git a/src/system/core/faults.c b/src/system/kernel/faults.c
similarity index 100%
rename from src/system/core/faults.c
rename to src/system/kernel/faults.c
diff --git a/src/system/core/fs/IOScheduler.cpp b/src/system/kernel/fs/IOScheduler.cpp
similarity index 100%
rename from src/system/core/fs/IOScheduler.cpp
rename to src/system/kernel/fs/IOScheduler.cpp
diff --git a/src/system/core/fs/IOScheduler.h b/src/system/kernel/fs/IOScheduler.h
similarity index 100%
rename from src/system/core/fs/IOScheduler.h
rename to src/system/kernel/fs/IOScheduler.h
diff --git a/src/system/core/fs/Jamfile b/src/system/kernel/fs/Jamfile
similarity index 100%
rename from src/system/core/fs/Jamfile
rename to src/system/kernel/fs/Jamfile
diff --git a/src/system/core/fs/KPath.cpp b/src/system/kernel/fs/KPath.cpp
similarity index 100%
rename from src/system/core/fs/KPath.cpp
rename to src/system/kernel/fs/KPath.cpp
diff --git a/src/system/core/fs/bootfs.c b/src/system/kernel/fs/bootfs.c
similarity index 100%
rename from src/system/core/fs/bootfs.c
rename to src/system/kernel/fs/bootfs.c
diff --git a/src/system/core/fs/devfs.cpp b/src/system/kernel/fs/devfs.cpp
similarity index 100%
rename from src/system/core/fs/devfs.cpp
rename to src/system/kernel/fs/devfs.cpp
diff --git a/src/system/core/fs/fd.c b/src/system/kernel/fs/fd.c
similarity index 100%
rename from src/system/core/fs/fd.c
rename to src/system/kernel/fs/fd.c
diff --git a/src/system/core/fs/message.c b/src/system/kernel/fs/message.c
similarity index 100%
rename from src/system/core/fs/message.c
rename to src/system/kernel/fs/message.c
diff --git a/src/system/core/fs/node_monitor.cpp b/src/system/kernel/fs/node_monitor.cpp
similarity index 100%
rename from src/system/core/fs/node_monitor.cpp
rename to src/system/kernel/fs/node_monitor.cpp
diff --git a/src/system/core/fs/pipefs.cpp b/src/system/kernel/fs/pipefs.cpp
similarity index 100%
rename from src/system/core/fs/pipefs.cpp
rename to src/system/kernel/fs/pipefs.cpp
diff --git a/src/system/core/fs/rootfs.c b/src/system/kernel/fs/rootfs.c
similarity index 100%
rename from src/system/core/fs/rootfs.c
rename to src/system/kernel/fs/rootfs.c
diff --git a/src/system/core/fs/vfs.cpp b/src/system/kernel/fs/vfs.cpp
similarity index 100%
rename from src/system/core/fs/vfs.cpp
rename to src/system/kernel/fs/vfs.cpp
diff --git a/src/system/core/fs/vfs_select.cpp b/src/system/kernel/fs/vfs_select.cpp
similarity index 100%
rename from src/system/core/fs/vfs_select.cpp
rename to src/system/kernel/fs/vfs_select.cpp
diff --git a/src/system/core/fs/vfs_select.h b/src/system/kernel/fs/vfs_select.h
similarity index 100%
rename from src/system/core/fs/vfs_select.h
rename to src/system/kernel/fs/vfs_select.h
diff --git a/src/system/core/heap.c b/src/system/kernel/heap.c
similarity index 100%
rename from src/system/core/heap.c
rename to src/system/kernel/heap.c
diff --git a/src/system/core/image.c b/src/system/kernel/image.c
similarity index 100%
rename from src/system/core/image.c
rename to src/system/kernel/image.c
diff --git a/src/system/core/int.c b/src/system/kernel/int.c
similarity index 100%
rename from src/system/core/int.c
rename to src/system/kernel/int.c
diff --git a/src/system/core/kernel_daemon.c b/src/system/kernel/kernel_daemon.c
similarity index 100%
rename from src/system/core/kernel_daemon.c
rename to src/system/kernel/kernel_daemon.c
diff --git a/src/system/core/linkhack.c b/src/system/kernel/linkhack.c
similarity index 100%
rename from src/system/core/linkhack.c
rename to src/system/kernel/linkhack.c
diff --git a/src/system/core/lock.c b/src/system/kernel/lock.c
similarity index 100%
rename from src/system/core/lock.c
rename to src/system/kernel/lock.c
diff --git a/src/system/core/main.c b/src/system/kernel/main.c
similarity index 100%
rename from src/system/core/main.c
rename to src/system/kernel/main.c
diff --git a/src/system/core/messaging/Jamfile b/src/system/kernel/messaging/Jamfile
similarity index 100%
rename from src/system/core/messaging/Jamfile
rename to src/system/kernel/messaging/Jamfile
diff --git a/src/system/core/messaging/KMessage.cpp b/src/system/kernel/messaging/KMessage.cpp
similarity index 100%
rename from src/system/core/messaging/KMessage.cpp
rename to src/system/kernel/messaging/KMessage.cpp
diff --git a/src/system/core/messaging/MessagingService.cpp b/src/system/kernel/messaging/MessagingService.cpp
similarity index 100%
rename from src/system/core/messaging/MessagingService.cpp
rename to src/system/kernel/messaging/MessagingService.cpp
diff --git a/src/system/core/messaging/MessagingService.h b/src/system/kernel/messaging/MessagingService.h
similarity index 100%
rename from src/system/core/messaging/MessagingService.h
rename to src/system/kernel/messaging/MessagingService.h
diff --git a/src/system/core/module.c b/src/system/kernel/module.c
similarity index 100%
rename from src/system/core/module.c
rename to src/system/kernel/module.c
diff --git a/src/system/core/port.c b/src/system/kernel/port.c
similarity index 100%
rename from src/system/core/port.c
rename to src/system/kernel/port.c
diff --git a/src/system/core/real_time_clock.c b/src/system/kernel/real_time_clock.c
similarity index 100%
rename from src/system/core/real_time_clock.c
rename to src/system/kernel/real_time_clock.c
diff --git a/src/system/core/scheduler.c b/src/system/kernel/scheduler.c
similarity index 100%
rename from src/system/core/scheduler.c
rename to src/system/kernel/scheduler.c
diff --git a/src/system/core/sem.c b/src/system/kernel/sem.c
similarity index 100%
rename from src/system/core/sem.c
rename to src/system/kernel/sem.c
diff --git a/src/system/core/shutdown.c b/src/system/kernel/shutdown.c
similarity index 100%
rename from src/system/core/shutdown.c
rename to src/system/kernel/shutdown.c
diff --git a/src/system/core/signal.c b/src/system/kernel/signal.c
similarity index 100%
rename from src/system/core/signal.c
rename to src/system/kernel/signal.c
diff --git a/src/system/core/smp.c b/src/system/kernel/smp.c
similarity index 100%
rename from src/system/core/smp.c
rename to src/system/kernel/smp.c
diff --git a/src/system/core/syscalls.c b/src/system/kernel/syscalls.c
similarity index 100%
rename from src/system/core/syscalls.c
rename to src/system/kernel/syscalls.c
diff --git a/src/system/core/sysctl.c b/src/system/kernel/sysctl.c
similarity index 100%
rename from src/system/core/sysctl.c
rename to src/system/kernel/sysctl.c
diff --git a/src/system/core/system_info.c b/src/system/kernel/system_info.c
similarity index 100%
rename from src/system/core/system_info.c
rename to src/system/kernel/system_info.c
diff --git a/src/system/core/team.c b/src/system/kernel/team.c
similarity index 100%
rename from src/system/core/team.c
rename to src/system/kernel/team.c
diff --git a/src/system/core/thread.c b/src/system/kernel/thread.c
similarity index 100%
rename from src/system/core/thread.c
rename to src/system/kernel/thread.c
diff --git a/src/system/core/timer.c b/src/system/kernel/timer.c
similarity index 100%
rename from src/system/core/timer.c
rename to src/system/kernel/timer.c
diff --git a/src/system/core/util/Jamfile b/src/system/kernel/util/Jamfile
similarity index 100%
rename from src/system/core/util/Jamfile
rename to src/system/kernel/util/Jamfile
diff --git a/src/system/core/util/cbuf.c b/src/system/kernel/util/cbuf.c
similarity index 100%
rename from src/system/core/util/cbuf.c
rename to src/system/kernel/util/cbuf.c
diff --git a/src/system/core/util/kernel_cpp.cpp b/src/system/kernel/util/kernel_cpp.cpp
similarity index 100%
rename from src/system/core/util/kernel_cpp.cpp
rename to src/system/kernel/util/kernel_cpp.cpp
diff --git a/src/system/core/util/khash.c b/src/system/kernel/util/khash.c
similarity index 100%
rename from src/system/core/util/khash.c
rename to src/system/kernel/util/khash.c
diff --git a/src/system/core/util/list.c b/src/system/kernel/util/list.c
similarity index 100%
rename from src/system/core/util/list.c
rename to src/system/kernel/util/list.c
diff --git a/src/system/core/util/misc.c b/src/system/kernel/util/misc.c
similarity index 100%
rename from src/system/core/util/misc.c
rename to src/system/kernel/util/misc.c
diff --git a/src/system/core/util/pools.c b/src/system/kernel/util/pools.c
similarity index 100%
rename from src/system/core/util/pools.c
rename to src/system/kernel/util/pools.c
diff --git a/src/system/core/util/queue.c b/src/system/kernel/util/queue.c
similarity index 100%
rename from src/system/core/util/queue.c
rename to src/system/kernel/util/queue.c
diff --git a/src/system/core/util/ring_buffer.cpp b/src/system/kernel/util/ring_buffer.cpp
similarity index 100%
rename from src/system/core/util/ring_buffer.cpp
rename to src/system/kernel/util/ring_buffer.cpp
diff --git a/src/system/core/vm/Jamfile b/src/system/kernel/vm/Jamfile
similarity index 100%
rename from src/system/core/vm/Jamfile
rename to src/system/kernel/vm/Jamfile
diff --git a/src/system/core/vm/vm.c b/src/system/kernel/vm/vm.c
similarity index 100%
rename from src/system/core/vm/vm.c
rename to src/system/kernel/vm/vm.c
diff --git a/src/system/core/vm/vm_address_space.c b/src/system/kernel/vm/vm_address_space.c
similarity index 100%
rename from src/system/core/vm/vm_address_space.c
rename to src/system/kernel/vm/vm_address_space.c
diff --git a/src/system/core/vm/vm_cache.c b/src/system/kernel/vm/vm_cache.c
similarity index 100%
rename from src/system/core/vm/vm_cache.c
rename to src/system/kernel/vm/vm_cache.c
diff --git a/src/system/core/vm/vm_daemons.c b/src/system/kernel/vm/vm_daemons.c
similarity index 100%
rename from src/system/core/vm/vm_daemons.c
rename to src/system/kernel/vm/vm_daemons.c
diff --git a/src/system/core/vm/vm_page.c b/src/system/kernel/vm/vm_page.c
similarity index 100%
rename from src/system/core/vm/vm_page.c
rename to src/system/kernel/vm/vm_page.c
diff --git a/src/system/core/vm/vm_store_anonymous_noswap.c b/src/system/kernel/vm/vm_store_anonymous_noswap.c
similarity index 100%
rename from src/system/core/vm/vm_store_anonymous_noswap.c
rename to src/system/kernel/vm/vm_store_anonymous_noswap.c
diff --git a/src/system/core/vm/vm_store_device.c b/src/system/kernel/vm/vm_store_device.c
similarity index 100%
rename from src/system/core/vm/vm_store_device.c
rename to src/system/kernel/vm/vm_store_device.c
diff --git a/src/system/core/vm/vm_store_null.c b/src/system/kernel/vm/vm_store_null.c
similarity index 100%
rename from src/system/core/vm/vm_store_null.c
rename to src/system/kernel/vm/vm_store_null.c
diff --git a/src/system/core/vm/vm_tests.c b/src/system/kernel/vm/vm_tests.c
similarity index 100%
rename from src/system/core/vm/vm_tests.c
rename to src/system/kernel/vm/vm_tests.c