Change directory structure
Change git submodule url from git@ to git://
Merge branch 'master' into gh-pages