Summary: Cleaning up the cluttered directory structure a bit.

Test Plan: Existing tests

Reviewers: yzhao, #engineering

Reviewed By: yzhao, #engineering

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

GitOrigin-RevId: 1e34e3ee14ef5600cd67328176694e5387095714