Refactor source directories so that I can add tests later.