Kernel refactor [preview]

For @ajs6f comments.