class reorg