Refactor classes into packages
Refactor reorganize code