More file re-ordering.

even more housekeeping
Merging gh-pages and master branch

housekeeping