Reorg of Packages and Class Names
Merge pull request #46 from benjchristensen/reorg

Reorg of Packages and Class Names