Moved other classes into packages