Move classes to packages, rename some classes