Move classes into new packages
Cleanup class tree