Rearrange projects. Create base unit test class for sorting