(gh-pages-audit) WIP first pass audit/reorg