move a bit more reorg