Sorted the project into packages