Organized classes into packages