reorganize project for TDD purposes