Organise back into packages as per convention