Feature/tier2 update

Removed kind/type for all objects except for product, did some preps for tree/widget UI improvements.