refactor class selection
fixes #4204 - added Config groups feature