[Internal Cleanup] When the `packages/*` code was merged into the main codebase, we are left with lots of duplicate/intersecting code #2226