bit of explanation of directory structure
Merge branch 'develop'