Minor changes to file structure
Merge branch 'gh-pages'