cleanup and reorganization
Merge branch 'master' of github.com:BurntSushi/ty