Modularized kernel
Old kernel file removed