Updated Groups and Group Memberships

to match the new structure