Refactor, get rid of the tool subprojects