Update categorization

Addition of new categories, and displacing of some groups in these new
categories.