diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26a2a7f7b..74b9b953d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -272,7 +272,7 @@ target_compile_definitions(rx PRIVATE
 if (WITH_PS4)
     find_package(nlohmann_json CONFIG)
     add_subdirectory(tools)
-    add_subdirectory(orbis-kernel)
+    add_subdirectory(kernel/orbis)
 endif()
 
 add_subdirectory(rpcsx)
diff --git a/orbis-kernel/.gitignore b/kernel/orbis/.gitignore
similarity index 100%
rename from orbis-kernel/.gitignore
rename to kernel/orbis/.gitignore
diff --git a/orbis-kernel/CMakeLists.txt b/kernel/orbis/CMakeLists.txt
similarity index 100%
rename from orbis-kernel/CMakeLists.txt
rename to kernel/orbis/CMakeLists.txt
diff --git a/orbis-kernel/include/orbis/AppInfo.hpp b/kernel/orbis/include/orbis/AppInfo.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/AppInfo.hpp
rename to kernel/orbis/include/orbis/AppInfo.hpp
diff --git a/orbis-kernel/include/orbis/AuthInfo.hpp b/kernel/orbis/include/orbis/AuthInfo.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/AuthInfo.hpp
rename to kernel/orbis/include/orbis/AuthInfo.hpp
diff --git a/orbis-kernel/include/orbis/Budget.hpp b/kernel/orbis/include/orbis/Budget.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/Budget.hpp
rename to kernel/orbis/include/orbis/Budget.hpp
diff --git a/orbis-kernel/include/orbis/KernelAllocator.hpp b/kernel/orbis/include/orbis/KernelAllocator.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/KernelAllocator.hpp
rename to kernel/orbis/include/orbis/KernelAllocator.hpp
diff --git a/orbis-kernel/include/orbis/KernelContext.hpp b/kernel/orbis/include/orbis/KernelContext.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/KernelContext.hpp
rename to kernel/orbis/include/orbis/KernelContext.hpp
diff --git a/orbis-kernel/include/orbis/SocketAddress.hpp b/kernel/orbis/include/orbis/SocketAddress.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/SocketAddress.hpp
rename to kernel/orbis/include/orbis/SocketAddress.hpp
diff --git a/orbis-kernel/include/orbis/error.hpp b/kernel/orbis/include/orbis/error.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/error.hpp
rename to kernel/orbis/include/orbis/error.hpp
diff --git a/orbis-kernel/include/orbis/error/ErrorCode.hpp b/kernel/orbis/include/orbis/error/ErrorCode.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/error/ErrorCode.hpp
rename to kernel/orbis/include/orbis/error/ErrorCode.hpp
diff --git a/orbis-kernel/include/orbis/error/SysResult.hpp b/kernel/orbis/include/orbis/error/SysResult.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/error/SysResult.hpp
rename to kernel/orbis/include/orbis/error/SysResult.hpp
diff --git a/orbis-kernel/include/orbis/event.hpp b/kernel/orbis/include/orbis/event.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/event.hpp
rename to kernel/orbis/include/orbis/event.hpp
diff --git a/orbis-kernel/include/orbis/evf.hpp b/kernel/orbis/include/orbis/evf.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/evf.hpp
rename to kernel/orbis/include/orbis/evf.hpp
diff --git a/orbis-kernel/include/orbis/file.hpp b/kernel/orbis/include/orbis/file.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/file.hpp
rename to kernel/orbis/include/orbis/file.hpp
diff --git a/orbis-kernel/include/orbis/ipmi.hpp b/kernel/orbis/include/orbis/ipmi.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/ipmi.hpp
rename to kernel/orbis/include/orbis/ipmi.hpp
diff --git a/orbis-kernel/include/orbis/module.hpp b/kernel/orbis/include/orbis/module.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/module.hpp
rename to kernel/orbis/include/orbis/module.hpp
diff --git a/orbis-kernel/include/orbis/module/Module.hpp b/kernel/orbis/include/orbis/module/Module.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/module/Module.hpp
rename to kernel/orbis/include/orbis/module/Module.hpp
diff --git a/orbis-kernel/include/orbis/module/ModuleHandle.hpp b/kernel/orbis/include/orbis/module/ModuleHandle.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/module/ModuleHandle.hpp
rename to kernel/orbis/include/orbis/module/ModuleHandle.hpp
diff --git a/orbis-kernel/include/orbis/module/ModuleInfo.hpp b/kernel/orbis/include/orbis/module/ModuleInfo.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/module/ModuleInfo.hpp
rename to kernel/orbis/include/orbis/module/ModuleInfo.hpp
diff --git a/orbis-kernel/include/orbis/module/ModuleInfoEx.hpp b/kernel/orbis/include/orbis/module/ModuleInfoEx.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/module/ModuleInfoEx.hpp
rename to kernel/orbis/include/orbis/module/ModuleInfoEx.hpp
diff --git a/orbis-kernel/include/orbis/module/ModuleSegment.hpp b/kernel/orbis/include/orbis/module/ModuleSegment.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/module/ModuleSegment.hpp
rename to kernel/orbis/include/orbis/module/ModuleSegment.hpp
diff --git a/orbis-kernel/include/orbis/note.hpp b/kernel/orbis/include/orbis/note.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/note.hpp
rename to kernel/orbis/include/orbis/note.hpp
diff --git a/orbis-kernel/include/orbis/osem.hpp b/kernel/orbis/include/orbis/osem.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/osem.hpp
rename to kernel/orbis/include/orbis/osem.hpp
diff --git a/orbis-kernel/include/orbis/pipe.hpp b/kernel/orbis/include/orbis/pipe.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/pipe.hpp
rename to kernel/orbis/include/orbis/pipe.hpp
diff --git a/orbis-kernel/include/orbis/stat.hpp b/kernel/orbis/include/orbis/stat.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/stat.hpp
rename to kernel/orbis/include/orbis/stat.hpp
diff --git a/orbis-kernel/include/orbis/sys/sys_sce.hpp b/kernel/orbis/include/orbis/sys/sys_sce.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/sys/sys_sce.hpp
rename to kernel/orbis/include/orbis/sys/sys_sce.hpp
diff --git a/orbis-kernel/include/orbis/sys/syscall.hpp b/kernel/orbis/include/orbis/sys/syscall.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/sys/syscall.hpp
rename to kernel/orbis/include/orbis/sys/syscall.hpp
diff --git a/orbis-kernel/include/orbis/sys/sysentry.hpp b/kernel/orbis/include/orbis/sys/sysentry.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/sys/sysentry.hpp
rename to kernel/orbis/include/orbis/sys/sysentry.hpp
diff --git a/orbis-kernel/include/orbis/sys/sysproto.hpp b/kernel/orbis/include/orbis/sys/sysproto.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/sys/sysproto.hpp
rename to kernel/orbis/include/orbis/sys/sysproto.hpp
diff --git a/orbis-kernel/include/orbis/thread.hpp b/kernel/orbis/include/orbis/thread.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/thread.hpp
rename to kernel/orbis/include/orbis/thread.hpp
diff --git a/orbis-kernel/include/orbis/thread/Process.hpp b/kernel/orbis/include/orbis/thread/Process.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/thread/Process.hpp
rename to kernel/orbis/include/orbis/thread/Process.hpp
diff --git a/orbis-kernel/include/orbis/thread/ProcessOps.hpp b/kernel/orbis/include/orbis/thread/ProcessOps.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/thread/ProcessOps.hpp
rename to kernel/orbis/include/orbis/thread/ProcessOps.hpp
diff --git a/orbis-kernel/include/orbis/thread/ProcessState.hpp b/kernel/orbis/include/orbis/thread/ProcessState.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/thread/ProcessState.hpp
rename to kernel/orbis/include/orbis/thread/ProcessState.hpp
diff --git a/orbis-kernel/include/orbis/thread/RegisterId.hpp b/kernel/orbis/include/orbis/thread/RegisterId.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/thread/RegisterId.hpp
rename to kernel/orbis/include/orbis/thread/RegisterId.hpp
diff --git a/orbis-kernel/include/orbis/thread/Thread.hpp b/kernel/orbis/include/orbis/thread/Thread.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/thread/Thread.hpp
rename to kernel/orbis/include/orbis/thread/Thread.hpp
diff --git a/orbis-kernel/include/orbis/thread/ThreadState.hpp b/kernel/orbis/include/orbis/thread/ThreadState.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/thread/ThreadState.hpp
rename to kernel/orbis/include/orbis/thread/ThreadState.hpp
diff --git a/orbis-kernel/include/orbis/thread/cpuset.hpp b/kernel/orbis/include/orbis/thread/cpuset.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/thread/cpuset.hpp
rename to kernel/orbis/include/orbis/thread/cpuset.hpp
diff --git a/orbis-kernel/include/orbis/thread/sysent.hpp b/kernel/orbis/include/orbis/thread/sysent.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/thread/sysent.hpp
rename to kernel/orbis/include/orbis/thread/sysent.hpp
diff --git a/orbis-kernel/include/orbis/thread/types.hpp b/kernel/orbis/include/orbis/thread/types.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/thread/types.hpp
rename to kernel/orbis/include/orbis/thread/types.hpp
diff --git a/orbis-kernel/include/orbis/time.hpp b/kernel/orbis/include/orbis/time.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/time.hpp
rename to kernel/orbis/include/orbis/time.hpp
diff --git a/orbis-kernel/include/orbis/ucontext.hpp b/kernel/orbis/include/orbis/ucontext.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/ucontext.hpp
rename to kernel/orbis/include/orbis/ucontext.hpp
diff --git a/orbis-kernel/include/orbis/uio.hpp b/kernel/orbis/include/orbis/uio.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/uio.hpp
rename to kernel/orbis/include/orbis/uio.hpp
diff --git a/orbis-kernel/include/orbis/umtx.hpp b/kernel/orbis/include/orbis/umtx.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/umtx.hpp
rename to kernel/orbis/include/orbis/umtx.hpp
diff --git a/orbis-kernel/include/orbis/utils/AtomicOp.hpp b/kernel/orbis/include/orbis/utils/AtomicOp.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/utils/AtomicOp.hpp
rename to kernel/orbis/include/orbis/utils/AtomicOp.hpp
diff --git a/orbis-kernel/include/orbis/utils/BitSet.hpp b/kernel/orbis/include/orbis/utils/BitSet.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/utils/BitSet.hpp
rename to kernel/orbis/include/orbis/utils/BitSet.hpp
diff --git a/orbis-kernel/include/orbis/utils/IdMap.hpp b/kernel/orbis/include/orbis/utils/IdMap.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/utils/IdMap.hpp
rename to kernel/orbis/include/orbis/utils/IdMap.hpp
diff --git a/orbis-kernel/include/orbis/utils/LinkedNode.hpp b/kernel/orbis/include/orbis/utils/LinkedNode.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/utils/LinkedNode.hpp
rename to kernel/orbis/include/orbis/utils/LinkedNode.hpp
diff --git a/orbis-kernel/include/orbis/utils/Logs.hpp b/kernel/orbis/include/orbis/utils/Logs.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/utils/Logs.hpp
rename to kernel/orbis/include/orbis/utils/Logs.hpp
diff --git a/orbis-kernel/include/orbis/utils/Rc.hpp b/kernel/orbis/include/orbis/utils/Rc.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/utils/Rc.hpp
rename to kernel/orbis/include/orbis/utils/Rc.hpp
diff --git a/orbis-kernel/include/orbis/utils/SharedAtomic.hpp b/kernel/orbis/include/orbis/utils/SharedAtomic.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/utils/SharedAtomic.hpp
rename to kernel/orbis/include/orbis/utils/SharedAtomic.hpp
diff --git a/orbis-kernel/include/orbis/utils/SharedCV.hpp b/kernel/orbis/include/orbis/utils/SharedCV.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/utils/SharedCV.hpp
rename to kernel/orbis/include/orbis/utils/SharedCV.hpp
diff --git a/orbis-kernel/include/orbis/utils/SharedMutex.hpp b/kernel/orbis/include/orbis/utils/SharedMutex.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/utils/SharedMutex.hpp
rename to kernel/orbis/include/orbis/utils/SharedMutex.hpp
diff --git a/orbis-kernel/include/orbis/vm.hpp b/kernel/orbis/include/orbis/vm.hpp
similarity index 100%
rename from orbis-kernel/include/orbis/vm.hpp
rename to kernel/orbis/include/orbis/vm.hpp
diff --git a/orbis-kernel/src/KernelContext.cpp b/kernel/orbis/src/KernelContext.cpp
similarity index 100%
rename from orbis-kernel/src/KernelContext.cpp
rename to kernel/orbis/src/KernelContext.cpp
diff --git a/orbis-kernel/src/event.cpp b/kernel/orbis/src/event.cpp
similarity index 100%
rename from orbis-kernel/src/event.cpp
rename to kernel/orbis/src/event.cpp
diff --git a/orbis-kernel/src/evf.cpp b/kernel/orbis/src/evf.cpp
similarity index 100%
rename from orbis-kernel/src/evf.cpp
rename to kernel/orbis/src/evf.cpp
diff --git a/orbis-kernel/src/ipmi.cpp b/kernel/orbis/src/ipmi.cpp
similarity index 100%
rename from orbis-kernel/src/ipmi.cpp
rename to kernel/orbis/src/ipmi.cpp
diff --git a/orbis-kernel/src/module.cpp b/kernel/orbis/src/module.cpp
similarity index 100%
rename from orbis-kernel/src/module.cpp
rename to kernel/orbis/src/module.cpp
diff --git a/orbis-kernel/src/pipe.cpp b/kernel/orbis/src/pipe.cpp
similarity index 100%
rename from orbis-kernel/src/pipe.cpp
rename to kernel/orbis/src/pipe.cpp
diff --git a/orbis-kernel/src/sys/sys_acct.cpp b/kernel/orbis/src/sys/sys_acct.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_acct.cpp
rename to kernel/orbis/src/sys/sys_acct.cpp
diff --git a/orbis-kernel/src/sys/sys_audit.cpp b/kernel/orbis/src/sys/sys_audit.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_audit.cpp
rename to kernel/orbis/src/sys/sys_audit.cpp
diff --git a/orbis-kernel/src/sys/sys_capability.cpp b/kernel/orbis/src/sys/sys_capability.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_capability.cpp
rename to kernel/orbis/src/sys/sys_capability.cpp
diff --git a/orbis-kernel/src/sys/sys_context.cpp b/kernel/orbis/src/sys/sys_context.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_context.cpp
rename to kernel/orbis/src/sys/sys_context.cpp
diff --git a/orbis-kernel/src/sys/sys_cpuset.cpp b/kernel/orbis/src/sys/sys_cpuset.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_cpuset.cpp
rename to kernel/orbis/src/sys/sys_cpuset.cpp
diff --git a/orbis-kernel/src/sys/sys_descrip.cpp b/kernel/orbis/src/sys/sys_descrip.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_descrip.cpp
rename to kernel/orbis/src/sys/sys_descrip.cpp
diff --git a/orbis-kernel/src/sys/sys_environment.cpp b/kernel/orbis/src/sys/sys_environment.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_environment.cpp
rename to kernel/orbis/src/sys/sys_environment.cpp
diff --git a/orbis-kernel/src/sys/sys_event.cpp b/kernel/orbis/src/sys/sys_event.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_event.cpp
rename to kernel/orbis/src/sys/sys_event.cpp
diff --git a/orbis-kernel/src/sys/sys_exec.cpp b/kernel/orbis/src/sys/sys_exec.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_exec.cpp
rename to kernel/orbis/src/sys/sys_exec.cpp
diff --git a/orbis-kernel/src/sys/sys_exit.cpp b/kernel/orbis/src/sys/sys_exit.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_exit.cpp
rename to kernel/orbis/src/sys/sys_exit.cpp
diff --git a/orbis-kernel/src/sys/sys_fork.cpp b/kernel/orbis/src/sys/sys_fork.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_fork.cpp
rename to kernel/orbis/src/sys/sys_fork.cpp
diff --git a/orbis-kernel/src/sys/sys_generic.cpp b/kernel/orbis/src/sys/sys_generic.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_generic.cpp
rename to kernel/orbis/src/sys/sys_generic.cpp
diff --git a/orbis-kernel/src/sys/sys_jail.cpp b/kernel/orbis/src/sys/sys_jail.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_jail.cpp
rename to kernel/orbis/src/sys/sys_jail.cpp
diff --git a/orbis-kernel/src/sys/sys_ktrace.cpp b/kernel/orbis/src/sys/sys_ktrace.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_ktrace.cpp
rename to kernel/orbis/src/sys/sys_ktrace.cpp
diff --git a/orbis-kernel/src/sys/sys_linker.cpp b/kernel/orbis/src/sys/sys_linker.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_linker.cpp
rename to kernel/orbis/src/sys/sys_linker.cpp
diff --git a/orbis-kernel/src/sys/sys_loginclass.cpp b/kernel/orbis/src/sys/sys_loginclass.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_loginclass.cpp
rename to kernel/orbis/src/sys/sys_loginclass.cpp
diff --git a/orbis-kernel/src/sys/sys_mac.cpp b/kernel/orbis/src/sys/sys_mac.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_mac.cpp
rename to kernel/orbis/src/sys/sys_mac.cpp
diff --git a/orbis-kernel/src/sys/sys_module.cpp b/kernel/orbis/src/sys/sys_module.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_module.cpp
rename to kernel/orbis/src/sys/sys_module.cpp
diff --git a/orbis-kernel/src/sys/sys_msg.cpp b/kernel/orbis/src/sys/sys_msg.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_msg.cpp
rename to kernel/orbis/src/sys/sys_msg.cpp
diff --git a/orbis-kernel/src/sys/sys_ntptime.cpp b/kernel/orbis/src/sys/sys_ntptime.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_ntptime.cpp
rename to kernel/orbis/src/sys/sys_ntptime.cpp
diff --git a/orbis-kernel/src/sys/sys_p1003_1b.cpp b/kernel/orbis/src/sys/sys_p1003_1b.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_p1003_1b.cpp
rename to kernel/orbis/src/sys/sys_p1003_1b.cpp
diff --git a/orbis-kernel/src/sys/sys_pipe.cpp b/kernel/orbis/src/sys/sys_pipe.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_pipe.cpp
rename to kernel/orbis/src/sys/sys_pipe.cpp
diff --git a/orbis-kernel/src/sys/sys_procdesc.cpp b/kernel/orbis/src/sys/sys_procdesc.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_procdesc.cpp
rename to kernel/orbis/src/sys/sys_procdesc.cpp
diff --git a/orbis-kernel/src/sys/sys_process.cpp b/kernel/orbis/src/sys/sys_process.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_process.cpp
rename to kernel/orbis/src/sys/sys_process.cpp
diff --git a/orbis-kernel/src/sys/sys_prot.cpp b/kernel/orbis/src/sys/sys_prot.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_prot.cpp
rename to kernel/orbis/src/sys/sys_prot.cpp
diff --git a/orbis-kernel/src/sys/sys_pty_pts.cpp b/kernel/orbis/src/sys/sys_pty_pts.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_pty_pts.cpp
rename to kernel/orbis/src/sys/sys_pty_pts.cpp
diff --git a/orbis-kernel/src/sys/sys_rctl.cpp b/kernel/orbis/src/sys/sys_rctl.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_rctl.cpp
rename to kernel/orbis/src/sys/sys_rctl.cpp
diff --git a/orbis-kernel/src/sys/sys_resource.cpp b/kernel/orbis/src/sys/sys_resource.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_resource.cpp
rename to kernel/orbis/src/sys/sys_resource.cpp
diff --git a/orbis-kernel/src/sys/sys_route.cpp b/kernel/orbis/src/sys/sys_route.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_route.cpp
rename to kernel/orbis/src/sys/sys_route.cpp
diff --git a/orbis-kernel/src/sys/sys_sce.cpp b/kernel/orbis/src/sys/sys_sce.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_sce.cpp
rename to kernel/orbis/src/sys/sys_sce.cpp
diff --git a/orbis-kernel/src/sys/sys_sem.cpp b/kernel/orbis/src/sys/sys_sem.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_sem.cpp
rename to kernel/orbis/src/sys/sys_sem.cpp
diff --git a/orbis-kernel/src/sys/sys_shm.cpp b/kernel/orbis/src/sys/sys_shm.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_shm.cpp
rename to kernel/orbis/src/sys/sys_shm.cpp
diff --git a/orbis-kernel/src/sys/sys_shutdown.cpp b/kernel/orbis/src/sys/sys_shutdown.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_shutdown.cpp
rename to kernel/orbis/src/sys/sys_shutdown.cpp
diff --git a/orbis-kernel/src/sys/sys_sig.cpp b/kernel/orbis/src/sys/sys_sig.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_sig.cpp
rename to kernel/orbis/src/sys/sys_sig.cpp
diff --git a/orbis-kernel/src/sys/sys_subr_prof.cpp b/kernel/orbis/src/sys/sys_subr_prof.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_subr_prof.cpp
rename to kernel/orbis/src/sys/sys_subr_prof.cpp
diff --git a/orbis-kernel/src/sys/sys_swap_pager.cpp b/kernel/orbis/src/sys/sys_swap_pager.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_swap_pager.cpp
rename to kernel/orbis/src/sys/sys_swap_pager.cpp
diff --git a/orbis-kernel/src/sys/sys_synch.cpp b/kernel/orbis/src/sys/sys_synch.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_synch.cpp
rename to kernel/orbis/src/sys/sys_synch.cpp
diff --git a/orbis-kernel/src/sys/sys_sysctl.cpp b/kernel/orbis/src/sys/sys_sysctl.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_sysctl.cpp
rename to kernel/orbis/src/sys/sys_sysctl.cpp
diff --git a/orbis-kernel/src/sys/sys_thr.cpp b/kernel/orbis/src/sys/sys_thr.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_thr.cpp
rename to kernel/orbis/src/sys/sys_thr.cpp
diff --git a/orbis-kernel/src/sys/sys_time.cpp b/kernel/orbis/src/sys/sys_time.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_time.cpp
rename to kernel/orbis/src/sys/sys_time.cpp
diff --git a/orbis-kernel/src/sys/sys_uipc.cpp b/kernel/orbis/src/sys/sys_uipc.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_uipc.cpp
rename to kernel/orbis/src/sys/sys_uipc.cpp
diff --git a/orbis-kernel/src/sys/sys_uipc_mqueue.cpp b/kernel/orbis/src/sys/sys_uipc_mqueue.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_uipc_mqueue.cpp
rename to kernel/orbis/src/sys/sys_uipc_mqueue.cpp
diff --git a/orbis-kernel/src/sys/sys_uipc_sem.cpp b/kernel/orbis/src/sys/sys_uipc_sem.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_uipc_sem.cpp
rename to kernel/orbis/src/sys/sys_uipc_sem.cpp
diff --git a/orbis-kernel/src/sys/sys_uipc_shm.cpp b/kernel/orbis/src/sys/sys_uipc_shm.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_uipc_shm.cpp
rename to kernel/orbis/src/sys/sys_uipc_shm.cpp
diff --git a/orbis-kernel/src/sys/sys_umtx.cpp b/kernel/orbis/src/sys/sys_umtx.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_umtx.cpp
rename to kernel/orbis/src/sys/sys_umtx.cpp
diff --git a/orbis-kernel/src/sys/sys_uuid.cpp b/kernel/orbis/src/sys/sys_uuid.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_uuid.cpp
rename to kernel/orbis/src/sys/sys_uuid.cpp
diff --git a/orbis-kernel/src/sys/sys_vfs.cpp b/kernel/orbis/src/sys/sys_vfs.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_vfs.cpp
rename to kernel/orbis/src/sys/sys_vfs.cpp
diff --git a/orbis-kernel/src/sys/sys_vfs_acl.cpp b/kernel/orbis/src/sys/sys_vfs_acl.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_vfs_acl.cpp
rename to kernel/orbis/src/sys/sys_vfs_acl.cpp
diff --git a/orbis-kernel/src/sys/sys_vfs_aio.cpp b/kernel/orbis/src/sys/sys_vfs_aio.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_vfs_aio.cpp
rename to kernel/orbis/src/sys/sys_vfs_aio.cpp
diff --git a/orbis-kernel/src/sys/sys_vfs_cache.cpp b/kernel/orbis/src/sys/sys_vfs_cache.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_vfs_cache.cpp
rename to kernel/orbis/src/sys/sys_vfs_cache.cpp
diff --git a/orbis-kernel/src/sys/sys_vfs_extattr.cpp b/kernel/orbis/src/sys/sys_vfs_extattr.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_vfs_extattr.cpp
rename to kernel/orbis/src/sys/sys_vfs_extattr.cpp
diff --git a/orbis-kernel/src/sys/sys_vfs_mount.cpp b/kernel/orbis/src/sys/sys_vfs_mount.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_vfs_mount.cpp
rename to kernel/orbis/src/sys/sys_vfs_mount.cpp
diff --git a/orbis-kernel/src/sys/sys_vm_mmap.cpp b/kernel/orbis/src/sys/sys_vm_mmap.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_vm_mmap.cpp
rename to kernel/orbis/src/sys/sys_vm_mmap.cpp
diff --git a/orbis-kernel/src/sys/sys_vm_unix.cpp b/kernel/orbis/src/sys/sys_vm_unix.cpp
similarity index 100%
rename from orbis-kernel/src/sys/sys_vm_unix.cpp
rename to kernel/orbis/src/sys/sys_vm_unix.cpp
diff --git a/orbis-kernel/src/sysvec.cpp b/kernel/orbis/src/sysvec.cpp
similarity index 100%
rename from orbis-kernel/src/sysvec.cpp
rename to kernel/orbis/src/sysvec.cpp
diff --git a/orbis-kernel/src/umtx.cpp b/kernel/orbis/src/umtx.cpp
similarity index 100%
rename from orbis-kernel/src/umtx.cpp
rename to kernel/orbis/src/umtx.cpp
diff --git a/orbis-kernel/src/utils/Logs.cpp b/kernel/orbis/src/utils/Logs.cpp
similarity index 100%
rename from orbis-kernel/src/utils/Logs.cpp
rename to kernel/orbis/src/utils/Logs.cpp
diff --git a/orbis-kernel/src/utils/SharedAtomic.cpp b/kernel/orbis/src/utils/SharedAtomic.cpp
similarity index 100%
rename from orbis-kernel/src/utils/SharedAtomic.cpp
rename to kernel/orbis/src/utils/SharedAtomic.cpp
diff --git a/orbis-kernel/src/utils/SharedCV.cpp b/kernel/orbis/src/utils/SharedCV.cpp
similarity index 100%
rename from orbis-kernel/src/utils/SharedCV.cpp
rename to kernel/orbis/src/utils/SharedCV.cpp
diff --git a/orbis-kernel/src/utils/SharedMutex.cpp b/kernel/orbis/src/utils/SharedMutex.cpp
similarity index 100%
rename from orbis-kernel/src/utils/SharedMutex.cpp
rename to kernel/orbis/src/utils/SharedMutex.cpp