Some project structure refactoring
Merge branch 'develop' into prototype/front-end-cleanup
Merge pull request #36 from stevenhillcox/prototype/front-end-cleanup

Fix/front end cleanup