Summary: Depends on D3525. Follow up diff will have a rename of the namespaces.

Test Plan: tests pass, just a refactor

Reviewers: #engineering, zasgar, jamesbartlett, nserrino

Reviewed By: jamesbartlett

JIRA Issues: PL-1473

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

GitOrigin-RevId: 610a06247db629d186b945ed520e20a22fc2b139