code reorg