Updated directory structure

Updated directory structure to work with gh-pages
Merge branch 'master' into gh-pages