Reorder classes into packages for better readability