Re-ordering stuff a bit to prepare for gh-pages