Index: lams_build/lib/lams/lams-central.jar
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
Binary files differ
Index: lams_central/.classpath
===================================================================
diff -u -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/.classpath	(.../.classpath)	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
+++ lams_central/.classpath	(.../.classpath)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -7,7 +7,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_learning"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-monitoring.jar" sourcepath="/lams_monitoring/src/java"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/home/korwi/.m2/repository/org/jboss/spec/javax/servlet/jboss-servlet-api_3.1_spec/1.0.0.Final/jboss-servlet-api_3.1_spec-1.0.0.Final-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://tomcat.apache.org/tomcat-8.0-doc/servletapi/"/>
 		</attributes>
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(.../LdTemplateController.java)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(.../LdTemplateController.java)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -38,10 +38,6 @@
 import org.apache.http.client.HttpClient;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.actions.DispatchAction;
 import org.lamsfoundation.lams.authoring.service.IAuthoringService;
 import org.lamsfoundation.lams.authoring.template.Option;
 import org.lamsfoundation.lams.authoring.template.TextUtil;
@@ -80,7 +76,7 @@
  */
 @Controller
 public abstract class LdTemplateController {
-    
+
     @Autowired
     WebApplicationContext applictionContext;
 
@@ -144,8 +140,7 @@
 
     @RequestMapping("")
     @ResponseBody
-    public final String unspecified( HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
+    public final String unspecified(HttpServletRequest request, HttpServletResponse response) throws Exception {
 	ObjectNode responseJSON = null;
 	try {
 	    responseJSON = createLearningDesign(request);
@@ -322,7 +317,7 @@
      *
      * @throws IOException
      * @
-     *       @throws
+     * @throws
      *       HttpException
      */
     protected ObjectNode saveLearningDesign(String templateCode, String userEnteredTitleString,
@@ -933,8 +928,8 @@
 	    String activityTitle) {
 
 	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.QA_TOOL_SIGNATURE,
-		LdTemplateController.QA_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, parentActivityType,
-		activityTitle != null ? activityTitle : "Q&A", Activity.CATEGORY_RESPONSE);
+		LdTemplateController.QA_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID,
+		parentActivityType, activityTitle != null ? activityTitle : "Q&A", Activity.CATEGORY_RESPONSE);
     }
 
     /**
@@ -958,8 +953,9 @@
 	    String activityTitle) {
 
 	return createToolActivity(uiid, order, layoutCoords, LdTemplateController.MCQ_TOOL_SIGNATURE,
-		LdTemplateController.MCQ_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, parentActivityType,
-		activityTitle != null ? activityTitle : "Multiple Choice", Activity.CATEGORY_ASSESSMENT);
+		LdTemplateController.MCQ_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID,
+		parentActivityType, activityTitle != null ? activityTitle : "Multiple Choice",
+		Activity.CATEGORY_ASSESSMENT);
     }
 
     /**
@@ -1065,8 +1061,8 @@
 
     protected ObjectNode createResourceLearningObject(String title, String description, String[] instructions,
 	    File file, int displayOrder) throws IOException {
-	ObjectNode obj = createResourceItem(title, LdTemplateController.RESOURCE_TYPE_LEARNING_OBJECT, instructions, file,
-		displayOrder);
+	ObjectNode obj = createResourceItem(title, LdTemplateController.RESOURCE_TYPE_LEARNING_OBJECT, instructions,
+		file, displayOrder);
 	obj.put("description", description);
 	return obj;
     }
@@ -1304,7 +1300,8 @@
     private ILamsCoreToolService getLamsCoreToolService() {
 	if (LdTemplateController.lamsCoreToolService == null) {
 	    LdTemplateController.lamsCoreToolService = (ILamsCoreToolService) WebApplicationContextUtils
-		    .getRequiredWebApplicationContext(applictionContext.getServletContext()).getBean("lamsCoreToolService");
+		    .getRequiredWebApplicationContext(applictionContext.getServletContext())
+		    .getBean("lamsCoreToolService");
 	}
 	return LdTemplateController.lamsCoreToolService;
     }
@@ -1356,26 +1353,36 @@
 	String forward = request.getParameter("forward");
 	String path;
 	switch (forward) {
-	    case ("init") : path = "authoring/template/tbl/tbl";
-	    	break;
-	    case ("question") : path = "authoring/template/tool/mcquestion";
-	    	break;
-	    case ("questionoption") : path = "authoring/template/tool/mcoption";
-	    	break;
-	    case ("redooption") : path = "authoring/template/tool/mcredooption";
-	    	break;
-	    case ("assess") : path = "authoring/template/tool/assessment";
-	    	break;
-	    case ("assessmcq") : path = "authoring/template/tool/assessmcq";
-	    	break;
-	    case ("assessredooption") : path = "authoring/template/tool/assessredooption";
-	    	break;
-	    case ("assessoption") : path = "authoring/template/tool/assessoption";
-	    	break;
-	    case ("peerreviewstar") : path = "authoring/template/tool/peerreviewstar";
-	    	break;
-	    default : path = null;
-	    	break;
+	    case ("init"):
+		path = "authoring/template/tbl/tbl";
+		break;
+	    case ("question"):
+		path = "authoring/template/tool/mcquestion";
+		break;
+	    case ("questionoption"):
+		path = "authoring/template/tool/mcoption";
+		break;
+	    case ("redooption"):
+		path = "authoring/template/tool/mcredooption";
+		break;
+	    case ("assess"):
+		path = "authoring/template/tool/assessment";
+		break;
+	    case ("assessmcq"):
+		path = "authoring/template/tool/assessmcq";
+		break;
+	    case ("assessredooption"):
+		path = "authoring/template/tool/assessredooption";
+		break;
+	    case ("assessoption"):
+		path = "authoring/template/tool/assessoption";
+		break;
+	    case ("peerreviewstar"):
+		path = "authoring/template/tool/peerreviewstar";
+		break;
+	    default:
+		path = null;
+		break;
 	}
 	return (path != null && path.length() > 0 ? path : "authoring/template/tool/mcquestion");
     }
@@ -1414,7 +1421,7 @@
 	TreeMap<Integer, Option> optionsMap = getOptions(request, questionNumber, useAssessmentVersion);
 	optionsMap.remove(delete);
 	// reorder the displayOrder and setup the return value
-	LinkedList<Option> options = new LinkedList<Option>();
+	LinkedList<Option> options = new LinkedList<>();
 	int displayOrder = 1;
 	for (Option option : optionsMap.values()) {
 	    option.setDisplayOrder(displayOrder++);
@@ -1423,7 +1430,8 @@
 	request.setAttribute("questionNumber", questionNumber);
 	request.setAttribute("options", options);
 	request.setAttribute("optionCount", options.size());
-	return (useAssessmentVersion ? "authoring/template/tool/assessredooption" : "authoring/template/tool/mcredooption");
+	return (useAssessmentVersion ? "authoring/template/tool/assessredooption"
+		: "authoring/template/tool/mcredooption");
     }
 
     @RequestMapping("/swapOption")
@@ -1443,7 +1451,7 @@
 
 	TreeMap<Integer, Option> optionsMap = getOptions(request, questionNumber, useAssessmentVersion);
 	// reorder the options and setup the return value
-	LinkedList<Option> options = new LinkedList<Option>();
+	LinkedList<Option> options = new LinkedList<>();
 
 	Option swap = null;
 	for (Option option : optionsMap.values()) {
@@ -1466,7 +1474,8 @@
 	request.setAttribute("questionNumber", questionNumber);
 	request.setAttribute("options", options);
 	request.setAttribute("optionCount", options.size());
-	return (useAssessmentVersion ? "authoring/template/tool/assessredooption" : "authoring/template/tool/mcredooption");
+	return (useAssessmentVersion ? "authoring/template/tool/assessredooption"
+		: "authoring/template/tool/mcredooption");
     }
 
     // if mcq paramPrefix = "question". if assessment multiple choice paramPrefix = assmcq
@@ -1480,7 +1489,7 @@
 	Integer correctDisplayIdInteger = WebUtil.readIntParam(request, paramPrefix + questionNumber + "correct", true);
 	int correctDisplayId = correctDisplayIdInteger != null ? correctDisplayIdInteger.intValue() : 0;
 
-	TreeMap<Integer, Option> optionDtos = new TreeMap<Integer, Option>();
+	TreeMap<Integer, Option> optionDtos = new TreeMap<>();
 
 	for (int i = 1; i <= MAX_OPTION_COUNT; i++) {
 	    String optionText = request.getParameter(paramPrefix + questionNumber + "option" + i);
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java	(.../AuthoringController.java)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java	(.../AuthoringController.java)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -107,19 +107,19 @@
     @Autowired
     @Qualifier("userManagementService")
     private IUserManagementService userManagementService;
-    private static ILamsToolService toolService;
+    private  ILamsToolService toolService;
     @Autowired
     @Qualifier("authoringService")
-    private static IAuthoringService authoringService;
+    private  IAuthoringService authoringService;
     @Autowired
     @Qualifier("learningDesignService")
-    private static ILearningDesignService learningDesignService;
+    private  ILearningDesignService learningDesignService;
     @Autowired
     @Qualifier("securityService")
-    private static ISecurityService securityService;
+    private  ISecurityService securityService;
     @Autowired
     @Qualifier("integrationService")
-    private static IIntegrationService integrationService;
+    private  IIntegrationService integrationService;
     @Autowired
     WebApplicationContext applicationContext;
 
Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java	(.../DisplayGroupController.java)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java	(.../DisplayGroupController.java)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -33,6 +33,8 @@
 import java.util.Set;
 
 import javax.naming.NamingException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.lamsfoundation.lams.index.IndexLessonBean;
 import org.lamsfoundation.lams.index.IndexLinkBean;
@@ -53,6 +55,7 @@
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.IndexUtils;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
@@ -80,6 +83,51 @@
     @Qualifier("kumaliveService")
     private IKumaliveService kumaliveService;
 
+    @RequestMapping("")
+    @SuppressWarnings({ "unchecked" })
+    public String execute(HttpServletRequest request, HttpServletResponse response) throws Exception {
+
+	Integer orgId = WebUtil.readIntParam(request, "orgId", false);
+
+	Organisation org = null;
+	if (orgId != null) {
+	    org = (Organisation) userService.findById(Organisation.class, orgId);
+	}
+
+	if (org != null) {
+	    User user = getUser(request.getRemoteUser());
+	    if (!securityService.hasOrgRole(orgId, user.getUserId(),
+		    new String[] { Role.GROUP_MANAGER, Role.LEARNER, Role.MONITOR, Role.AUTHOR }, "display group",
+		    false)) {
+		response.sendError(HttpServletResponse.SC_FORBIDDEN, "The user is not a part of the organisation");
+		return null;
+	    }
+
+	    List<Integer> roles = new ArrayList<>();
+	    List<UserOrganisationRole> userOrganisationRoles = userService.getUserOrganisationRoles(orgId,
+		    request.getRemoteUser());
+	    for (UserOrganisationRole userOrganisationRole : userOrganisationRoles) {
+		Integer roleId = userOrganisationRole.getRole().getRoleId();
+		roles.add(roleId);
+	    }
+
+	    IndexOrgBean iob = createOrgBean(org, roles, request.getRemoteUser(), request.isUserInRole(Role.SYSADMIN));
+
+	    request.setAttribute("orgBean", iob);
+	    if (org.getEnableSingleActivityLessons()
+		    && (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR))) {
+		// if single activity lessons are enabled, put sorted list of tools
+		request.setAttribute("tools", learningDesignService.getToolDTOs(false, false, request.getRemoteUser()));
+	    }
+
+	    //set whether organisation is favorite
+	    boolean isFavorite = userService.isOrganisationFavorite(orgId, user.getUserId());
+	    iob.setFavorite(isFavorite);
+	}
+
+	return "group";
+    }
+
     private IndexOrgBean createOrgBean(Organisation org, List<Integer> roles, String username, boolean isSysAdmin)
 	    throws SQLException, NamingException {
 	Integer organisationId = org.getOrganisationId();
Index: lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java	(.../EmailUserController.java)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java	(.../EmailUserController.java)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -69,6 +69,7 @@
     @Qualifier("eventNotificationService")
     private IEventNotificationService eventNotificationService;
     @Autowired
+    @Qualifier("centralMessageService")
     private MessageService messageService;
 
     @RequestMapping("/composeMail")
Index: lams_central/src/java/org/lamsfoundation/lams/web/FindUserLessonsController.java
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/src/java/org/lamsfoundation/lams/web/FindUserLessonsController.java	(.../FindUserLessonsController.java)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/FindUserLessonsController.java	(.../FindUserLessonsController.java)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -49,7 +49,7 @@
     @Qualifier("lessonService")
     private ILessonService lessonService;
     @Autowired
-    @Qualifier("securityServicesecurityService")
+    @Qualifier("securityService")
     private ISecurityService securityService;
 
     @RequestMapping("/getResults")
Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java	(.../HomeController.java)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java	(.../HomeController.java)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -85,22 +85,22 @@
 
     @Autowired
     @Qualifier("userManagementService")
-    private static IUserManagementService userManagementService;
+    private IUserManagementService userManagementService;
     @Autowired
     @Qualifier("lessonService")
-    private static ILessonService lessonService;
+    private ILessonService lessonService;
     @Autowired
     @Qualifier("learningDesignService")
-    private static ILearningDesignService learningDesignService;
+    private ILearningDesignService learningDesignService;
     @Autowired
     @Qualifier("learningDesignService")
     private static IGroupUserDAO groupUserDAO;
     @Autowired
     @Qualifier("workspaceManagementService")
-    private static IWorkspaceManagementService workspaceManagementService;
+    private IWorkspaceManagementService workspaceManagementService;
     @Autowired
     @Qualifier("securityService")
-    private static ISecurityService securityService;
+    private ISecurityService securityService;
     @Autowired
     WebApplicationContext applicationcontext;
 
@@ -216,7 +216,7 @@
      */
     @RequestMapping("/author")
     public String author(HttpServletRequest req, HttpServletResponse res) throws IOException {
-	String url = Configuration.get(ConfigurationKeys.SERVER_URL) + "authoring/author/openAuthoring.do";
+	String url = Configuration.get(ConfigurationKeys.SERVER_URL) + "authoring/openAuthoring.do";
 	Long learningDesignID = WebUtil.readLongParam(req, "learningDesignID", true);
 
 	if (learningDesignID != null) {
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java	(.../IndexController.java)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java	(.../IndexController.java)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -72,10 +72,10 @@
     private static Logger log = Logger.getLogger(IndexController.class);
     @Autowired
     @Qualifier("userManagementService")
-    private static IUserManagementService userManagementService;
+    private IUserManagementService userManagementService;
     @Autowired
     @Qualifier("integrationService")
-    private static IIntegrationService integrationService;
+    private IIntegrationService integrationService;
 
     @RequestMapping("")
     @SuppressWarnings("unchecked")
@@ -111,17 +111,17 @@
 	User user = userManagementService.getUserByLogin(userDTO.getLogin());
 	request.setAttribute("portraitUuid", user.getPortraitUuid());
 
-	String method = WebUtil.readStrParam(request, "method", true);
-	if (StringUtils.equals(method, "profile")) {
+	String redirectURL = WebUtil.readStrParam(request, "redirect", true);
+	if (StringUtils.equals(redirectURL, "profile")) {
 	    return "redirect:/profile/view.do";
-	} else if (StringUtils.equals(method, "editprofile")) {
+	} else if (StringUtils.equals(redirectURL, "editprofile")) {
 	    return "redirect:/profile/edit.do";
-	} else if (StringUtils.equals(method, "password")) {
+	} else if (StringUtils.equals(redirectURL, "password")) {
 	    return "redirect:/password.do";
-	} else if (StringUtils.equals(method, "portrait")) {
-	    return "/portrait.do";
-	} else if (StringUtils.equals(method, "lessons")) {
-	    return "/profile/lessons.do";
+	} else if (StringUtils.equals(redirectURL, "portrait")) {
+	    return "redirect:/portrait.do";
+	} else if (StringUtils.equals(redirectURL, "lessons")) {
+	    return "redirect:/profile/lessons.do";
 	}
 
 	// This test also appears in LoginAsAction
Index: lams_central/src/java/org/lamsfoundation/lams/web/LessonConditionsController.java
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/src/java/org/lamsfoundation/lams/web/LessonConditionsController.java	(.../LessonConditionsController.java)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/LessonConditionsController.java	(.../LessonConditionsController.java)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -96,6 +96,7 @@
     @Qualifier("securityService")
     private ISecurityService securityService;
     @Autowired
+    @Qualifier("centralMessageService")
     private MessageService messageservice;
 
     /**
Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeController.java
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeController.java	(.../PasswordChangeController.java)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeController.java	(.../PasswordChangeController.java)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -35,6 +35,7 @@
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.ValidationUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -52,6 +53,7 @@
     private static Logger log = Logger.getLogger(PasswordChangeController.class);
 
     @Autowired
+    @Qualifier("centralMessageService")
     MessageService messageService;
     @Autowired
     WebApplicationContext applicationContext;
@@ -73,7 +75,8 @@
 	// -- isCancelled?
 	if (request.getAttribute(Globals.CANCEL_KEY) != null) {
 	    request.getSession().removeAttribute(PasswordChangeActionForm.formName);
-	    return "redirect:/index/profile.do";
+	    request.setAttribute("redirect", "profile");
+	    return "redirect:/index.do";
 	}
 
 	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
@@ -147,7 +150,8 @@
 	if (!errorMap.isEmpty()) {
 	    request.setAttribute("errorMap", errorMap);
 	    passwordChangeForm.reset(request);
-	    return "redirect:/index/password.do";
+	    request.setAttribute("redirect", "password");
+	    return "redirect:/index.do";
 	}
 	request.setAttribute("redirectURL", passwordChangeForm.getRedirectURL());
 	return "/passwordChangeOkContent";
Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java	(.../PortraitSaveController.java)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java	(.../PortraitSaveController.java)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -75,6 +75,7 @@
     @Qualifier("logEventService")
     private ILogEventService logEventService;
     @Autowired
+    @Qualifier("centralMessageService")
     private MessageService messageService;
     @Autowired
     WebApplicationContext applicationContext;
@@ -89,7 +90,8 @@
 	    HttpServletResponse response) throws Exception {
 
 	if (request.getAttribute(Globals.CANCEL_KEY) != null) {
-	    return "redirect:/index/profile.do";
+	    request.setAttribute("redirect", "profile");
+	    return "redirect:/index.do";
 	}
 
 	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
@@ -105,15 +107,17 @@
 	if (!mediaType.equals("image")) {
 	    errorMap.add("file", messageService.getMessage("error.portrait.not.image"));
 	    request.setAttribute("errorMap", errorMap);
-	    return "redirect:/index/portrait.do";
+	    request.setAttribute("redirect", "portrait");
+	    return "redirect:/index.do";
 	}
 
 	// check file exists
 	InputStream is = file.getInputStream();
 	if (is == null) {
 	    errorMap.add("file", messageService.getMessage("error.general.1"));
 	    request.setAttribute("errorMap", errorMap);
-	    return "redirect:/index/portrait.do";
+	    request.setAttribute("redirect", "portrait");
+	    return "redirect:/index.do";
 	}
 
 	// write to content repository
@@ -171,7 +175,8 @@
 	user.setPortraitUuid(originalFileNode.getUuid());
 	service.saveUser(user);
 
-	return "redirect:/index/profile.do";
+	request.setAttribute("redirect", "profile");
+	return "redirect:/index.do";
     }
 
     /** Called from sysadmin to delete an inappropriate portrait */
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java	(.../ProfileController.java)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java	(.../ProfileController.java)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -86,6 +86,7 @@
     @Qualifier("timezoneService")
     private ITimezoneService timezoneService;
     @Autowired
+    @Qualifier("centralMessageService")
     private MessageService messageService;
 
     @RequestMapping("/view")
@@ -191,7 +192,7 @@
     }
 
     @RequestMapping("/edit")
-    public String edit(@ModelAttribute UserForm userForm, HttpServletRequest request) throws Exception {
+    public String edit(@ModelAttribute("newForm") UserForm userForm, HttpServletRequest request) throws Exception {
 
 	//some errors may have already been set in ProfileSaveAction
 	MultiValueMap<String, String> errorMap = (MultiValueMap<String, String>) request.getAttribute("errorMap");
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java	(.../ProfileSaveController.java)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java	(.../ProfileSaveController.java)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -60,20 +60,23 @@
     @Qualifier("userManagementService")
     private IUserManagementService service;
     @Autowired
+    @Qualifier("centralMessageService")
     private MessageService messageService;
 
-    @RequestMapping(path = "/saveprofile", method = RequestMethod.POST)
-    public String execute(@ModelAttribute UserForm userForm, HttpServletRequest request) throws Exception {
+    @RequestMapping(path = "/saveprofile")
+    public String execute(@ModelAttribute("newForm") UserForm userForm, HttpServletRequest request) throws Exception {
 
 	if (request.getAttribute(Globals.CANCEL_KEY) != null) {
-	    return "redirect:/index/profile.do?";
+	    request.setAttribute("redirect", "profile");
+	    return "redirect:/index.do";
 	}
 
 	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 
 	if (!Configuration.getAsBoolean(ConfigurationKeys.PROFILE_EDIT_ENABLE)) {
 	    if (!Configuration.getAsBoolean(ConfigurationKeys.PROFILE_PARTIAL_EDIT_ENABLE)) {
-		return "redirect:/index/editprofile.do";
+		request.setAttribute("redirect", "editprofile");
+		return "redirect:/index.do";
 	    }
 	}
 
@@ -85,8 +88,8 @@
 		    .warn(requestor.getLogin() + " tried to edit profile of user " + userForm.getLogin());
 	    errorMap.add("GLOBAL", messageService.getMessage("error.authorisation"));
 	    request.setAttribute("errorMap", errorMap);
-	    ;
-	    return "redirect:/index/editprofile.do";
+	    request.setAttribute("redirect", "editprofile");
+	    return "redirect:/index.do";
 	}
 
 	// (dyna)form validation
@@ -116,8 +119,8 @@
 
 	if (!errorMap.isEmpty()) {
 	    request.setAttribute("errorMap", errorMap);
-	    ;
-	    return "redirect:/index/editprofile.do";
+	    request.setAttribute("redirect", "editprofile");
+	    return "redirect:/index.do";
 	}
 
 	if (!Configuration.getAsBoolean(ConfigurationKeys.PROFILE_EDIT_ENABLE)
@@ -144,7 +147,8 @@
 	HttpSession ss = SessionManager.getSession();
 	ss.setAttribute(AttributeNames.USER, requestor.getUserDTO());
 
-	return "redirect:/index/profile.do";
+	request.setAttribute("redirect", "profile");
+	return "redirect:/index.do";
     }
 
 }
Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java
===================================================================
diff -u -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java	(.../PedagogicalPlannerGroupingForm.java)	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java	(.../PedagogicalPlannerGroupingForm.java)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -28,6 +28,7 @@
 import org.lamsfoundation.lams.learningdesign.RandomGrouping;
 import org.lamsfoundation.lams.util.MessageService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
@@ -45,6 +46,7 @@
     private Boolean viewStudentsBeforeSelection;
 
     @Autowired
+    @Qualifier("centralMessageService")
     MessageService messageService;
 
     public Integer getGroupingTypeId() {
Index: lams_central/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
+++ lams_central/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -8,7 +8,7 @@
            				   http://www.springframework.org/schema/context 
    						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 	<!-- Spring MVC -->
-	<context:component-scan base-package="org.lamsfoundation.lams.web.controller" />
+	<context:component-scan base-package="org.lamsfoundation.lams.web, org.lamsfoundation.lams.authoring.web" />
 	
 	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
 		<property name="prefix" value="/" />
Index: lams_central/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -138,12 +138,12 @@
 				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -245,9 +245,8 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : LEARNING_URL + 'learner.do',
+						url : LEARNING_URL + 'learner/getLessonDetails.do',
 						data : {
-							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
 							'toolSessionID' : toolSessionId,
 						},
Index: lams_central/web/addLesson.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -2,35 +2,36 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
+<c:set var="lams"><lams:LAMSURL/></c:set>
 
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
 	<lams:css/>
-	<link rel="stylesheet" href="css/yui/treeview.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="css/yui/folders.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="css/jquery-ui.timepicker.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="css/addLesson.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="${lams}css/yui/treeview.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="${lams}css/yui/folders.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="${lams}css/jquery-ui.timepicker.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="${lams}css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="${lams}css/addLesson.css" type="text/css" media="screen" />
 
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.form.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.timepicker.js"></script>
-	<script type="text/javascript" src="includes/javascript/yui/yahoo-dom-event.js" ></script>
-	<script type="text/javascript" src="includes/javascript/yui/animation-min.js"></script>
-	<script type="text/javascript" src="includes/javascript/yui/json-min.js" ></script> 
-	<script type="text/javascript" src="includes/javascript/yui/treeview-min.js" ></script>
-	<script type="text/javascript" src="includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="includes/javascript/bootstrap.tabcontroller.js"></script>
-	<script type="text/javascript" src="includes/javascript/addLesson.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/yui/yahoo-dom-event.js" ></script>
+	<script type="text/javascript" src="${lams}includes/javascript/yui/animation-min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/yui/json-min.js" ></script> 
+	<script type="text/javascript" src="${lams}includes/javascript/yui/treeview-min.js" ></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/addLesson.js"></script>
 	<script type="text/javascript">
 		var userId = '<lams:user property="userID"/>',
 			folderContents = ${folderContents},
 			users = ${users},
 			
 			LAMS_URL = '<lams:LAMSURL/>',
-			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home.do?method=getLearningDesignThumbnail&ldId=',
+			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home/getLearningDesignThumbnail.do?ldId=',
 			
 			CANVAS_RESIZE_OPTION_NONE = 0,
 			CANVAS_RESIZE_OPTION_FIT = 1,
@@ -63,7 +64,7 @@
 	<i class="fa fa-refresh fa-spin fa-3x fa-fw"></i>
 </div>
 
-<form id="lessonForm" action="<lams:LAMSURL/>monitoring/monitoring.do" method="POST">
+<form id="lessonForm" action="<lams:LAMSURL/>monitoring/monitoring/addLesson.do" method="POST">
 
 <lams:Page type="navbar">
 		<lams:Tabs>
@@ -159,7 +160,6 @@
 				</lams:TabBody>
 				<lams:TabBody id="3" titleKey="label.tab.advanced">
 					<!-- Advanced Panel -->
-					<input name="method" value="addLesson" type="hidden" />
 					<input name="organisationID" value="${param.organisationID}" type="hidden" />
 					<input id="ldIdField" name="learningDesignID" type="hidden" />
 					<input id="lessonNameField" name="lessonName" type="hidden" />
Index: lams_central/web/editLessonIntro.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/editLessonIntro.jsp	(.../editLessonIntro.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/editLessonIntro.jsp	(.../editLessonIntro.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -11,8 +11,8 @@
 <lams:head>
 	<TITLE><fmt:message key="title.learner.window"/></TITLE>
 	
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.form.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
 	<script language="JavaScript" type="text/javascript">
 		$(function() {
 			$('#lessonForm').ajaxForm( {
Index: lams_central/web/editprofile.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -8,7 +8,7 @@
 <%@ page import="org.lamsfoundation.lams.usermanagement.AuthenticationMethod"
 	import="org.lamsfoundation.lams.util.Configuration"
 	import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
-
+<c:set var="lams"><lams:LAMSURL/></c:set>
 <lams:html>
 <lams:head>
 	<lams:css/>
@@ -18,9 +18,9 @@
 		}
 	</style>
 
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="includes/javascript/profile.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/profile.js"></script>
 	<script type="text/javascript">
 		function submitMessage() {
 			var formData = new FormData(document.getElementById("newForm"));
@@ -51,7 +51,7 @@
 </lams:head>
 
 <body>
-	<form:form action="saveprofile.do" modelAttribute='newForm' method="post" id='newForm'>
+	<form:form action="/lams/saveprofile.do" modelAttribute='newForm' method="post" id='newForm'>
 		<form:hidden path="userId" />
 		<form:hidden path="login" />
 		<form:hidden path="password" />
@@ -401,8 +401,8 @@
 			</div>
 	</form:form>
 	<div class="form-group" align="right">
-		<a href="<lams:LAMSURL />profile.jsp"   class="btn btn-sm btn-default voffset5" ></a>
-			<fmt:message key="button.cancel" />
+		<a href="<lams:LAMSURL />profile.jsp"   class="btn btn-sm btn-default voffset5" >
+			<fmt:message key="button.cancel" /></a>
 		&nbsp;&nbsp;
 		<c:if test="${profileEditEnabled or partialProfileEditEnabled}">
 			<button class="btn btn-sm btn-primary voffset5" type="button"
Index: lams_central/web/errorContent.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/errorContent.jsp	(.../errorContent.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/errorContent.jsp	(.../errorContent.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -8,7 +8,7 @@
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
-	<base href="<lams:WebAppURL />">
+	<base href="<lams:LAMSURL/>"/>
 	<title><fmt:message key="heading.general.error" /></title>
 	<lams:css/>
 	<script language="JavaScript" type="text/JavaScript" src="<lams:WebAppURL />includes/javascript/changeStyle.js"></script>
Index: lams_central/web/extGroups.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/extGroups.jsp	(.../extGroups.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/extGroups.jsp	(.../extGroups.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -2,7 +2,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-	
+<c:set var="lams"><lams:LAMSURL/></c:set>
 <c:if test="${lessonID == null}">
 	<c:set var="lessonID"  value="${param.lessonID}"/>
 </c:if>
@@ -11,19 +11,19 @@
 <lams:html>
 <lams:head>
 	<lams:css/>
-	<link rel="stylesheet" href="css/jquery-ui-redmond-theme.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="css/orgGrouping.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="${lams}css/jquery-ui-redmond-theme.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="${lams}css/orgGrouping.css" type="text/css" media="screen" />
 	
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 </lams:head>
 <body>
 
 <div id="titleDiv">
 	<fmt:message key="index.course.groups.title" />
 </div>
 
-<form id="ext-groups-form" action="<lams:LAMSURL/>OrganisationGroup.do?method=viewGroups" 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/forgotPassword.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/forgotPassword.jsp	(.../forgotPassword.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/forgotPassword.jsp	(.../forgotPassword.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -5,7 +5,6 @@
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
 <%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c"%>
Index: lams_central/web/forgotPasswordChange.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/forgotPasswordChange.jsp	(.../forgotPasswordChange.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/forgotPasswordChange.jsp	(.../forgotPasswordChange.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -4,8 +4,6 @@
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c"%>
Index: lams_central/web/forgotPasswordProc.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/forgotPasswordProc.jsp	(.../forgotPasswordProc.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/forgotPasswordProc.jsp	(.../forgotPasswordProc.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -8,8 +8,6 @@
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c"%>
Index: lams_central/web/includes/javascript/addLesson.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/includes/javascript/addLesson.js	(.../addLesson.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/includes/javascript/addLesson.js	(.../addLesson.js)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -27,9 +27,8 @@
 	tree.setDynamicLoad(function(node, callback){
 		// load subfolder contents
 		$.ajax({
-			url : LAMS_URL + 'home.do',
+			url : LAMS_URL + 'home/getFolderContents.do',
 			data : {
-				'method' : 'getFolderContents',
 				'folderID' : node.data.folderID
 			},
 			cache : false,
@@ -432,7 +431,7 @@
 				dataType : 'text',
 				success : function() {
 					// open preview pop up window
-					window.open(LAMS_URL + 'home.do?method=learner&mode=preview&lessonID='+lessonID,'Preview',
+					window.open(LAMS_URL + 'home/learner.do?mode=preview&lessonID='+lessonID,'Preview',
 								'width=' + popupWidth + ',height=' + popupHeight + ',resizable,status=yes');
 					previewButton.button('reset');
 				}
@@ -448,11 +447,10 @@
 	
 	$.ajax({
 		dataType : 'text',
-		url : LAMS_URL + 'home.do',
+		url : LAMS_URL + 'home/getLearningDesignThumbnail.do',
 		async : false,
 		cache : false,
 		data : {
-			'method'    : 'getLearningDesignThumbnail',
 			'ldId'      : ldId,
 			'_t'		: new Date().getTime()
 			
@@ -495,7 +493,7 @@
 				// load the image again, avoid caching
 				loadLearningDesignSVG(ldId);
 			}).attr('src', LAMS_URL 
-						   + 'authoring/author.do?method=generateSVG&selectable=false&learningDesignID='
+						   + 'authoring/generateSVG.do?selectable=false&learningDesignID='
 						   + ldId);
 		}
 	});
Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -1310,7 +1310,7 @@
 			return;
 		}
 		$.ajax({
-			url : LAMS_URL + 'authoring/author/getToolOutputDefinitions.do',
+			url : LAMS_URL + 'authoring/getToolOutputDefinitions.do',
 			data : {
 				'toolContentID' : activity.toolContentID 
 								|| layout.toolMetadata[activity.learningLibraryID].defaultToolContentID
@@ -1350,10 +1350,9 @@
 			$.ajax({
 				async : false,
 				cache : false,
-				url : LAMS_URL + "authoring/author.do",
+				url : LAMS_URL + "authoring/createToolContent.do",
 				dataType : 'json',
 				data : {
-					'method'          : 'createToolContent',
 					'toolID'          : activity.toolID,
 					// if toolContentID exists, a new content will not be created, only authorURL will be fetched
 					'toolContentID'   : activity.toolContentID,
@@ -1437,9 +1436,8 @@
 		}
 			
 		$.ajax({
-			url : LAMS_URL + 'authoring/author.do',
+			url : LAMS_URL + 'authoring/getToolOutputDefinitions.do',
 			data : {
-				'method' : 'getToolOutputDefinitions',
 				'toolContentID' : activity.toolContentID 
 								|| layout.toolMetadata[activity.learningLibraryID].defaultToolContentID
 			},
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -822,9 +822,8 @@
 							$.ajax({
 								cache : false,
 								async : false,
-								url : LAMS_URL + "authoring/author.do",
+								url : LAMS_URL + "authoring/copyToolContent.do",
 								data : {
-									'method'        : 'copyToolContent',
 									'toolContentID' : activity.toolContentID
 								},
 								dataType : 'text',
@@ -1504,9 +1503,8 @@
 				type  : 'POST',
 				async : false,
 				cache : false,
-				url : LAMS_URL + 'authoring/author.do',
+				url : LAMS_URL + 'authoring/finishLearningDesignEdit.do',
 				data : {
-					'method' : 'finishLearningDesignEdit',
 					'learningDesignID' : layout.ld.learningDesignID,
 					'cancelled' : 'true'
 				},
@@ -1666,7 +1664,7 @@
 			// do not prompt again
 			window.onbeforeunload = null;
 			// full window reload so new content ID gets generated
-			document.location.href = LAMS_URL + 'authoring/author.do?method=openAuthoring';
+			document.location.href = LAMS_URL + 'authoring/openAuthoring.do';
 		}
 	},
 	
@@ -1683,10 +1681,9 @@
 		$.ajax({
 			async : false,
 			cache : false,
-			url : LAMS_URL + "authoring/author.do",
+			url : LAMS_URL + "authoring/openLearningDesign.do",
 			dataType : 'json',
 			data : {
-				'method'          : 'openLearningDesign',
 				'learningDesignID': learningDesignID
 			},
 			success : function(response) {
@@ -2746,10 +2743,9 @@
 			type     : 'POST',
 			cache    : false,
 			async    : false,
-			url      : LAMS_URL + "authoring/author.do",
+			url      : LAMS_URL + "authoring/saveLearningDesign.do",
 			dataType : 'json',
 			data     : {
-				'method' : 'saveLearningDesign',
 				'ld'     : JSON.stringify(ld)
 			},
 			success : function(response) {
@@ -2798,9 +2794,8 @@
 							type  : 'POST',
 							async : false,
 							cache : false,
-							url : LAMS_URL + 'authoring/author.do',
+							url : LAMS_URL + 'authoring/finishLearningDesignEdit.do',
 							data : {
-								'method' : 'finishLearningDesignEdit',
 								'learningDesignID' : layout.ld.learningDesignID,
 								'cancelled' : 'false'
 							},
@@ -2905,10 +2900,9 @@
 				var activity = this;
 				$.ajax({
 					type : 'POST',
-					url : LAMS_URL + 'authoring/author.do',
+					url : LAMS_URL + 'authoring/saveActivityCoordinates.do',
 					async: false,
 					data : {
-						'method'   : 'saveActivityCoordinates',
 						'activity' : JSON.stringify({
 							'activityID'  : activity.activityID,
 							'xCoord'      : activity.xCoord,
@@ -2936,10 +2930,9 @@
 		
 		$.ajax({
 			type : 'POST',
-			url : LAMS_URL + 'authoring/author.do',
+			url : LAMS_URL + 'authoring/saveLearningDesignImage.do',
 			async: false,
 			data : {
-				'method' : 'saveLearningDesignImage',
 				'learningDesignID' : layout.ld.learningDesignID,
 				'image' : MenuLib.exportSVG()
 			},
@@ -2982,7 +2975,7 @@
 			if ($('#ldStoreDialogImportPartButton', layout.ldStoreDialog).is(':visible')) {
 				// get read-only Authoring of the chosen LD and prevent caching
 				$('#ldStoreDialogImportPartFrame', layout.ldStoreDialog).attr('src',
-				  LAMS_URL + 'authoring/author.do?method=generateSVG&selectable=true&learningDesignID='
+				  LAMS_URL + 'authoring/generateSVG.do?selectable=true&learningDesignID='
 				  		   + learningDesignID + '&_=' + new Date().getTime());
 			} else {
 				$('#ldScreenshotLoading', layout.ldStoreDialog).show();
@@ -3018,7 +3011,7 @@
 								$('#ldScreenshotLoading', layout.ldStoreDialog).hide();
 							}
 						}).attr('src', LAMS_URL 
-									   + 'authoring/author.do?method=generateSVG&selectable=false&learningDesignID='
+									   + 'authoring/generateSVG.do?selectable=false&learningDesignID='
 									   + learningDesignID);
 					}
 				});
@@ -3095,10 +3088,9 @@
 			$.ajax({
 				cache : false,
 				async : false,
-				url : LAMS_URL + "authoring/author.do",
+				url : LAMS_URL + "authoring/getLearningDesignAccess.do",
 				dataType : 'json',
 				data : {
-					'method' : 'getLearningDesignAccess'
 				},
 				success : function(response) {
 					access = response;
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -342,9 +342,8 @@
 		var result = null;
 			
 		$.ajax({
-			url : LAMS_URL + 'home.do',
+			url : LAMS_URL + 'home/getFolderContents.do',
 			data : {
-				'method' : 'getFolderContents',
 				'folderID' : folderID,
 				'allowInvalidDesigns' : true
 			},
@@ -550,7 +549,7 @@
 						var left = ((screen.width / 2) - (1280 / 2)),
 							// open the window a bit higher than center
 							top = ((screen.height / 2) - (720 / 2)) / 2;
-						window.open(LAMS_URL + 'home.do?method=learner&mode=preview&lessonID='+lessonID,'Preview',
+						window.open(LAMS_URL + 'home/learner.do?mode=preview&lessonID='+lessonID,'Preview',
 									'width=1280,height=720,resizable,scrollbars=yes,status=yes,top=' + top + ',left=' + left);
 						previewButton.button('reset');
 					}
@@ -613,9 +612,8 @@
 			$.ajax({
 				cache : false,
 				async : false,
-				url : LAMS_URL + "authoring/author.do",
+				url : LAMS_URL + "authoring/copyToolContent.do",
 				data : {
-					'method'        : 'copyToolContent',
 					'toolContentID' : activity.toolContentID
 				},
 				dataType : 'text',
Index: lams_central/web/includes/javascript/dialog.js
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/includes/javascript/dialog.js	(.../dialog.js)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/includes/javascript/dialog.js	(.../dialog.js)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -330,7 +330,7 @@
 			}
 		},
 		'open' : function() {
-			var url = LAMS_URL + 'authoring/author.do?method=openAuthoring';
+			var url = LAMS_URL + 'authoring/openAuthoring.do';
 			
 			if (learningDesignID) {
 				url += '&learningDesignID=' + learningDesignID;
@@ -404,7 +404,7 @@
 		'open' : function() {
 			var dialog = $(this);
 			// load contents after opening the dialog
-			$('iframe', dialog).attr('src', LAMS_URL + 'index/portrait.do?isReturnButtonHidden=true');
+			$('iframe', dialog).attr('src', LAMS_URL + 'index.do?redirect=portrait&isReturnButtonHidden=true');
 			
 			// in case of mobile devices allow iframe scrolling
 			if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
Index: lams_central/web/includes/javascript/main.js
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -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/profile.do');
+			$('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);
@@ -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);
 				}
 			}
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -61,32 +61,32 @@
 }
 
 function returnToMonitorLessonIntegrated( lessonID ) {
-	window.location = 'home.do?method=monitorLesson&lessonID='+lessonID;
+	window.location = 'home/monitorLesson.do?lessonID='+lessonID;
 }
 
 function openMonitorLesson( lessonID ) {
 	if (isMac) {
 		if(belowMinRes) {
-			monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+ lessonID,'mWindow','width=' + monitor_width 
+			monitorLessonWin = window.open('home/monitorLesson.do?lessonID='+ lessonID,'mWindow','width=' + monitor_width 
 							   + ',height=' + monitor_height + ',resizable,scrollbars' + getCenterParams(monitor_width, monitor_height));
 		} else {
-			monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+lessonID,'mWindow','width=' + monitor_width
+			monitorLessonWin = window.open('home/monitorLesson.do?lessonID='+lessonID,'mWindow','width=' + monitor_width
 							   + ',height=' + monitor_height + ',resizable,scrollbars' + getCenterParams(monitor_width, monitor_height));
 		}
 	} else {
 		if (monitorLessonWin && !monitorLessonWin.closed) {
-			monitorLessonWin.location = 'home.do?method=monitorLesson&lessonID='+lessonID;
+			monitorLessonWin.location = 'home/monitorLesson.do?lessonID='+lessonID;
 			monitorLessonWin.focus();
 		} else {
-			monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+lessonID,'mWindow','width=' + monitor_width
+			monitorLessonWin = window.open('home/monitorLesson.do?lessonID='+lessonID,'mWindow','width=' + monitor_width
 							   + ',height=' + monitor_height + ',resizable,resizable,scrollbars'
 							   + getCenterParams(monitor_width, monitor_height));
 		}
 	}
 }
 
 function openLearner( lessonId ) {
-	var learnerUrl = 'home.do?method=learner&lessonID=' + lessonId;
+	var learnerUrl = 'home/learner.do?lessonID=' + lessonId;
 	
 	if (isMac) {
 		learnWin = window.open(learnerUrl,'lWindow','width=' + learner_width + ',height=' + learner_height 
@@ -126,15 +126,15 @@
  */
 function openLearnerShortenedUrl( lessonId ) {
 	if (isMac) {
-		learnWin = window.open('../home.do?method=learner&lessonID='+lessonId,'lWindow','width=' + learner_width 
+		learnWin = window.open('../home/learner.do?lessonID='+lessonId,'lWindow','width=' + learner_width 
 				   + ',height=' + learner_height + ',resizable,scrollbars=yes,status=yes'
 				   + getCenterParams(learner_width, learner_height));
 	} else {
 		if (learnWin && !learnWin.closed ) {
-			learnWin.location = '../home.do?method=learner&lessonID='+lessonId;		
+			learnWin.location = '../home/learner.do?lessonID='+lessonId;		
 			learnWin.focus();
 		} else {
-			learnWin = window.open('../home.do?method=learner&lessonID='+lessonId,'lWindow','width='
+			learnWin = window.open('../home/learner.do?lessonID='+lessonId,'lWindow','width='
 					   + learner_width + ',height=' + learner_height + ',resizable,scrollbars=yes,status=yes'
 					   + getCenterParams(learner_width, learner_height));
 		}
Index: lams_central/web/includes/javascript/orgGroup.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/includes/javascript/orgGroup.js	(.../orgGroup.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/includes/javascript/orgGroup.js	(.../orgGroup.js)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -465,9 +465,8 @@
 	$.ajax({
 		async : false,
 		cache : false,
-		url : LAMS_URL + 'OrganisationGroup.do',
+		url : LAMS_URL + 'OrganisationGroup/save.do',
 		data : {
-			'method' : 'save',
 			'organisationID' : grouping.organisationId,
 			'grouping' : JSON.stringify(newGrouping)
 		},
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
 				},
Index: lams_central/web/includes/javascript/pedagogicalPlanner.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/includes/javascript/pedagogicalPlanner.js	(.../pedagogicalPlanner.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/includes/javascript/pedagogicalPlanner.js	(.../pedagogicalPlanner.js)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -181,7 +181,7 @@
   	   		startPreview(startPreviewUrl);
   	   	}
   	   	else if (actionAfterCompleted==ACTION_OPEN_AUTHOR){
-  	   		var openAuthorURL = "home.do?method=author&learningDesignID=" + learningDesignId;
+  	   		var openAuthorURL = "home/author.do?learningDesignID=" + learningDesignId;
   	   		if (requestSrc != "") {
   	   			openAuthorURL += "&requestSrc=" + requestSrc;
   	   		}
Index: lams_central/web/indexLessonConditions.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/indexLessonConditions.jsp	(.../indexLessonConditions.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/indexLessonConditions.jsp	(.../indexLessonConditions.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -2,8 +2,6 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-function" prefix="fn"%>
 
 <!DOCTYPE html>
Index: lams_central/web/lessonIntro.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/lessonIntro.jsp	(.../lessonIntro.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/lessonIntro.jsp	(.../lessonIntro.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -22,11 +22,10 @@
 		$(document).ready(function(){
 			$.ajax({
 				dataType : 'text',
-				url : '<lams:LAMSURL/>home.do',
+				url : '<lams:LAMSURL/>home/getLearningDesignThumbnail.do',
 				async : false,
 				cache : false,
 				data : {
-					'method'    : 'getLearningDesignThumbnail',
 					'ldId'      : '${learningDesignID}',
 					'_t'		: new Date().getTime()
 				},
Index: lams_central/web/lessons.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/lessons.jsp	(.../lessons.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/lessons.jsp	(.../lessons.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -5,17 +5,17 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-
+<c:set var="lams"><lams:LAMSURL/></c:set>
 <lams:html>
 <lams:head>
 	<lams:css/>
 	
-	<script type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
-	<script type="text/javascript" src="loadVars.jsp"></script>
-	<script type="text/javascript" src="includes/javascript/openUrls.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="includes/javascript/profile.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/getSysInfo.js"></script>
+	<script type="text/javascript" src="${lams}loadVars.jsp"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/openUrls.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/profile.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function () {
 			//update dialog's height and title
@@ -76,7 +76,7 @@
 					<div align="center">
 						<input class="btn btn-sm btn-default offset5" type="button"
 							value="<fmt:message key="label.return.to.myprofile" />"
-							onclick="javascript:document.location='index/profile.do'" />
+							onclick="javascript:document.location='<lams:LAMSURL/>index.do?redirect=profile'" />
 					</div>
 
 				</div>
Index: lams_central/web/lti/addLesson.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/lti/addLesson.jsp	(.../addLesson.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/lti/addLesson.jsp	(.../addLesson.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -73,9 +73,8 @@
 		tree.setDynamicLoad(function(node, callback){
 			// load subfolder contents
 			$.ajax({
-				url : LAMS_URL + 'home.do',
+				url : LAMS_URL + 'home/getFolderContents.do',
 				data : {
-					'method' : 'getFolderContents',
 					'folderID' : node.data.folderID
 				},
 				cache : false,
@@ -128,9 +127,8 @@
 		
 		// initialize, create and enter the preview lesson
 		$.ajax({
-			url : LAMS_URL + 'monitoring/monitoring.do',
+			url : LAMS_URL + 'monitoring/monitoring/initializeLesson.do',
 			data : {
-				'method' : 'initializeLesson',
 				'learningDesignID' : ldId,
 				'copyType' : 3,
 				'lessonName' : "<fmt:message key='authoring.fla.preview.lesson.default.title' />"
@@ -144,16 +142,15 @@
 				}
 				
 				$.ajax({
-					url : LAMS_URL + 'monitoring/monitoring.do',
+					url : LAMS_URL + 'monitoring/monitoring/startPreviewLesson.do',
 					data : {
-						'method' : 'startPreviewLesson',
 						'lessonID' : lessonID
 					},
 					cache : false,
 					dataType : 'text',
 					success : function() {
 						// open preview pop up window
-						window.open(LAMS_URL + 'home.do?method=learner&mode=preview&lessonID='+lessonID,'Preview',
+						window.open(LAMS_URL + 'home/learner.do?mode=preview&lessonID='+lessonID,'Preview',
 									'width=920,height=700,resizable,scrollbars=yes,status=yes');
 					}
 				});
@@ -198,7 +195,7 @@
 <lams:Page type="learner" title="${titlePage}">
 		
 	<%-- Form to Collect ID of Selected LAMS Sequence --%>
-    <form name="lessonForm" id="lesson-form" action="lti.do?method=startLesson" method="post" onSubmit="return confirmSubmit();">
+    <form name="lessonForm" id="lesson-form" action="lti/startLesson.do" method="post" onSubmit="return confirmSubmit();">
     	<input type="hidden" name="oauth_consumer_key" value="${oauth_consumer_key}">
     	<input type="hidden" name="resource_link_id" value="${resource_link_id}">
         <input type="hidden" name="courseId" value="${courseId}">
Index: lams_central/web/lti/learnerMonitor.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/lti/learnerMonitor.jsp	(.../learnerMonitor.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/lti/learnerMonitor.jsp	(.../learnerMonitor.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -50,7 +50,7 @@
     
 		<c:if test="${isDisplayDesignImage}">
 			<div id="sequence-preview">
-				<img src="<lams:LAMSURL/>home.do?method=getLearningDesignThumbnail&ldId=${ldId}" alt="Sequence Preview" />
+				<img src="<lams:LAMSURL/>home/getLearningDesignThumbnail.do?ldId=${ldId}" alt="Sequence Preview" />
 			</div>
 		</c:if>
     
Index: lams_central/web/main.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/main.jsp	(.../main.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -6,6 +6,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-function" prefix="fn"%>
 <%@ taglib uri="tags-tiles" prefix="tiles" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
 
 <!DOCTYPE html>
 <lams:html>
@@ -20,22 +21,22 @@
 	<link rel="stylesheet" href="/lams/css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="/lams/css/bootstrap-tour.min.css" type="text/css" media="screen">
 
-	<script type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
-	<script type="text/javascript" src="loadVars.jsp"></script>
-	<script type="text/javascript" src="includes/javascript/openUrls.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.blockUI.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.tablesorter.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.tablesorter-pager.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.tablesorter-widgets.js"></script> 	
-	<script type="text/javascript" src="includes/javascript/jquery.dialogextend.js"></script>	
-	<script type="text/javascript" src="includes/javascript/dialog.js"></script>
-	<script type="text/javascript" src="includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="includes/javascript/bootstrap-tour.min.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.ui.touch-punch.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.slimscroll.js"></script>
-	<script type="text/javascript" src="includes/javascript/main.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/getSysInfo.js"></script>
+	<script type="text/javascript" src="${lams}loadVars.jsp"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/openUrls.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script> 	
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.dialogextend.js"></script>	
+	<script type="text/javascript" src="${lams}includes/javascript/dialog.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap-tour.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.ui.touch-punch.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.slimscroll.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/main.js"></script>
 	<script type="text/javascript">
 		var LAMS_URL = '<lams:LAMSURL/>',	
 			decoderDiv = $('<div />'),
@@ -238,7 +239,7 @@
 					</c:forEach>
 							                  
 					<li>
-						<a href="#nogo" onclick="javascript:closeAllChildren(); document.location.href='home.do?method=logout'">
+						<a href="#nogo" onclick="javascript:closeAllChildren(); document.location.href='home/logout.do?'">
 							<i class="fa fa-sign-out"></i> <fmt:message key="index.logout" />
 						</a>
 					</li>
Index: lams_central/web/msgContent.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/msgContent.jsp	(.../msgContent.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/msgContent.jsp	(.../msgContent.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -4,16 +4,16 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<c:set var="lams"><lams:LAMSURL/></c:set>
 
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
-	<base src="<lams:WebAppURL />"/>
 	<title><fmt:message key ="heading.general.error" /></title>
 	<lams:css/>
 	<script language="JavaScript" type="text/JavaScript" src="<lams:WebAppURL />includes/javascript/changeStyle.js"></script>
-	<script language="JavaScript" type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
-	<script language="JavaScript" type="text/javascript" src="includes/javascript/openUrls.js"></script>
+	<script language="JavaScript" type="text/javascript" src="${lams}includes/javascript/getSysInfo.js"></script>
+	<script language="JavaScript" type="text/javascript" src="${lams}includes/javascript/openUrls.js"></script>
 	<link rel="icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 </lams:head>
Index: lams_central/web/notificationsprivate.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/notificationsprivate.jsp	(.../notificationsprivate.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/notificationsprivate.jsp	(.../notificationsprivate.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -32,9 +32,8 @@
 	function markPrivateNotificationAsRead(subscriptionUid){
 		$.ajax({
 			cache : false,
-			url : LAMS_URL + "notification.do",
+			url : LAMS_URL + "notification/markNotificationAsRead.do",
 			data : {
-				'method' 		  : 'markNotificationAsRead',
 				'subscriptionUid' : subscriptionUid
 			},
 			success : function() {
@@ -64,10 +63,9 @@
 													 .appendTo(headerRow);
 		$.ajax({
 			cache : false,
-			url : LAMS_URL + "notification.do",
+			url : LAMS_URL + "notification/getNotificationSubscriptions.do",
 			dataType : 'json',
 			data : {
-				'method' : 'getNotificationSubscriptions',
 				'limit'  : 30
 			},
 			success : function(notifications) {
Index: lams_central/web/orgGroup.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/orgGroup.jsp	(.../orgGroup.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/orgGroup.jsp	(.../orgGroup.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%@ page import="org.lamsfoundation.lams.util.Configuration" %>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
@@ -14,19 +15,19 @@
 <lams:html>
 <lams:head>
 	<lams:css/>
-	<link rel="stylesheet" href="css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="css/orgGroup.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="${lams}css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="${lams}css/orgGroup.css" type="text/css" media="screen" />
 
 	<c:set var="lessonMode" value="${not empty param.activityID}" />
 
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.cookie.js"></script>
-	<script type="text/javascript" src="includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="includes/javascript/dialog.js"></script>
-	<script type="text/javascript" src="includes/javascript/orgGroup.js"></script>
-	<script type="text/javascript" src="includes/javascript/portrait.js"></script>
-	<script type="text/javascript" src="includes/javascript/upload.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.cookie.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/dialog.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/orgGroup.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
 	<script type="text/javascript">;
 		var grouping = ${grouping},
 			organisationId = grouping.organisationId,
Index: lams_central/web/orgGrouping.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/orgGrouping.jsp	(.../orgGrouping.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/orgGrouping.jsp	(.../orgGrouping.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -2,22 +2,22 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-
+<c:set var="lams"><lams:LAMSURL/></c:set>
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
 	<lams:css/>
-	<link rel="stylesheet" href="css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="css/orgGrouping.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="${lams}css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="${lams}css/orgGrouping.css" type="text/css" media="screen" />
 	
 	<c:set var="lessonMode" value="${not empty param.activityID}" />
 	<c:set var="groupingMethod" value="${usedForBranching eq true ? 'openGroupMappingDialog' : 'viewGroups'}" />
 	
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="includes/javascript/orgGrouping.js"></script>
-	<script type="text/javascript" src="includes/javascript/dialog.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/orgGrouping.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/dialog.js"></script>
 	<script type="text/javascript">
 		var groupingActivityId = '${param.activityID}',
 			lessonMode = ${lessonMode},
Index: lams_central/web/passwordChangeContent.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -14,15 +14,16 @@
 <c:set var="mustHaveLowercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%></c:set>
 <c:set var="mustHaveNumerics"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%></c:set>
 <c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
+<c:set var="lams"><lams:LAMSURL/></c:set>
 	
 <lams:html>
 <lams:head>
 	<lams:css/>
 
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="includes/javascript/profile.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.validate.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/profile.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.validate.js"></script>
 	<script type="text/javascript">
 		 var mustHaveUppercase = ${mustHaveUppercase},
 	     mustHaveNumerics  = ${mustHaveNumerics},
@@ -130,7 +131,7 @@
 					<div class="panel-body">
 					<input type="hidden" name="redirectURL" value="${param.redirectURL}" />
 							<form:hidden name="<%=PasswordChangeActionForm.formName%>"
-								property="login" />
+								path="login" />
 							<div class="form-group">
 								<label for="oldPassword"><fmt:message key="label.password.old.password" />:</label>
 								<input class="form-control" type="password" maxlength="50" placeholder="<fmt:message key="label.password.old.password" />" name="oldPassword" id="oldPassword"/>			
Index: lams_central/web/portrait.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -221,7 +221,7 @@
 
 		<c:if test="${!param.isReturnButtonHidden}">
 			<div align="right">
-				<a class="btn btn-sm btn-file btn-default offset5" role="button" href="<c:url value='/index.do'/>?method=profile">
+				<a class="btn btn-sm btn-file btn-default offset5" role="button" href="<c:url value='/index.do?redirect=profile'/>">
 					<fmt:message key="label.return.to.myprofile" />
 				</a>
 			</div>
Index: lams_central/web/profile.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/profile.jsp	(.../profile.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/profile.jsp	(.../profile.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -8,14 +8,16 @@
 	import="org.lamsfoundation.lams.util.Configuration"
 	import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 <c:set var="showAllMyLessonLink"><%=Configuration.get(ConfigurationKeys.SHOW_ALL_MY_LESSON_LINK)%></c:set>
+<c:set var="lams"><lams:LAMSURL/></c:set>
 
 <lams:html>
 <lams:head>
 	<lams:css/>
 	
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="includes/javascript/profile.js"></script>
+	
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/profile.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function () {
 			//update dialog's height and title
@@ -59,7 +61,7 @@
 					<!-- Split button -->
 					<div class="col-xs-12 text-center">
 						<a class="btn btn-sm btn-default offset5"
-							href="index/editprofile.do" role="button"><i
+							href="<lams:LAMSURL/>index.do?redirect=editprofile" role="button"><i
 							class="fa fa-fw fa-pencil"></i> <span class="hidden-xs"><fmt:message
 									key="title.profile.edit.screen" /></span></i>
 						</a>&nbsp;&nbsp;
@@ -71,7 +73,7 @@
 						<c:if test="${authenticationMethodId eq dbId}">
 
 							<a class="btn btn-sm btn-default offset5"
-								href="index/password.do?redirectURL=index.do%3Fstate%3Dactive%26method%3Dprofile" role="button">
+								href="<lams:LAMSURL/>index.do?redirect=password&redirectURL=index.do%3Fstate%3Dactive%26method%3Dprofile" role="button">
 									<i class="fa fa-fw fa-lock"></i> 
 										<span class="hidden-xs"><fmt:message
 											key="title.password.change.screen" />
@@ -80,14 +82,14 @@
 							</a>
 						</c:if>
 						<a class="btn btn-sm btn-default offset5"
-							href="index/portrait.do" role="button">
+							href="<lams:LAMSURL/>index.do?redirect=portrait" role="button">
 							<i class="fa fa-fw fa-camera"></i> <span class="hidden-xs"><fmt:message
 									key="title.portrait.change.screen" /></span></i>
 						</a>&nbsp;&nbsp;
 
 						<c:if test="${showAllMyLessonLink}">
 							<a class="btn btn-sm btn-default offset5"
-								href="index/lessons.do" role="button">
+								href="<lams:LAMSURL/>index.do?redirect=lessons" role="button">
 								<i class="fa fa-fw fa-book"></i> <span class="hidden-xs"><fmt:message
 										key="title.all.my.lessons" /></span>
 								</i>
Index: lams_central/web/signup/successfulSignup.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/signup/successfulSignup.jsp	(.../successfulSignup.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/signup/successfulSignup.jsp	(.../successfulSignup.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -9,7 +9,6 @@
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
-	<base href="<lams:WebAppURL />"/>
 	<title><fmt:message key="title.lams.signup" /></title>
 	<lams:css/>
 	<script language="JavaScript" type="text/JavaScript" src="<lams:WebAppURL />includes/javascript/changeStyle.js"></script>
Index: lams_central/web/twoFactorAuthSecret.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_central/web/twoFactorAuthSecret.jsp	(.../twoFactorAuthSecret.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/twoFactorAuthSecret.jsp	(.../twoFactorAuthSecret.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -2,9 +2,7 @@
 
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-logic" prefix="logic"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
Index: lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
===================================================================
diff -u -r2e48a918c22150864aacb792f64f3103f61d3200 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java	(.../LoginRequestDispatcher.java)	(revision 2e48a918c22150864aacb792f64f3103f61d3200)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java	(.../LoginRequestDispatcher.java)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -94,11 +94,11 @@
 
     private static final String URL_DEFAULT = "/index.jsp";
 
-    private static final String URL_AUTHOR = "/home.do?method=author";
+    private static final String URL_AUTHOR = "/home/author.do";
 
     private static final String URL_LEARNER = "/home/learner.do?lessonID=";
 
-    private static final String URL_MONITOR = "/home.do?method=monitorLesson&lessonID=";
+    private static final String URL_MONITOR = "/home/monitorLesson&lessonID=.do?lessonID=";
 
     private static final String URL_GRADEBOOK = "/services/Gradebook?";
 
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -r6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -134,43 +134,7 @@
 	</error-page>
 
 	<jsp-config>
-
 		<!-- ======================================================== -->
-		<!-- Struts Tag Library Descriptors -->
-		<!-- ======================================================== -->
-		<taglib>
-			<taglib-uri>tags-bean</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-bean-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles-el.tld</taglib-location>
-		</taglib>
-		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
 		<taglib>
Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0e9eca8da006863730e793b75a47803bc6142c67
--- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
@@ -212,191 +212,6 @@
 
    </tag>
 
-  	<tag>
-		<name>STRUTS-textarea</name>
-		<tag-class>org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag</tag-class>
-		<body-content>empty</body-content>
-		<attribute>
-			<name>accesskey</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>alt</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>altKey</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>bundle</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>cols</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>disabled</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>errorKey</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>errorStyle</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>errorStyleClass</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>errorStyleId</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>index</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>indexed</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>name</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onblur</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onchange</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onclick</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>ondblclick</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onfocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onkeydown</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onkeypress</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onkeyup</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmousedown</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmousemove</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmouseout</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmouseover</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmouseup</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>property</name>
-			<required>true</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>readonly</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>rows</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>style</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>styleClass</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>styleId</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>tabindex</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>title</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>titleKey</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>value</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-	</tag>
 	
 	<tag>
       <description>Small portrait of a user</description>