- update Groups blocks for repo refactor