Index: lams_central/web/includes/javascript/main.js
===================================================================
diff -u -r388b3abd9fd8b750b4fbb12028fa856a0a11249e -rd0a8679bc756e47321aff67f3ed1eb737b8535ff
--- lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e)
+++ lams_central/web/includes/javascript/main.js	(.../main.js)	(revision d0a8679bc756e47321aff67f3ed1eb737b8535ff)
@@ -30,7 +30,7 @@
             cssPageDisplay: '.pagedisplay',
             cssPageSize: '.pagesize',
             cssDisabled: 'disabled',
-            ajaxUrl : LAMS_URL + "/index.do?dispatch=getOrgs&page={page}&size={size}&{sortList:column}&{filterList:fcol}",
+            ajaxUrl : LAMS_URL + "/index/getOrgs.do?page={page}&size={size}&{sortList:column}&{filterList:fcol}",
 			ajaxProcessing: function (data, table) {
 		    	if (data && data.hasOwnProperty('rows')) {
 		    		var rows = [],
@@ -121,9 +121,8 @@
 	
 	//store last visited organisation
 	$.ajax({
-		url : "index.do",
+		url : "index/storeLastVisitedOrganisation.do",
 		data : {
-			dispatch : "storeLastVisitedOrganisation",
 			orgId   : activeOrgId
 		}
 	});
@@ -156,9 +155,8 @@
 
 function toggleFavoriteOrganisation(orgId) {
 	$("#favorite-organisations-container").load(
-		"index.do",
+		"index/toggleFavoriteOrganisation.do",
 		{
-			dispatch: "toggleFavoriteOrganisation",
 			orgId   : orgId,
 			activeOrgId : activeOrgId
 		},
@@ -182,7 +180,7 @@
 		'open' : function() {
 			var dialog = $(this);
 			// load contents after opening the dialog
-			$('iframe', dialog).attr('src', LAMS_URL + 'index.do?method=profile');
+			$('iframe', dialog).attr('src', LAMS_URL + 'index.do?redirect=profile');
 			
 			// in case of mobile devices allow iframe scrolling
 			if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
@@ -286,7 +284,7 @@
 			'open' : function() {
 				// load contents after opening the dialog
 				$('iframe', this).attr('src', LAMS_URL
-					+ 'home.do?method=monitorLesson&lessonID='
+					+ 'home/monitorLesson.do?lessonID='
 					+ $(this).data('lessonID'));
 			},
 
@@ -330,7 +328,7 @@
 			// load contents after opening the dialog
 			$('iframe', dialog)
 					.attr('src', LAMS_URL
-						+ 'home.do?method=addLesson&organisationID='
+						+ 'home/addLesson.do?organisationID='
 						+ dialog.data('orgID'));
 			
 			// in case of mobile devices allow iframe scrolling
@@ -354,7 +352,7 @@
 		'title' : LABELS.COURSE_GROUPS_TITLE,
 		'open' : function() {
 			// load contents after opening the dialog
-			$('iframe', this).attr('src', LAMS_URL + 'OrganisationGroup.do?method=viewGroupings&organisationID=' + orgID
+			$('iframe', this).attr('src', LAMS_URL + 'OrganisationGroup/viewGroupings.do?organisationID=' + orgID
 												   + (activityID ? '&activityID=' + activityID : ''));
 		}
 	}, true);
@@ -389,10 +387,9 @@
 			$.ajax({
 				async : false,
 				cache : false,
-				url : LAMS_URL + "authoring/author.do",
+				url : LAMS_URL + "authoring/createToolContent.do",
 				dataType : 'json',
 				data : {
-					'method' : 'createToolContent',
 					'toolID' : toolID
 				},
 				success : function(response) {
@@ -447,10 +444,9 @@
 function refreshPrivateNotificationCount(){
 	$.ajax({
 		cache : false,
-		url : LAMS_URL + "notification.do",
+		url : LAMS_URL + "notification/getPendingNotificationCount.do",
 		dataType : 'text',
 		data : {
-			'method' : 'getPendingNotificationCount'
 		},
 		success : function(count) {
 			$('#notificationsPendingCount').text(count == 0 ? '0' : count);
@@ -494,7 +490,7 @@
 			var orgID = $(this).data('orgID');
 			// load contents after opening the dialog
 			$('iframe', this).attr('src', LAMS_URL
-				+ 'gradebook/gradebookLearning.do?dispatch=courseLearner&organisationID=' + orgID);
+				+ 'gradebook/gradebookLearning/courseLearner.do?organisationID=' + orgID);
 		}
 	}, true);
 }
@@ -530,7 +526,7 @@
 			var orgID = $(this).data('orgID');
 			// load contents after opening the dialog
 			$('iframe', this).attr('src', LAMS_URL
-				+ 'findUserLessons.do?dispatch=getResults&courseID=' + orgID);
+				+ 'findUserLessons/getResults.do?courseID=' + orgID);
 		}
 	}, true);
 }
@@ -547,7 +543,7 @@
 		'open' : function() {
 			var orgID = $(this).data('orgID');
 			// load contents after opening the dialog
-			$('iframe', this).attr('src', LAMS_URL	+ '/learning/kumalive.do?method=getRubrics&organisationID=' + orgID);
+			$('iframe', this).attr('src', LAMS_URL	+ 'learning/kumalive/getRubrics.do?organisationID=' + orgID);
 		}
 	}, false);
 }
@@ -564,7 +560,7 @@
 		'open' : function() {
 			var orgID = $(this).data('orgID');
 			// load contents after opening the dialog
-			$('iframe', this).attr('src', LAMS_URL	+ '/learning/kumalive.do?method=getReport&organisationID=' + orgID);
+			$('iframe', this).attr('src', LAMS_URL	+ 'learning/kumalive/getReport.do?organisationID=' + orgID);
 		}
 	}, false);
 }
@@ -579,10 +575,9 @@
 		$.ajax({
 			async : false,
 			cache : false,
-			url : LAMS_URL + "authoring/author.do",
+			url : LAMS_URL + "authoring/createSingleActivityLesson.do",
 			dataType : 'text',
 			data : {
-				'method' : 'createSingleActivityLesson',
 				'organisationID'  : dialog.data('orgID'),
 				'toolID' : dialog.data('toolID'),
 				'toolContentID' : dialog.data('toolContentID'),
@@ -609,7 +604,7 @@
 						closeDialog(id, true);
 					});
 					// load svgGenerator.jsp to render LD SVG
-					frame.attr('src', LAMS_URL + 'authoring/author.do?method=generateSVG&selectable=false&learningDesignID='
+					frame.attr('src', LAMS_URL + 'authoring/generateSVG.do?selectable=false&learningDesignID='
 											   + learningDesignID);
 				}
 			}