reconfigured the Group structure to it's fields.