Config, folder restructure
Merge branch 'gh-pages'