Move classes into packages