Order classes into packages
Deprecated classes
Implement some ideas for refactor