Final touches before a bit of a reorg