Some refactoring.
Adds repos with users to groups.