More General House Keeping

Consolidating all files so there is now only one version of the website.