separate classes into packages