Updated structure
Updated setup instructions based on new configuration
Merge branch 'gh-pages-v3.1' into gh-pages