Summary: More organization.

Test Plan: Existing tests

Reviewers: yzhao, jps, #engineering

Reviewed By: yzhao, #engineering

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

GitOrigin-RevId: 3e473b05cef5f3846244de99afa8ad00013137c8