Index: lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java
===================================================================
diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r6dcc39917657070688863ede60eac6f094929d6a
--- lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java	(.../OrganisationGroupController.java)	(revision f2ad75cef0c507a64877942631fee13efbc6ed50)
+++ lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java	(.../OrganisationGroupController.java)	(revision 6dcc39917657070688863ede60eac6f094929d6a)
@@ -80,7 +80,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 @Controller
-@RequestMapping("/OrganisationGroup")
+@RequestMapping("/organisationGroup")
 public class OrganisationGroupController {
     private static Logger log = Logger.getLogger(OrganisationGroupController.class);
 
@@ -377,10 +377,7 @@
 	// deserialize grouping
 	ObjectNode orgGroupingJSON = new ObjectMapper().readValue(request.getParameter("grouping"), ObjectNode.class);
 	// check if already exists
-	Long orgGroupingId = orgGroupingJSON.get("groupingId").asLong();
-	if (orgGroupingId == 0L) {
-	    orgGroupingId = null;
-	}
+	Long orgGroupingId = JsonUtil.optLong(orgGroupingJSON, "groupingId");
 
 	// iterate over groups
 	List<OrganisationGroup> orgGroups = new LinkedList<>();
@@ -401,7 +398,7 @@
 
 		OrganisationGroup orgGroup = new OrganisationGroup();
 		Long orgGroupId = JsonUtil.optLong(orgGroupJSON, "groupId");
-		if (orgGroupId > 0) {
+		if (orgGroupId != null) {
 		    orgGroup.setGroupId(orgGroupId);
 		    orgGroup.setGroupingId(orgGroupingId);
 		}
@@ -498,7 +495,7 @@
      * Stores course groups to branching groups mapping.
      */
     @ResponseBody
-    @RequestMapping(path = "/save", method = RequestMethod.POST)
+    @RequestMapping(path = "/saveGroupMappings", method = RequestMethod.POST)
     public void saveGroupMappings(HttpServletRequest request, HttpServletResponse response) throws IOException {
 	ArrayNode groupMapping = JsonUtil.readArray(request.getParameter("mapping"));
 	for (JsonNode entryNode : groupMapping) {
@@ -553,7 +550,7 @@
      */
     private ArrayNode getOrgGroupsDetails(Set<OrganisationGroup> groups, Collection<User> learners) {
 
-	final Comparator<OrganisationGroup> ORG_GROUP_COMPARATOR = new Comparator<OrganisationGroup>() {
+	final Comparator<OrganisationGroup> ORG_GROUP_COMPARATOR = new Comparator<>() {
 	    @Override
 	    public int compare(OrganisationGroup o1, OrganisationGroup o2) {
 		String grp1Name = o1 != null ? o1.getName() : "";
Index: lams_central/web/extGroups.jsp
===================================================================
diff -u -r37c404bc2d0032716112057bebc1314cbc30d102 -r6dcc39917657070688863ede60eac6f094929d6a
--- lams_central/web/extGroups.jsp	(.../extGroups.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
+++ lams_central/web/extGroups.jsp	(.../extGroups.jsp)	(revision 6dcc39917657070688863ede60eac6f094929d6a)
@@ -23,7 +23,7 @@
 	<fmt:message key="index.course.groups.title" />
 </div>
 
-<form id="ext-groups-form" action="<lams:LAMSURL/>OrganisationGroup/viewGroups.do" method="POST">
+<form id="ext-groups-form" action="<lams:LAMSURL/>organisationGroup/viewGroups.do" method="POST">
 	<input name="lessonID" value="${lessonID}" type="hidden"/>
 	<input name="activityID" value="${param.activityID}" type="hidden"/>
 
Index: lams_central/web/includes/javascript/main.js
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r6dcc39917657070688863ede60eac6f094929d6a
--- lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 6dcc39917657070688863ede60eac6f094929d6a)
@@ -352,7 +352,7 @@
 		'title' : LABELS.COURSE_GROUPS_TITLE,
 		'open' : function() {
 			// load contents after opening the dialog
-			$('iframe', this).attr('src', LAMS_URL + 'OrganisationGroup/viewGroupings.do?organisationID=' + orgID
+			$('iframe', this).attr('src', LAMS_URL + 'organisationGroup/viewGroupings.do?organisationID=' + orgID
 												   + (activityID ? '&activityID=' + activityID : ''));
 		}
 	}, true);
Index: lams_central/web/includes/javascript/orgGroup.js
===================================================================
diff -u -rcb2cfe5b40c7aee12c9e500ee7800b5fa679821f -r6dcc39917657070688863ede60eac6f094929d6a
--- lams_central/web/includes/javascript/orgGroup.js	(.../orgGroup.js)	(revision cb2cfe5b40c7aee12c9e500ee7800b5fa679821f)
+++ lams_central/web/includes/javascript/orgGroup.js	(.../orgGroup.js)	(revision 6dcc39917657070688863ede60eac6f094929d6a)
@@ -462,7 +462,7 @@
 	$.ajax({
 		async : false,
 		cache : false,
-		url : LAMS_URL + 'OrganisationGroup/save.do',
+		url : LAMS_URL + 'organisationGroup/save.do',
 		data : {
 			'organisationID' : grouping.organisationId,
 			'grouping' : JSON.stringify(newGrouping)
Index: lams_central/web/includes/javascript/orgGrouping.js
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -r6dcc39917657070688863ede60eac6f094929d6a
--- lams_central/web/includes/javascript/orgGrouping.js	(.../orgGrouping.js)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/web/includes/javascript/orgGrouping.js	(.../orgGrouping.js)	(revision 6dcc39917657070688863ede60eac6f094929d6a)
@@ -2,13 +2,13 @@
 
 function removeGrouping(groupingId) {
 	if (!lessonMode && confirm(LABELS.REMOVE_GROUPING_CONFIRM_LABEL)) {
-		document.location.href = "OrganisationGroup/removeGrouping.do?organisationID="
+		document.location.href = "organisationGroup/removeGrouping.do?organisationID="
 			+ organisationId + "&groupingId=" + groupingId;
 	}
 }
 
 function viewGroups(groupingId, force) {
-	var url = LAMS_URL + 'OrganisationGroup/viewGroups.do?organisationID=' + organisationId;
+	var url = LAMS_URL + 'organisationGroup/viewGroups.do?organisationID=' + organisationId;
 	if (lessonId) {
 		url += '&lessonID=' + lessonId;
 	}
@@ -64,7 +64,7 @@
 		
 		// save the mapping
 		$.ajax({
-			url : LAMS_URL + 'OrganisationGroup/saveGroupMappings.do',
+			url : LAMS_URL + 'organisationGroup/saveGroupMappings.do',
 			data : {
 				'mapping' : JSON.stringify(groupsToBranches)
 			},
@@ -104,7 +104,7 @@
 			
 			// fetch course and branching groups
 			$.ajax({
-				url : LAMS_URL + 'OrganisationGroup/getGroupsForMapping.do',
+				url : LAMS_URL + 'organisationGroup/getGroupsForMapping.do',
 				data : {
 					'groupingId' 		  : groupingId,
 					'activityID' 		  : groupingActivityId