Added groups and Console Utils, some refactoring