Code reorg continued