Query: Major code reorg.