Move classes into appropriate packages
Rename some classes for consistency