a little reorganization (maybe more later)
Merge pull request #11 from simtr/develop

Reorganization