Project re-shuffle
Merge pull request #131 from matthewste/master

Project re-shuffle