Huge commit of renames, configuration updates, etc.  Still a lot to do in the checklist, but making progress and I want another set of eyes on this.