Reorganized classes.
Merge pull request #1 from phowland1/dev

Reorganized classes.