Fix config
Add missing folders
Updated configs
Merge branch 'master' into gh-pages