* Move around the kernel - it's not a package
* Clear up the mess in the kernel makefile