re arange files
Merge remote branch 'origin/gh-pages' into gh-pages