move Category/CategoryDescriptions out of Entity/Catalog ns