cleanup and restructure dirs

cleanup and restructure dirs
Merge pull request #6 from hammerlab/restructure

Merging in to setup proper structure for new changes