         DiscussionService.fetchByKey($route.current.params.id)
       currentUser: ($http, UserAuthService) ->
         UserAuthService.fetchCurrentUser()
-  ).when('/groups/new',
+  ).when('/g/new',
     templateUrl: 'generated/templates/group_form.html',
     controller: 'GroupFormController',
     resolve:
-      group: ($route, GroupService, GroupModel, MainRecordStore) ->
+      group: ($route, GroupService, GroupModel, CollectionWrapper) ->
         GroupService.fetchByKey($route.current.params.parent_id).then(->
-          new GroupModel(parent_id: MainRecordStore.get('groups', $route.current.params.parent_id).id))
-  ).when('/groups/:id',
+          new GroupModel(parent_id: CollectionWrapper.get('groups', $route.current.params.parent_id).id))
+  ).when('/g/:id',
     templateUrl: 'generated/templates/group.html',
     controller: 'GroupController',
     resolve:

angular.module('loomioApp').config ($routeProvider, $locationProvider) ->
  $locationProvider.html5Mode(true)

  $routeProvider.when('/discussions/:id',
    templateUrl: 'generated/templates/discussion.html'
    controller: 'DiscussionController'
    resolve:

        GroupService.fetchByKey($route.current.params.id)
      currentUser: ($http, UserAuthService) ->
        UserAuthService.fetchCurrentUser()
  ).when('/g/:id/memberships',
    templateUrl: 'generated/templates/memberships_page.html',
    controller: 'MembershipsPageController',
    resolve:
