Added groups for some root-classes
Code style fixes