Moved classes into packages