better file naming
Merge branch 'gh-pages'
restructure