moving classes into packages