Merge basic folder setup into gh-pages