[Upg] Reorg