Separated classes into packages