Organised classes into packages