code reorg, no functional changes