Update classes into packages