Split classes into packages