more re-arrangement to suit gh-pages