Barebones solution structure
Merge branch 'develop'