Organized classes into packages #3