More work with entity classes. Especially categorization. I've started replacing CompetenceBundle, which I'll remove later.