Major Site Reorganization

This branch has been around awhile, and it's finally time to merge this in.

Thanks to @johnwunder and @slsnow for all the help, and thanks to @bworrell @rpiazza and @bschmoker for reviewing!