Code reorg started