Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
===================================================================
diff -u -r388b3abd9fd8b750b4fbb12028fa856a0a11249e -rd662ddfeccbdb0b0449031cf7496c36f64155b52
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java	(.../GroupingUploadAJAXController.java)	(revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java	(.../GroupingUploadAJAXController.java)	(revision d662ddfeccbdb0b0449031cf7496c36f64155b52)
@@ -95,7 +95,7 @@
  * @author Fiona Malikoff
  */
 @Controller
-@RequestMapping("/")
+@RequestMapping("/groupingUpload")
 public class GroupingUploadAJAXController {
 
     @Autowired
Index: lams_monitoring/web/emailnotifications/courseNotifications.jsp
===================================================================
diff -u -rc6b4b5dc2401ced0fa74db13c7c962e27e4c4250 -rd662ddfeccbdb0b0449031cf7496c36f64155b52
--- lams_monitoring/web/emailnotifications/courseNotifications.jsp	(.../courseNotifications.jsp)	(revision c6b4b5dc2401ced0fa74db13c7c962e27e4c4250)
+++ lams_monitoring/web/emailnotifications/courseNotifications.jsp	(.../courseNotifications.jsp)	(revision d662ddfeccbdb0b0449031cf7496c36f64155b52)
@@ -43,7 +43,7 @@
 			jQuery("#list3").jqGrid({
 				guiStyle: "bootstrap",
 				iconSet: 'fontAwesome',
-			   	url: "<c:url value='/emailNotifications/getUsers.do'/>" + getSearchParams(),
+			   	url: "<c:url value='/emailNotifications/getUsers.do?'/>" + getSearchParams(),
 				datatype: "json",
 			   	colNames:['<fmt:message key="email.notifications.user.name"/>'],
 			   	colModel:[
@@ -163,7 +163,7 @@
 	
 		function getUsers(){
 			var searchParams = getSearchParams();
-			var url = "<c:url value='/emailNotifications/getUsers.do'/>" + searchParams;
+			var url = "<c:url value='/emailNotifications/getUsers.do?'/>" + searchParams;
 			if (searchParams.length) {
 				$("#list3").setGridParam({datatype:'json', page:1, url: url}).trigger('reloadGrid');	
 			} else {
Index: lams_monitoring/web/emailnotifications/lessonNotifications.jsp
===================================================================
diff -u -rc6b4b5dc2401ced0fa74db13c7c962e27e4c4250 -rd662ddfeccbdb0b0449031cf7496c36f64155b52
--- lams_monitoring/web/emailnotifications/lessonNotifications.jsp	(.../lessonNotifications.jsp)	(revision c6b4b5dc2401ced0fa74db13c7c962e27e4c4250)
+++ lams_monitoring/web/emailnotifications/lessonNotifications.jsp	(.../lessonNotifications.jsp)	(revision d662ddfeccbdb0b0449031cf7496c36f64155b52)
@@ -44,7 +44,7 @@
 			jQuery("#list3").jqGrid({
 				guiStyle: "bootstrap",
 				iconSet: 'fontAwesome',
-			   	url: "<c:url value='/emailNotifications/getUsers.do'/>" + getSearchParams(),
+			   	url: "<c:url value='/emailNotifications/getUsers.do?'/>" + getSearchParams(),
 				datatype: "json",
 			   	colNames:['<fmt:message key="email.notifications.user.name"/>'],
 			   	colModel:[
@@ -139,7 +139,7 @@
 		
 		function getUsers(){
 			var searchParams = getSearchParams();
-			var url = "<c:url value='/emailNotifications/getUsers.do'/>" + searchParams;
+			var url = "<c:url value='/emailNotifications/getUsers.do?'/>" + searchParams;
 			if (searchParams.length) {
 				$("#list3").setGridParam({datatype:'json', page:1, url: url}).trigger('reloadGrid');	
 			} else {
Index: lams_monitoring/web/gate/gateInfo.jsp
===================================================================
diff -u -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a -rd662ddfeccbdb0b0449031cf7496c36f64155b52
--- lams_monitoring/web/gate/gateInfo.jsp	(.../gateInfo.jsp)	(revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a)
+++ lams_monitoring/web/gate/gateInfo.jsp	(.../gateInfo.jsp)	(revision d662ddfeccbdb0b0449031cf7496c36f64155b52)
@@ -3,7 +3,7 @@
 <c:if test="${not empty gateForm.gate.description}">
 	<!-- general information section-->
 	<p>
-		<lams:out value="${GateForm.gate.description}" escapeHtml="true" />
+		<lams:out value="${gateForm.gate.description}" escapeHtml="true" />
 	</p>
 </c:if>
 
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -r7d6fd182d6d5b04cb83bbbf53db25160f172d53f -rd662ddfeccbdb0b0449031cf7496c36f64155b52
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 7d6fd182d6d5b04cb83bbbf53db25160f172d53f)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision d662ddfeccbdb0b0449031cf7496c36f64155b52)
@@ -551,7 +551,7 @@
 			var dialog = $(this);
 			// load contents after opening the dialog
 			$('iframe', dialog).attr('src',
-					LAMS_URL + 'emailUser.do?method=composeMail&lessonID=' + lessonId
+					LAMS_URL + 'emailUser/composeMail.do?lessonID=' + lessonId
 					+ '&userID=' + userId);
 		},
 		'close' : function(){
@@ -568,7 +568,7 @@
 	if (checked) {
 		$.ajax({
 			dataType : 'text',
-			url : LAMS_URL + 'learning/learner.do?method=getPresenceChatActiveUserCount',
+			url : LAMS_URL + 'learning/learner/getPresenceChatActiveUserCount.do?',
 			cache : false,
 			data : {
 				'lessonID'      : lessonId
@@ -1145,7 +1145,7 @@
 	// fetch SVG just once, since it is immutable
 	$.ajax({
 		dataType : 'text',
-		url : LAMS_URL + 'home.do?method=getLearningDesignThumbnail',
+		url : LAMS_URL + 'home/getLearningDesignThumbnail.do?',
 		async : false,
 		cache : false,
 		data : {
@@ -1173,7 +1173,7 @@
 				// run the whole fetch again
 				updateSequenceTab();
 			}).attr('src', LAMS_URL 
-						   + 'authoring/author.do?method=generateSVG&selectable=false&learningDesignID=' + ldId).attr('width',0).attr('height',0).attr('style','border: 0px');
+						   + 'authoring/author/generateSVG.do?selectable=false&learningDesignID=' + ldId).attr('width',0).attr('height',0).attr('style','border: 0px');
 			
 		}
 	});
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -re962cd60c6fc58a68e93516844801045ed956870 -rd662ddfeccbdb0b0449031cf7496c36f64155b52
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision e962cd60c6fc58a68e93516844801045ed956870)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision d662ddfeccbdb0b0449031cf7496c36f64155b52)
@@ -629,7 +629,7 @@
 								   <i class="fa fa-refresh"></i> <span class="hidden-xs"><fmt:message key="button.refresh"/></span></a>
 								<a class="btn btn-sm btn-default" title="<fmt:message key='button.journal.entries.tooltip'/>"
 						   		   href="#" id="journalButton"
-						           onClick="javascript:openPopUp('<lams:LAMSURL/>learning/notebook.do?method=viewAllJournals&lessonID=${lesson.lessonID}', 'JournalEntries', 648, 1152, true)">
+						           onClick="javascript:openPopUp('<lams:LAMSURL/>learning/notebook/viewAllJournals.do?lessonID=${lesson.lessonID}', 'JournalEntries', 648, 1152, true)">
 						           <i class="fa fa-book"></i> <span class="hidden-xs"><fmt:message key="button.journal.entries"/></span></a>
 							</td>
 						</tr>
Index: lams_monitoring/web/tblmonitor/tblmonitor.jsp
===================================================================
diff -u -re962cd60c6fc58a68e93516844801045ed956870 -rd662ddfeccbdb0b0449031cf7496c36f64155b52
--- lams_monitoring/web/tblmonitor/tblmonitor.jsp	(.../tblmonitor.jsp)	(revision e962cd60c6fc58a68e93516844801045ed956870)
+++ lams_monitoring/web/tblmonitor/tblmonitor.jsp	(.../tblmonitor.jsp)	(revision d662ddfeccbdb0b0449031cf7496c36f64155b52)
@@ -57,18 +57,18 @@
 			
 			if (method == "tra" || method == "traStudentChoices" || method == "burningQuestions") {
 				toolContentID = "${traToolContentId}";
-				url = "<lams:LAMSURL/>tool/lascrt11/tblmonitoring.do";
+				url = "<lams:LAMSURL/>tool/lascrt11/tblmonitoring/";
 				
 			} else if (method == "iraMcq" || method == "mcqStudentChoices") {
 				toolContentID = "${iraToolContentId}";
-				url = "<lams:LAMSURL/>tool/lamc11/tblmonitoring.do";
+				url = "<lams:LAMSURL/>tool/lamc11/tblmonitoring/";
 				
 			} else if (method == "iraAssessment" || method == "iraAssessmentStudentChoices") {
 				toolContentID = "${iraToolContentId}";
-				url = "<lams:LAMSURL/>tool/laasse10/tblmonitoring.do";
+				url = "<lams:LAMSURL/>tool/laasse10/tblmonitoring/";
 	
 			} else if (method == "aes" || method == "aesStudentChoices") {
-				url = "<lams:LAMSURL/>tool/laasse10/tblmonitoring.do";
+				url = "<lams:LAMSURL/>tool/laasse10/tblmonitoring/";
 				options = {
 					assessmentToolContentIds: "${assessmentToolContentIds}",
 					assessmentActivityTitles: "${assessmentActivityTitles}"
@@ -81,7 +81,7 @@
 				
 			} else if (method == "peerreview") {
 				toolContentID = "${peerreviewToolContentId}";
-				url = "<lams:LAMSURL/>tool/laprev11/tblmonitoring.do";
+				url = "<lams:LAMSURL/>tool/laprev11/tblmonitoring/";
 			}
 
 			// Merge additional options into existing options object