reorganize
Merge pull request #11 from dustismo/hotfix/reorg

Reorganize code within package