reorganization/clean up
Merge pull request #85 from jpecht/master

reorganization/clean up