Move kernel package up a folder (remove Generic)