Cosmetic changes, moving files around, etc.
Merge branch 'master' of https://github.com/erecruit/TsT