Repo restructure
Merge pull request #130 from matthewste/master

Repo restructure