Added groups of classes and fixed broken tableview.