This grouping is better than blowing them across the package namespace. Not sure what my ideal would be.