"final" (for now) cleanup/reorg.