The 'model' package is a grab back of types and utilities. Some should probably move to 'internal' and others should remain public.

We should review each and come up with a better place for them to live.