Flatten dir structure to make it easier to publish
Merge branch 'refs/heads/master' into gh-pages