feat(reorg): major reorganization
Merge pull request #75 from robszumski/master

feat(reorg): major reorganization