Bit more reorg