shortened some names
Merge pull request #1 from unixpickle/tree-restructure-2

shortened some names