Refactor Contentful content to use fewer content types

[Rishov Sarkar]

We are running up against Contentful's limit of 24 content types in a Micro space, but there's some consolidation that we can do to reduce the number of content types.

[Max Karpawich]

Closing because we successfully consolidated Contentful types