Redefined how categories are setup, added Groups category.