reorg and rename