master: reorg