Updated the paths
Merge branch 'gh-pages'
Reworked the maker router.
Merge branch 'master' into gh-pages