Organized project into packages