Restructure code to be a copy of the kernel code again.