Remaps and a bit of reorg