Polish #1241

[jromero]

This is a polishing PR for original #1241 by @YousefHaggyHeroku.

Changes:

1. Incorporate changes described in comment
2. Rename common to types
3. Remove dependency on internal
4. Move to pkg
5. Resolve conflicts with origin/main

The intent of this PR is solely to provide minor changes to the original in an effort to reduce friction in the review and merging process. As author of the original PR, if there are any questions, comments, or concerns, don't hesitate to reach out to the maintainers.

[codecov]

Codecov Report

Merging #1261 (efffe58) into main (74fbe47) will decrease coverage by 0.04%.
The diff coverage is 81.64%.

@@            Coverage Diff             @@
##             main    #1261      +/-   ##
==========================================
- Coverage   81.23%   81.19%   -0.03%     
==========================================
  Files         140      140              
  Lines        8582     8596      +14     
==========================================
+ Hits         6971     6979       +8     
- Misses       1176     1180       +4     
- Partials      435      437       +2     

Flag	Coverage Δ
os_linux	79.83% <81.64%> (-<0.01%)	⬇️
os_macos	77.08% <10.21%> (-0.12%)	⬇️
os_windows	81.09% <81.64%> (-0.03%)	⬇️
unit	81.19% <81.64%> (-0.03%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.