Major code reorg.