Reduce the number of object types

[hazelshapiro]

Needs further discussion, but would look like combining data products and applications into an object type called "products and services" or something similar