initial reorganization
Merge pull request #1 from cshubert/master

Reorg