Summary: Remove no folders that no longer exist and add new ones.

Test Plan: N/A

Reviewers: zasgar, michelle

Reviewed By: zasgar

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

GitOrigin-RevId: 03d2112b86bcd5c24aba1b2dbf826ec3b3390a7c