Rename and restructure to reflect original kernel code.