Start refactoring Groups API