Index: lams_central/web/includes/javascript/orgGrouping.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/includes/javascript/orgGrouping.js	(.../orgGrouping.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/includes/javascript/orgGrouping.js	(.../orgGrouping.js)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -2,13 +2,13 @@
 
 function removeGrouping(groupingId) {
 	if (!lessonMode && confirm(LABELS.REMOVE_GROUPING_CONFIRM_LABEL)) {
-		document.location.href = "OrganisationGroup.do?method=removeGrouping&organisationID="
+		document.location.href = "OrganisationGroup/removeGrouping.do?organisationID="
 			+ organisationId + "&groupingId=" + groupingId;
 	}
 }
 
 function viewGroups(groupingId, force) {
-	var url = LAMS_URL + 'OrganisationGroup.do?method=viewGroups&organisationID=' + organisationId;
+	var url = LAMS_URL + 'OrganisationGroup/viewGroups.do?organisationID=' + organisationId;
 	if (lessonId) {
 		url += '&lessonID=' + lessonId;
 	}
@@ -64,9 +64,8 @@
 		
 		// save the mapping
 		$.ajax({
-			url : LAMS_URL + 'OrganisationGroup.do',
+			url : LAMS_URL + 'OrganisationGroup/saveGroupMappings.do',
 			data : {
-				'method'  : 'saveGroupMappings',
 				'mapping' : JSON.stringify(groupsToBranches)
 			},
 			success : function(response) {
@@ -105,9 +104,8 @@
 			
 			// fetch course and branching groups
 			$.ajax({
-				url : LAMS_URL + 'OrganisationGroup.do',
+				url : LAMS_URL + 'OrganisationGroup/getGroupsForMapping.do',
 				data : {
-					'method'			  : 'getGroupsForMapping',
 					'groupingId' 		  : groupingId,
 					'activityID' 		  : groupingActivityId
 				},