Individial Group and Category stores

Since we were creating Groups and Categories, it occurred to me we were repeating ourselves and it could lead to inconsistencies. So, I suggest this change.