Update project structure to reflect the unit test framework first then the approach.