Organized the classes into packages