Refactoring Kernel namespace