Move some folders around for testing
Merge branch 'develop'