Modified gradle build, moved source files around
Merge branch 'master' of https://github.com/asweingarten/TSK