Summary: Depends on D3526. Final diff in the refactor -> rename namespaces. This logically sorts everything in the planner.

Test Plan: pass tests from before, hope nothing breaks.

Reviewers: nserrino, zasgar, michelle, #engineering, jamesbartlett

Reviewed By: jamesbartlett

Differential Revision: https://phab.corp.pixielabs.ai/D3528

GitOrigin-RevId: 4a863b5fe2fe13a397f95e458bdcc4a2d074657c