Moves classes into packages
Adds description
Cleanup