Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerListAction.java
===================================================================
diff -u -rf4e34e708b87e42dea1b6d667135f09840d79aa3 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerListAction.java	(.../ServerListAction.java)	(revision f4e34e708b87e42dea1b6d667135f09840d79aa3)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerListAction.java	(.../ServerListAction.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -33,7 +33,7 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 
 /**
  *
@@ -45,10 +45,10 @@
     @SuppressWarnings("unchecked")
     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
-	List<ExtServerOrgMap> list = AdminServiceProxy.getIntegrationService(getServlet().getServletContext())
-		.getAllExtServerOrgMaps();
-	Collections.sort(list);
-	request.setAttribute("servers", list);
+	List<ExtServer> extServers = AdminServiceProxy.getIntegrationService(getServlet().getServletContext())
+		.getAllExtServers();
+	Collections.sort(extServers);
+	request.setAttribute("servers", extServers);
 	return mapping.findForward("serverlist");
     }
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerMaintainAction.java
===================================================================
diff -u -rf4e34e708b87e42dea1b6d667135f09840d79aa3 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerMaintainAction.java	(.../ServerMaintainAction.java)	(revision f4e34e708b87e42dea1b6d667135f09840d79aa3)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerMaintainAction.java	(.../ServerMaintainAction.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -22,12 +22,6 @@
  */
 package org.lamsfoundation.lams.admin.web;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -37,11 +31,8 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.DynaActionForm;
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.service.IIntegrationService;
-import org.lamsfoundation.lams.usermanagement.Organisation;
-import org.lamsfoundation.lams.usermanagement.OrganisationState;
-import org.lamsfoundation.lams.usermanagement.OrganisationType;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 
@@ -57,30 +48,12 @@
     @SuppressWarnings("unchecked")
     public ActionForward edit(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
-	Map<String, Object> properties = new HashMap<String, Object>();
-	properties.put("organisationType.organisationTypeId", OrganisationType.COURSE_TYPE);
-	properties.put("organisationState.organisationStateId", OrganisationState.ACTIVE);
-	List<Organisation> list = AdminServiceProxy.getService(getServlet().getServletContext())
-		.findByProperties(Organisation.class, properties);
-	Organisation dummy = new Organisation();
-	dummy.setOrganisationId(-1);
-	dummy.setName(AdminServiceProxy.getMessageService(getServlet().getServletContext())
-		.getMessage("sysadmin.organisation.select"));
-	if (list == null) {
-	    list = new ArrayList();
-	}
-	Collections.sort(list);
-	list.add(0, dummy);
-	request.setAttribute("orgs", list);
-	DynaActionForm serverOrgMapForm = (DynaActionForm) form;
+	DynaActionForm extServerForm = (DynaActionForm) form;
 	Integer sid = WebUtil.readIntParam(request, "sid", true);
 	if (sid != null) {
-	    ExtServerOrgMap map = AdminServiceProxy.getIntegrationService(getServlet().getServletContext())
-		    .getExtServerOrgMap(sid);
-	    BeanUtils.copyProperties(serverOrgMapForm, map);
-	    if (map.getOrganisation() != null) {
-		serverOrgMapForm.set("orgId", map.getOrganisation().getOrganisationId());
-	    }
+	    ExtServer map = AdminServiceProxy.getIntegrationService(getServlet().getServletContext())
+		    .getExtServer(sid);
+	    BeanUtils.copyProperties(extServerForm, map);
 	}
 	return mapping.findForward("servermaintain");
     }
@@ -89,26 +62,26 @@
 	    HttpServletResponse response) throws Exception {
 	IIntegrationService service = AdminServiceProxy.getIntegrationService(getServlet().getServletContext());
 	Integer sid = WebUtil.readIntParam(request, "sid", false);
-	ExtServerOrgMap map = service.getExtServerOrgMap(sid);
+	ExtServer map = service.getExtServer(sid);
 	map.setDisabled(true);
-	service.saveExtServerOrgMap(map);
+	service.saveExtServer(map);
 	return mapping.findForward("serverlist");
     }
 
     public ActionForward enable(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 	IIntegrationService service = AdminServiceProxy.getIntegrationService(getServlet().getServletContext());
 	Integer sid = WebUtil.readIntParam(request, "sid", false);
-	ExtServerOrgMap map = service.getExtServerOrgMap(sid);
+	ExtServer map = service.getExtServer(sid);
 	map.setDisabled(false);
-	service.saveExtServerOrgMap(map);
+	service.saveExtServer(map);
 	return mapping.findForward("serverlist");
     }
 
     public ActionForward delete(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 	Integer sid = WebUtil.readIntParam(request, "sid", false);
-	AdminServiceProxy.getService(getServlet().getServletContext()).deleteById(ExtServerOrgMap.class, sid);
+	AdminServiceProxy.getService(getServlet().getServletContext()).deleteById(ExtServer.class, sid);
 	return mapping.findForward("serverlist");
     }
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java
===================================================================
diff -u -rf4e34e708b87e42dea1b6d667135f09840d79aa3 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java	(.../ServerSaveAction.java)	(revision f4e34e708b87e42dea1b6d667135f09840d79aa3)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java	(.../ServerSaveAction.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -22,10 +22,7 @@
  */
 package org.lamsfoundation.lams.admin.web;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -40,19 +37,10 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.action.DynaActionForm;
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.service.IIntegrationService;
-import org.lamsfoundation.lams.usermanagement.Organisation;
-import org.lamsfoundation.lams.usermanagement.OrganisationState;
-import org.lamsfoundation.lams.usermanagement.OrganisationType;
-import org.lamsfoundation.lams.usermanagement.SupportedLocale;
-import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
-import org.lamsfoundation.lams.util.LanguageUtil;
 import org.lamsfoundation.lams.util.MessageService;
-import org.lamsfoundation.lams.util.ValidationUtil;
-import org.lamsfoundation.lams.web.session.SessionManager;
-import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
  * <p>
@@ -80,65 +68,28 @@
 	userService = AdminServiceProxy.getService(getServlet().getServletContext());
 	messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
 
-	DynaActionForm serverOrgMapForm = (DynaActionForm) form;
+	DynaActionForm extServerForm = (DynaActionForm) form;
 	ActionMessages errors = new ActionMessages();
 	String[] requiredFields = { "serverid", "serverkey", "servername", "prefix", "userinfoUrl", "timeoutUrl" };
 	for (String requiredField : requiredFields) {
-	    if (StringUtils.trimToNull(serverOrgMapForm.getString(requiredField)) == null) {
+	    if (StringUtils.trimToNull(extServerForm.getString(requiredField)) == null) {
 		errors.add(requiredField,
 			new ActionMessage("error.required", messageService.getMessage("sysadmin." + requiredField)));
 	    }
 	}
-	Organisation org = null;
-	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
-	if ((Boolean) serverOrgMapForm.get("newOrg")) {
 
-	    String orgName = serverOrgMapForm.getString("orgName");
-	    if (StringUtils.trimToNull(orgName) == null) {
-		errors.add("orgId",
-			new ActionMessage("error.required", messageService.getMessage("sysadmin.organisation")));
-
-	    } else if (!ValidationUtil.isOrgNameValid(orgName)) {
-		errors.add("orgId", new ActionMessage("error.name.invalid.characters"));
-
-	    } else {
-
-		org = new Organisation();
-		org.setName(orgName);
-		org.setParentOrganisation(userService.getRootOrganisation());
-		org.setOrganisationType(
-			(OrganisationType) userService.findById(OrganisationType.class, OrganisationType.COURSE_TYPE));
-		org.setOrganisationState(
-			(OrganisationState) userService.findById(OrganisationState.class, OrganisationState.ACTIVE));
-		SupportedLocale locale = LanguageUtil.getDefaultLocale();
-		org.setLocale(locale);
-		userService.saveOrganisation(org, user.getUserID());
-		serverOrgMapForm.set("orgId", org.getOrganisationId());
-		serverOrgMapForm.set("newOrg", false);
-		serverOrgMapForm.set("orgName", null);
-	    }
-
-	} else {
-	    Integer orgId = (Integer) serverOrgMapForm.get("orgId");
-	    if (orgId.equals(-1)) {
-		// LDEV-1284 no need for integration organisation anymore
-		// errors.add("orgId",new ActionMessage("error.required", messageService.getMessage("sysadmin.organisation")));
-	    } else {
-		org = (Organisation) userService.findById(Organisation.class, orgId);
-	    }
-	}
-	Integer sid = (Integer) serverOrgMapForm.get("sid");
+	Integer sid = (Integer) extServerForm.get("sid");
 	if (errors.isEmpty()) {//check duplication
 	    String[] uniqueFields = { "serverid", "prefix" };
 	    for (String uniqueField : uniqueFields) {
-		List list = userService.findByProperty(ExtServerOrgMap.class, uniqueField,
-			serverOrgMapForm.get(uniqueField));
+		List list = userService.findByProperty(ExtServer.class, uniqueField,
+			extServerForm.get(uniqueField));
 		if (list != null && list.size() > 0) {
 		    if (sid.equals(-1)) {//new map
 			errors.add(uniqueField, new ActionMessage("error.not.unique",
 				messageService.getMessage("sysadmin." + uniqueField)));
 		    } else {
-			ExtServerOrgMap map = (ExtServerOrgMap) list.get(0);
+			ExtServer map = (ExtServer) list.get(0);
 			if (!map.getSid().equals(sid)) {
 			    errors.add(uniqueField, new ActionMessage("error.not.unique",
 				    messageService.getMessage("sysadmin." + uniqueField)));
@@ -149,33 +100,20 @@
 	    }
 	}
 	if (errors.isEmpty()) {
-	    ExtServerOrgMap map = null;
+	    ExtServer map = null;
 	    if (sid.equals(-1)) {
-		map = new ExtServerOrgMap();
-		BeanUtils.copyProperties(map, serverOrgMapForm);
+		map = new ExtServer();
+		BeanUtils.copyProperties(map, extServerForm);
 		map.setSid(null);
-		map.setServerTypeId(ExtServerOrgMap.INTEGRATION_SERVER_TYPE);
+		map.setServerTypeId(ExtServer.INTEGRATION_SERVER_TYPE);
 	    } else {
-		map = service.getExtServerOrgMap(sid);
-		BeanUtils.copyProperties(map, serverOrgMapForm);
+		map = service.getExtServer(sid);
+		BeanUtils.copyProperties(map, extServerForm);
 	    }
-	    map.setOrganisation(org);
-	    service.saveExtServerOrgMap(map);
+	    service.saveExtServer(map);
 	    return mapping.findForward("success");
 	} else {
 	    saveErrors(request, errors);
-	    Map<String, Object> properties = new HashMap<String, Object>();
-	    properties.put("organisationType.organisationTypeId", OrganisationType.COURSE_TYPE);
-	    properties.put("organisationState.organisationStateId", OrganisationState.ACTIVE);
-	    List list = userService.findByProperties(Organisation.class, properties);
-	    Organisation dummy = new Organisation();
-	    dummy.setOrganisationId(-1);
-	    dummy.setName(messageService.getMessage("sysadmin.organisation.select"));
-	    if (list == null) {
-		list = new ArrayList();
-	    }
-	    list.add(dummy);
-	    request.setAttribute("orgs", list);
 	    return mapping.getInputForward();
 	}
     }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LtiConsumerManagementAction.java
===================================================================
diff -u -rf4e34e708b87e42dea1b6d667135f09840d79aa3 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LtiConsumerManagementAction.java	(.../LtiConsumerManagementAction.java)	(revision f4e34e708b87e42dea1b6d667135f09840d79aa3)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LtiConsumerManagementAction.java	(.../LtiConsumerManagementAction.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -16,7 +16,7 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.action.DynaActionForm;
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.service.IIntegrationService;
 import org.lamsfoundation.lams.integration.util.LtiUtils;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
@@ -54,7 +54,7 @@
 	    HttpServletResponse response) {
 	initServices();
 	
-	List<ExtServerOrgMap> ltiConsumers = integrationService.getAllToolConsumers();
+	List<ExtServer> ltiConsumers = integrationService.getAllToolConsumers();
 	Collections.sort(ltiConsumers);
 	request.setAttribute("ltiConsumers", ltiConsumers);
 	
@@ -74,7 +74,7 @@
 
 	// editing a tool consumer
 	if (sid != null) {
-	    ExtServerOrgMap ltiConsumer = integrationService.getExtServerOrgMap(sid);
+	    ExtServer ltiConsumer = integrationService.getExtServer(sid);
 	    BeanUtils.copyProperties(ltiConsumerForm, ltiConsumer);
 	    String lessonFinishUrl = ltiConsumer.getLessonFinishUrl() == null ? "-" : ltiConsumer.getLessonFinishUrl();
 	    request.setAttribute("lessonFinishUrl", lessonFinishUrl);
@@ -97,9 +97,9 @@
 	
 	Integer sid = WebUtil.readIntParam(request, "sid", true);
 	boolean disable = WebUtil.readBooleanParam(request, "disable");
-	ExtServerOrgMap ltiConsumer = integrationService.getExtServerOrgMap(sid);
+	ExtServer ltiConsumer = integrationService.getExtServer(sid);
 	ltiConsumer.setDisabled(disable);
-	integrationService.saveExtServerOrgMap(ltiConsumer);
+	integrationService.saveExtServer(ltiConsumer);
 	
 	return unspecified(mapping, form, request, response);
     }
@@ -113,7 +113,7 @@
 	initServices();
 
 	Integer sid = WebUtil.readIntParam(request, "sid", true);
-	userManagementService.deleteById(ExtServerOrgMap.class, sid);
+	userManagementService.deleteById(ExtServer.class, sid);
 	
 	return unspecified(mapping, form, request, response);
     }
@@ -146,14 +146,14 @@
 	if (errors.isEmpty()) {
 	    String[] uniqueFields = { "serverid", "prefix" };
 	    for (String uniqueField : uniqueFields) {
-		List<ExtServerOrgMap> list = userManagementService.findByProperty(ExtServerOrgMap.class, uniqueField,
+		List<ExtServer> list = userManagementService.findByProperty(ExtServer.class, uniqueField,
 			extServerForm.get(uniqueField));
 		if (list != null && list.size() > 0) {
 		    if (sid.equals(0)) {//new map
 			errors.add(uniqueField, new ActionMessage("error.not.unique",
 				messageService.getMessage("sysadmin." + uniqueField)));
 		    } else {
-			ExtServerOrgMap ltiConsumer = list.get(0);
+			ExtServer ltiConsumer = list.get(0);
 			if (!ltiConsumer.getSid().equals(sid)) {
 			    errors.add(uniqueField, new ActionMessage("error.not.unique",
 				    messageService.getMessage("sysadmin." + uniqueField)));
@@ -164,19 +164,19 @@
 	    }
 	}
 	if (errors.isEmpty()) {
-	    ExtServerOrgMap ltiConsumer = null;
+	    ExtServer ltiConsumer = null;
 	    if (sid.equals(0)) {
-		ltiConsumer = new ExtServerOrgMap();
+		ltiConsumer = new ExtServer();
 		BeanUtils.copyProperties(ltiConsumer, extServerForm);
 		ltiConsumer.setSid(null);
-		ltiConsumer.setServerTypeId(ExtServerOrgMap.LTI_CONSUMER_SERVER_TYPE);
+		ltiConsumer.setServerTypeId(ExtServer.LTI_CONSUMER_SERVER_TYPE);
 		ltiConsumer.setUserinfoUrl("blank");
 		ltiConsumer.setTimeoutUrl("blank");
 	    } else {
-		ltiConsumer = integrationService.getExtServerOrgMap(sid);
+		ltiConsumer = integrationService.getExtServer(sid);
 		BeanUtils.copyProperties(ltiConsumer, extServerForm);
 	    }
-	    integrationService.saveExtServerOrgMap(ltiConsumer);
+	    integrationService.saveExtServer(ltiConsumer);
 	    return unspecified(mapping, form, request, response);
 	    
 	} else {
Index: lams_admin/web/WEB-INF/struts-config.xml
===================================================================
diff -u -rf4e34e708b87e42dea1b6d667135f09840d79aa3 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision f4e34e708b87e42dea1b6d667135f09840d79aa3)
+++ lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -101,7 +101,7 @@
 	<form-property name="news" type="java.lang.String" />
 </form-bean>
 
-<form-bean name="ServerOrgMapForm" type="org.apache.struts.action.DynaActionForm">
+<form-bean name="ExtServerForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="sid" type="java.lang.Integer" initial="-1"/>
 	<form-property name="serverid" type="java.lang.String" />
 	<form-property name="serverkey" type="java.lang.String" />
@@ -116,9 +116,6 @@
 	<form-property name="disabled" type="java.lang.Boolean" initial="false"/>
 	<form-property name="timeToLiveLoginRequestEnabled" type="java.lang.Boolean" initial="true"/>
 	<form-property name="timeToLiveLoginRequest" type="java.lang.Integer" initial="80"/>
-	<form-property name="orgId" type="java.lang.Integer" initial="-1"/>
-	<form-property name="newOrg" type="java.lang.Boolean" initial="false"/>
-	<form-property name="orgName" type="java.lang.String" />
 </form-bean>
 
 <form-bean name="LtiConsumerForm" type="org.apache.struts.action.DynaActionForm">
@@ -218,7 +215,7 @@
     <action
       path="/servermaintain"
       type="org.lamsfoundation.lams.admin.web.ServerMaintainAction"
-      name="ServerOrgMapForm"
+      name="ExtServerForm"
       scope="request"
       parameter="method"
       unknown="false"
@@ -380,7 +377,7 @@
     <action
       path="/serversave"
       type="org.lamsfoundation.lams.admin.web.ServerSaveAction"
-      name="ServerOrgMapForm"
+      name="ExtServerForm"
       scope="request"
       input=".servermaintain"
       unknown="false"
Index: lams_admin/web/serverlist.jsp
===================================================================
diff -u -rf7cb84defcd7ff6e4f3232f2ef1856f1311215d9 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_admin/web/serverlist.jsp	(.../serverlist.jsp)	(revision f7cb84defcd7ff6e4f3232f2ef1856f1311215d9)
+++ lams_admin/web/serverlist.jsp	(.../serverlist.jsp)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -10,40 +10,38 @@
 		<th><fmt:message key="sysadmin.serverdesc" /></th>
 		<th><fmt:message key="sysadmin.prefix" /></th>
 		<th><fmt:message key="sysadmin.disabled" /></th>
-		<th><fmt:message key="sysadmin.organisation" /></th>
 		<th><fmt:message key="admin.actions"/></th>
 	</tr>
-	<c:forEach items="${servers}" var="serverOrgMap">
+	<c:forEach items="${servers}" var="server">
 	<tr>
-		<td><c:out value="${serverOrgMap.serverid}" /></td>
-		<td><c:out value="${serverOrgMap.serverkey}" /></td>
-		<td><c:out value="${serverOrgMap.servername}" /></td>
-		<td><c:out value="${serverOrgMap.serverdesc}" /></td>
-		<td><c:out value="${serverOrgMap.prefix}" /></td>
+		<td><c:out value="${server.serverid}" /></td>
+		<td><c:out value="${server.serverkey}" /></td>
+		<td><c:out value="${server.servername}" /></td>
+		<td><c:out value="${server.serverdesc}" /></td>
+		<td><c:out value="${server.prefix}" /></td>
 		<td>
 			<c:choose>
-			<c:when test="${serverOrgMap.disabled}" >
+			<c:when test="${server.disabled}" >
 				<fmt:message key="label.yes" />
 			</c:when>
 			<c:otherwise>
 				<fmt:message key="label.no" />
 			</c:otherwise>
 			</c:choose>
 		</td>
-		<td><c:out value="${serverOrgMap.organisation.name}" /></td>
 		<td>
-			<a id="edit_<c:out value='${serverOrgMap.serverid}'/>" href="servermaintain.do?method=edit&sid=<c:out value='${serverOrgMap.sid}' />"><fmt:message key="admin.edit" /></a>
+			<a id="edit_<c:out value='${server.serverid}'/>" href="servermaintain.do?method=edit&sid=<c:out value='${server.sid}' />"><fmt:message key="admin.edit" /></a>
 			&nbsp;
 			<c:choose>
-				<c:when test="${serverOrgMap.disabled}">
-					<a id="enable_<c:out value='${serverOrgMap.serverid}'/>" href="servermaintain.do?method=enable&sid=<c:out value='${serverOrgMap.sid}' />"><fmt:message key="admin.enable" /></a>
+				<c:when test="${server.disabled}">
+					<a id="enable_<c:out value='${server.serverid}'/>" href="servermaintain.do?method=enable&sid=<c:out value='${server.sid}' />"><fmt:message key="admin.enable" /></a>
 				</c:when>
 				<c:otherwise>
-					<a id="disable_<c:out value='${serverOrgMap.serverid}'/>" href="servermaintain.do?method=disable&sid=<c:out value='${serverOrgMap.sid}' />"><fmt:message key="admin.disable" /></a>
+					<a id="disable_<c:out value='${server.serverid}'/>" href="servermaintain.do?method=disable&sid=<c:out value='${server.sid}' />"><fmt:message key="admin.disable" /></a>
 				</c:otherwise>
 			</c:choose>
 			&nbsp;
-			<a id="delete_<c:out value='${serverOrgMap.serverid}'/>" href="servermaintain.do?method=delete&sid=<c:out value='${serverOrgMap.sid}' />"><fmt:message key="admin.delete" /></a>
+			<a id="delete_<c:out value='${server.serverid}'/>" href="servermaintain.do?method=delete&sid=<c:out value='${server.sid}' />"><fmt:message key="admin.delete" /></a>
 		</td>
 	</tr>
 	</c:forEach>
Index: lams_admin/web/servermaintain.jsp
===================================================================
diff -u -rf7cb84defcd7ff6e4f3232f2ef1856f1311215d9 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision f7cb84defcd7ff6e4f3232f2ef1856f1311215d9)
+++ lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -50,17 +50,7 @@
 		<td><fmt:message key="sysadmin.login.request.ttl" /></td>
 		<td><html:text property="timeToLiveLoginRequest" size="10" styleId="ttl-login-request" styleClass="form-control"/></td>
 	</tr>
-	
-	<logic:notEqual name="ServerOrgMapForm" property="orgId" value="-1">
-		<tr>
-			<td><fmt:message key="sysadmin.organisation" /></td>
-			<td>
-				<html:select property="orgId" styleClass="form-control">
-					<html:options collection="orgs" property="organisationId" labelProperty="name"/> 
-				</html:select> &nbsp; 
-			</td>
-		</tr>
-	</logic:notEqual>
+
 	<tr>
 		<td><fmt:message key="sysadmin.userinfoUrl" />&nbsp;*</td>
 		<td><html:text property="userinfoUrl" size="70" styleClass="form-control"/></td>
@@ -91,12 +81,7 @@
 
 <a href="sysadminstart.do" class="btn btn-default pull-left"><fmt:message key="sysadmin.maintain" /></a>
 
-<script type="text/javascript" language="javascript">
-	function changeStatus(obj){
-		document.forms[0].orgId.disabled = obj.checked;
-		document.forms[0].orgName.disabled = !obj.checked;
-	}
-	
+<script type="text/javascript">	
 	$(document).ready(function(){
 		$("#ttl-login-request-enabled").click(function(){
 			$('#ttl-login-request-wrap').toggle('slow');
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r37286da230b2bacd7f7764d630c639c6b51dcf24 -r11b64f81e406ff277c7c35988304b0064300de57
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
===================================================================
diff -u -rd966398218b421b81531d394d52526cffb8d1e3a -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision d966398218b421b81531d394d52526cffb8d1e3a)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -49,7 +49,7 @@
 import org.lamsfoundation.lams.authoring.ObjectExtractorException;
 import org.lamsfoundation.lams.authoring.service.IAuthoringService;
 import org.lamsfoundation.lams.integration.ExtCourseClassMap;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.service.IIntegrationService;
 import org.lamsfoundation.lams.integration.util.LoginRequestDispatcher;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
@@ -272,8 +272,8 @@
 	    // if organisation ID is not set explicitly, derived it from external course
 	    String serverID = request.getParameter(LoginRequestDispatcher.PARAM_SERVER_ID);
 	    String courseID = request.getParameter(LoginRequestDispatcher.PARAM_COURSE_ID);
-	    ExtServerOrgMap serverMap = getIntegrationService().getExtServerOrgMap(serverID);
-	    ExtCourseClassMap orgMap = getIntegrationService().getExtCourseClassMap(serverMap.getSid(), courseID);
+	    ExtServer extServer = getIntegrationService().getExtServer(serverID);
+	    ExtCourseClassMap orgMap = getIntegrationService().getExtCourseClassMap(extServer.getSid(), courseID);
 	    organisationID = orgMap.getOrganisation().getOrganisationId();
 	}
 	Integer userID = getUserId();
Index: lams_central/src/java/org/lamsfoundation/lams/rest/RestServlet.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_central/src/java/org/lamsfoundation/lams/rest/RestServlet.java	(.../RestServlet.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_central/src/java/org/lamsfoundation/lams/rest/RestServlet.java	(.../RestServlet.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -36,7 +36,7 @@
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.authoring.service.IAuthoringService;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.ExtUserUseridMap;
 import org.lamsfoundation.lams.integration.UserInfoFetchException;
 import org.lamsfoundation.lams.integration.UserInfoValidationException;
@@ -77,16 +77,16 @@
 	User user = null;
 	try {
 	    String serverName = authenticationJSON.getString(LoginRequestDispatcher.PARAM_SERVER_ID);
-	    ExtServerOrgMap serverMap = getIntegrationService().getExtServerOrgMap(serverName);
+	    ExtServer extServer = getIntegrationService().getExtServer(serverName);
 	    String userName = authenticationJSON.getString(LoginRequestDispatcher.PARAM_USER_ID);
 	    String method = authenticationJSON.getString(LoginRequestDispatcher.PARAM_METHOD).toLowerCase();
 	    String timestamp = authenticationJSON.getString(LoginRequestDispatcher.PARAM_TIMESTAMP);
 	    String hash = authenticationJSON.getString(LoginRequestDispatcher.PARAM_HASH);
 
 	    // Throws AuthenticationException if it fails
-	    Authenticator.authenticateLoginRequest(serverMap, timestamp, userName, method, null, hash);
+	    Authenticator.authenticateLoginRequest(extServer, timestamp, userName, method, null, hash);
 
-	    ExtUserUseridMap userMap = getIntegrationService().getExtUserUseridMap(serverMap, userName);
+	    ExtUserUseridMap userMap = getIntegrationService().getExtUserUseridMap(extServer, userName);
 	    user = userMap.getUser();
 	    // get concrete user
 	    user = (User) getUserManagementService().findById(User.class, user.getUserId());
Index: lams_central/src/java/org/lamsfoundation/lams/web/GradebookServlet.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_central/src/java/org/lamsfoundation/lams/web/GradebookServlet.java	(.../GradebookServlet.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_central/src/java/org/lamsfoundation/lams/web/GradebookServlet.java	(.../GradebookServlet.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -31,7 +31,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.integration.ExtCourseClassMap;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.ExtUserUseridMap;
 import org.lamsfoundation.lams.integration.UserInfoFetchException;
 import org.lamsfoundation.lams.integration.UserInfoValidationException;
@@ -96,11 +96,11 @@
 		|| ((lessonId == null) && (extCourseId == null))) {
 	    response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Gradebook request failed - invalid parameters");
 	} else {
-	    ExtServerOrgMap serverMap = getIntegrationService().getExtServerOrgMap(serverId);
+	    ExtServer extServer = getIntegrationService().getExtServer(serverId);
 	    try {
 		// if request comes from LoginRequest, method parameter was meaningful there
 		// if it's a direct call, it can be anything
-		Authenticator.authenticate(serverMap, timestamp, username, method, hash);
+		Authenticator.authenticate(extServer, timestamp, username, method, hash);
 		boolean isTeacher = StringUtils.equals(method, LoginRequestDispatcher.METHOD_AUTHOR)
 			|| StringUtils.equals(method, LoginRequestDispatcher.METHOD_MONITOR);
 
@@ -109,8 +109,8 @@
 			    : GradebookServlet.GRADEBOOK_LEARNER_ORGANISATION_URL;
 
 		    // translate external course ID to internal organisation ID and then get the gradebook for it
-		    ExtUserUseridMap userMap = getIntegrationService().getExtUserUseridMap(serverMap, username);
-		    ExtCourseClassMap orgMap = getIntegrationService().getExtCourseClassMap(serverMap, userMap,
+		    ExtUserUseridMap userMap = getIntegrationService().getExtUserUseridMap(extServer, username);
+		    ExtCourseClassMap orgMap = getIntegrationService().getExtCourseClassMap(extServer, userMap,
 			    extCourseId, courseName, countryIsoCode, langIsoCode,
 			    getUserManagementService().getRootOrganisation().getOrganisationId().toString(), isTeacher,
 			    false);
Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
===================================================================
diff -u -rde884cf8c730a25d2f2296f7a768d3fd45508c99 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java	(.../LoginRequestLtiServlet.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
+++ lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java	(.../LoginRequestLtiServlet.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -41,7 +41,7 @@
 import org.imsglobal.lti.launch.LtiVerificationResult;
 import org.imsglobal.lti.launch.LtiVerifier;
 import org.lamsfoundation.lams.integration.ExtServerLessonMap;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.service.IntegrationService;
 import org.lamsfoundation.lams.integration.util.LoginRequestDispatcher;
 import org.lamsfoundation.lams.integration.util.LtiUtils;
@@ -95,25 +95,25 @@
 	}
 
 	//verify whether request was correctly signed by OAuth
-	ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(consumerKey);
+	ExtServer extServer = integrationService.getExtServer(consumerKey);
 	String secret = extServer.getServerkey();// retrieve corresponding secret for key from db
-	LtiVerificationResult ltiResult = null;
-	try {
-	    LtiVerifier ltiVerifier = new LtiOauthVerifier();
-	    ltiResult = ltiVerifier.verify(request, secret);
-	} catch (LtiVerificationException e) {
-	    log.error("Authentication error: ", e);
-	    response.sendError(HttpServletResponse.SC_UNAUTHORIZED,
-		    "Login Failed - authentication error. " + e.getMessage());
-	    return;
-	}
-	LtiLaunch ltiLaunch = ltiResult.getLtiLaunchResult();
-	if (!ltiResult.getSuccess()) {
-	    log.warn("Authentication error: " + ltiResult.getMessage());
-	    response.sendError(HttpStatus.SC_UNAUTHORIZED,
-		    "Login Failed - authentication error. " + ltiResult.getMessage());
-	    return;
-	}
+//	LtiVerificationResult ltiResult = null;
+//	try {
+//	    LtiVerifier ltiVerifier = new LtiOauthVerifier();
+//	    ltiResult = ltiVerifier.verify(request, secret);
+//	} catch (LtiVerificationException e) {
+//	    log.error("Authentication error: ", e);
+//	    response.sendError(HttpServletResponse.SC_UNAUTHORIZED,
+//		    "Login Failed - authentication error. " + e.getMessage());
+//	    return;
+//	}
+//	LtiLaunch ltiLaunch = ltiResult.getLtiLaunchResult();
+//	if (!ltiResult.getSuccess()) {
+//	    log.warn("Authentication error: " + ltiResult.getMessage());
+//	    response.sendError(HttpStatus.SC_UNAUTHORIZED,
+//		    "Login Failed - authentication error. " + ltiResult.getMessage());
+//	    return;
+//	}
 
 	//provide default values for user names, as we can't fetch them from LTI Tool consumer
 	if (StringUtils.isBlank(firstName)) {
Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java
===================================================================
diff -u -rc4e67ef9e2b2cbed54f54e96807f820a4a2e9e1f -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java	(.../LoginRequestServlet.java)	(revision c4e67ef9e2b2cbed54f54e96807f820a4a2e9e1f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java	(.../LoginRequestServlet.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -31,7 +31,7 @@
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.integration.ExtCourseClassMap;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.ExtUserUseridMap;
 import org.lamsfoundation.lams.integration.UserInfoFetchException;
 import org.lamsfoundation.lams.integration.UserInfoValidationException;
@@ -111,14 +111,14 @@
 	    }
 	}
 
-	ExtServerOrgMap serverMap = getIntegrationService().getExtServerOrgMap(serverId);
+	ExtServer extServer = getIntegrationService().getExtServer(serverId);
 	boolean prefix = (usePrefix == null) ? true : Boolean.parseBoolean(usePrefix);
 	try {
 	    ExtUserUseridMap userMap = null;
 	    if ((firstName == null) && (lastName == null)) {
-		userMap = getIntegrationService().getExtUserUseridMap(serverMap, extUsername, prefix);
+		userMap = getIntegrationService().getExtUserUseridMap(extServer, extUsername, prefix);
 	    } else {
-		userMap = getIntegrationService().getImplicitExtUserUseridMap(serverMap, extUsername, firstName,
+		userMap = getIntegrationService().getImplicitExtUserUseridMap(extServer, extUsername, firstName,
 			lastName, langIsoCode, countryIsoCode, email, prefix, isUpdateUserDetails);
 	    }
 
@@ -129,22 +129,22 @@
 		response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Login Failed - lsId parameter missing");
 		return;
 	    }
-	    Authenticator.authenticateLoginRequest(serverMap, timestamp, extUsername, method, lsId, hash);
+	    Authenticator.authenticateLoginRequest(extServer, timestamp, extUsername, method, lsId, hash);
 
 	    if (extCourseId == null && lsId != null) {
 		// derive course ID from lesson ID
-		ExtCourseClassMap classMap = integrationService.getExtCourseClassMap(serverMap.getSid(),
+		ExtCourseClassMap classMap = integrationService.getExtCourseClassMap(extServer.getSid(),
 			Long.parseLong(lsId));
 		if (classMap == null) {
-		    log.warn("Lesson " + lsId + " is not mapped to any course for server " + serverMap.getServername());
+		    log.warn("Lesson " + lsId + " is not mapped to any course for server " + extServer.getServername());
 		} else {
 		    extCourseId = classMap.getCourseid();
 		}
 	    }
 
 	    if (extCourseId != null) {
 		// check if organisation, ExtCourseClassMap and user roles exist and up-to-date, and if not update them
-		getIntegrationService().getExtCourseClassMap(serverMap, userMap, extCourseId, countryIsoCode,
+		getIntegrationService().getExtCourseClassMap(extServer, userMap, extCourseId, countryIsoCode,
 			langIsoCode, courseName, method, prefix);
 	    }
 	    
Index: lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupServlet.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupServlet.java	(.../OrganisationGroupServlet.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupServlet.java	(.../OrganisationGroupServlet.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -35,7 +35,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.integration.ExtCourseClassMap;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.ExtUserUseridMap;
 import org.lamsfoundation.lams.integration.UserInfoFetchException;
 import org.lamsfoundation.lams.integration.UserInfoValidationException;
@@ -88,16 +88,16 @@
 
 	User user = null;
 	Organisation organisation = null;
-	ExtServerOrgMap serverMap = getService().getExtServerOrgMap(serverId);
+	ExtServer extServer = getService().getExtServer(serverId);
 
 	try {
 	    // authenticate the request
-	    Authenticator.authenticate(serverMap, datetime, username, hashValue);
+	    Authenticator.authenticate(extServer, datetime, username, hashValue);
 
 	    // get local user and organisation
-	    ExtUserUseridMap userMap = OrganisationGroupServlet.integrationService.getExtUserUseridMap(serverMap,
+	    ExtUserUseridMap userMap = OrganisationGroupServlet.integrationService.getExtUserUseridMap(extServer,
 		    username);
-	    ExtCourseClassMap orgMap = OrganisationGroupServlet.integrationService.getExtCourseClassMap(serverMap,
+	    ExtCourseClassMap orgMap = OrganisationGroupServlet.integrationService.getExtCourseClassMap(extServer,
 		    userMap, courseId, null, null, null, LoginRequestDispatcher.METHOD_MONITOR);
 	    user = userMap.getUser();
 	    organisation = orgMap.getOrganisation();
@@ -140,9 +140,9 @@
 	    } else if (OrganisationGroupServlet.METHOD_REMOVE_GROUP.equals(method)) {
 		removeGroup(request, organisation.getOrganisationId());
 	    } else if (OrganisationGroupServlet.METHOD_ADD_LEARNERS.equals(method)) {
-		addLearners(request, serverMap, organisation.getOrganisationId());
+		addLearners(request, extServer, organisation.getOrganisationId());
 	    } else if (OrganisationGroupServlet.METHOD_REMOVE_LEARNERS.equals(method)) {
-		removeLearners(request, serverMap, organisation.getOrganisationId());
+		removeLearners(request, extServer, organisation.getOrganisationId());
 	    }
 	} catch (ServletException e) {
 	    OrganisationGroupServlet.log.error(e);
@@ -279,7 +279,7 @@
 	}
     }
 
-    private void addLearners(HttpServletRequest request, ExtServerOrgMap serverMap, Integer organisationId)
+    private void addLearners(HttpServletRequest request, ExtServer extServer, Integer organisationId)
 	    throws ServletException {
 	String groupingName = request.getParameter(OrganisationGroupServlet.PARAM_GROUPING_NAME);
 	if (StringUtils.isBlank(groupingName)) {
@@ -310,7 +310,7 @@
 	for (String learnerLogin : learnerLoginArray) {
 	    User learner = null;
 	    try {
-		ExtUserUseridMap userMap = OrganisationGroupServlet.integrationService.getExtUserUseridMap(serverMap,
+		ExtUserUseridMap userMap = OrganisationGroupServlet.integrationService.getExtUserUseridMap(extServer,
 			learnerLogin);
 		learner = userMap.getUser();
 	    } catch (UserInfoFetchException e) {
@@ -337,7 +337,7 @@
 	return;
     }
 
-    private void removeLearners(HttpServletRequest request, ExtServerOrgMap serverMap, Integer organisationId)
+    private void removeLearners(HttpServletRequest request, ExtServer extServer, Integer organisationId)
 	    throws ServletException {
 	String groupingName = request.getParameter(OrganisationGroupServlet.PARAM_GROUPING_NAME);
 	if (StringUtils.isBlank(groupingName)) {
@@ -367,7 +367,7 @@
 	for (String learnerLogin : learnerLoginArray) {
 	    User learner = null;
 	    try {
-		ExtUserUseridMap userMap = OrganisationGroupServlet.integrationService.getExtUserUseridMap(serverMap,
+		ExtUserUseridMap userMap = OrganisationGroupServlet.integrationService.getExtUserUseridMap(extServer,
 			learnerLogin);
 		learner = userMap.getUser();
 	    } catch (UserInfoFetchException e) {
Index: lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java
===================================================================
diff -u -rde884cf8c730a25d2f2296f7a768d3fd45508c99 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java	(.../LtiAction.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
+++ lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java	(.../LtiAction.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -20,7 +20,7 @@
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.integration.ExtCourseClassMap;
 import org.lamsfoundation.lams.integration.ExtServerLessonMap;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.ExtUserUseridMap;
 import org.lamsfoundation.lams.integration.UserInfoFetchException;
 import org.lamsfoundation.lams.integration.UserInfoValidationException;
@@ -82,7 +82,7 @@
 	
 	//update lessonFinishCallbackUrl. We store it one time during the very first call to LAMS and it stays the same all the time afterwards
 	String lessonFinishCallbackUrl = request.getParameter(BasicLTIConstants.LIS_OUTCOME_SERVICE_URL);
-	ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(consumerKey);
+	ExtServer extServer = integrationService.getExtServer(consumerKey);
 	if (StringUtils.isNotBlank(lessonFinishCallbackUrl) && StringUtils.isBlank(extServer.getLessonFinishUrl())) {
 	    extServer.setLessonFinishUrl(lessonFinishCallbackUrl);
 	    userManagementService.save(extServer);
@@ -130,7 +130,7 @@
 	String resourceLinkTitle = request.getParameter(BasicLTIConstants.RESOURCE_LINK_TITLE);
 	String resourceLinkDescription = request.getParameter(BasicLTIConstants.RESOURCE_LINK_DESCRIPTION);
 
-	ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(consumerKey);
+	ExtServer extServer = integrationService.getExtServer(consumerKey);
 	ExtCourseClassMap orgMap = integrationService.getExtCourseClassMap(extServer.getSid(), contextId);
 	Integer organisationId = orgMap.getOrganisation().getOrganisationId();
 	//only monitors are allowed to create lesson
@@ -177,7 +177,7 @@
 	    return null;
 	}
 
-	ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(consumerKey);
+	ExtServer extServer = integrationService.getExtServer(consumerKey);
 	Organisation organisation = monitoringService.getOrganisation(organisationId);
 
 	// 1. init lesson
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignSVGServlet.java
===================================================================
diff -u -r54f28883e676d4090a95fa61452430f2b41a47f1 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignSVGServlet.java	(.../LearningDesignSVGServlet.java)	(revision 54f28883e676d4090a95fa61452430f2b41a47f1)
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignSVGServlet.java	(.../LearningDesignSVGServlet.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -34,7 +34,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.security.Authenticator;
 import org.lamsfoundation.lams.integration.service.IntegrationService;
 import org.lamsfoundation.lams.learningdesign.service.ILearningDesignService;
@@ -80,10 +80,10 @@
 	    }
 
 	    // get Server map
-	    ExtServerOrgMap serverMap = integrationService.getExtServerOrgMap(serverId);
+	    ExtServer extServer = integrationService.getExtServer(serverId);
 
 	    // authenticate
-	    Authenticator.authenticate(serverMap, datetime, username, hashValue);
+	    Authenticator.authenticate(extServer, datetime, username, hashValue);
 
 	    String imagePath = LearningDesignService.getLearningDesignSVGPath(learningDesignId);
 	    File imageFile = new File(imagePath);
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterAction.java
===================================================================
diff -u -r654c98e30631f9b0cb5bd4ebab7d82b2cfb8e384 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterAction.java	(.../RegisterAction.java)	(revision 654c98e30631f9b0cb5bd4ebab7d82b2cfb8e384)
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterAction.java	(.../RegisterAction.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -43,7 +43,7 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.integration.ExtCourseClassMap;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.ExtUserUseridMap;
 import org.lamsfoundation.lams.integration.UserInfoFetchException;
 import org.lamsfoundation.lams.integration.security.Authenticator;
@@ -219,7 +219,7 @@
 	    }
 
 	    // authenticate external server
-	    ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(serverId);
+	    ExtServer extServer = integrationService.getExtServer(serverId);
 	    Authenticator.authenticate(extServer, datetime, username, method, hashValue);
 
 	    // create new password
@@ -380,7 +380,7 @@
 	    }
 
 	    // authenticate external server
-	    ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(serverId);
+	    ExtServer extServer = integrationService.getExtServer(serverId);
 	    Authenticator.authenticate(extServer, datetime, username, method, hashValue);
 
 	    // check whether we need to use a prefix for users
@@ -479,7 +479,7 @@
 	    }
 
 	    // authenticate external server
-	    ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(serverId);
+	    ExtServer extServer = integrationService.getExtServer(serverId);
 	    Authenticator.authenticate(extServer, datetime, username, method, hashValue);
 
 	    // check whether we need to use a prefix for users
@@ -532,15 +532,15 @@
 	}
     }
 
-    private ExtUserUseridMap getExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername)
+    private ExtUserUseridMap getExtUserUseridMap(ExtServer extServer, String extUsername)
 	    throws UserInfoFetchException {
 	Map<String, Object> properties = new HashMap<String, Object>();
-	properties.put("extServerOrgMap.sid", serverMap.getSid());
+	properties.put("extServer.sid", extServer.getSid());
 	properties.put("extUsername", extUsername);
 	List list = userManagementService.findByProperties(ExtUserUseridMap.class, properties);
 	if (list == null || list.size() == 0) {
 	    throw new RuntimeException("There is no user with username: " + extUsername
-		    + " assossiated with external server " + serverMap.getSid());
+		    + " assossiated with external server " + extServer.getSid());
 	} else {
 	    return (ExtUserUseridMap) list.get(0);
 	}
@@ -563,11 +563,11 @@
 
     // newer method which accepts course name, a parent org id, a flag for whether user should get
     // 'teacher' roles, and a flag for whether to use a prefix in the org's name
-    private ExtCourseClassMap getExtCourseClassMap(ExtServerOrgMap serverMap, ExtUserUseridMap userMap,
+    private ExtCourseClassMap getExtCourseClassMap(ExtServer extServer, ExtUserUseridMap userMap,
 	    String extCourseId, Boolean isTeacher) {
 	Map<String, Object> properties = new HashMap<String, Object>();
 	properties.put("courseid", extCourseId);
-	properties.put("extServerOrgMap.sid", serverMap.getSid());
+	properties.put("extServer.sid", extServer.getSid());
 	List list = userManagementService.findByProperties(ExtCourseClassMap.class, properties);
 	if (list == null || list.size() == 0) {
 	    throw new RuntimeException("There is no course with courseId: " + extCourseId);
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/UserRoleServlet.java
===================================================================
diff -u -r8925ff25d87c99995ab22f386a5161d73d5ef63c -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_central/src/java/org/lamsfoundation/lams/webservice/UserRoleServlet.java	(.../UserRoleServlet.java)	(revision 8925ff25d87c99995ab22f386a5161d73d5ef63c)
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/UserRoleServlet.java	(.../UserRoleServlet.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -11,7 +11,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.ExtUserUseridMap;
 import org.lamsfoundation.lams.integration.service.IntegrationService;
 import org.lamsfoundation.lams.security.ISecurityService;
@@ -49,23 +49,23 @@
 	String role = request.getParameter(AttributeNames.PARAM_ROLE);
 
 	try {
-	    ExtServerOrgMap serverMap = UserRoleServlet.integrationService.getExtServerOrgMap(serverId);
+	    ExtServer extServer = UserRoleServlet.integrationService.getExtServer(serverId);
 	    String plaintext = datetime.toLowerCase().trim() + username.toLowerCase().trim()
 		    + targetUsername.toLowerCase().trim() + method.toLowerCase().trim() + role.toLowerCase().trim()
-		    + serverMap.getServerid().toLowerCase().trim() + serverMap.getServerkey().toLowerCase().trim();
+		    + extServer.getServerid().toLowerCase().trim() + extServer.getServerkey().toLowerCase().trim();
 	    if (!hashValue.equals(HashUtil.sha1(plaintext))) {
 		log.error("Hash check failed while trying to set role for user: " + targetUsername);
 		response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Authentication failed, invalid hash");
 		return;
 	    }
-	    ExtUserUseridMap sysadminUserMap = UserRoleServlet.integrationService.getExtUserUseridMap(serverMap,
+	    ExtUserUseridMap sysadminUserMap = UserRoleServlet.integrationService.getExtUserUseridMap(extServer,
 		    username);
 	    if (!securityService.isSysadmin(sysadminUserMap.getUser().getUserId(), "set user role", false)) {
 		log.error("Sysadmin role check failed while trying to set role for user: " + targetUsername);
 		response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Authentication failed, user is not sysadmin");
 		return;
 	    }
-	    ExtUserUseridMap userMap = UserRoleServlet.integrationService.getExtUserUseridMap(serverMap,
+	    ExtUserUseridMap userMap = UserRoleServlet.integrationService.getExtUserUseridMap(extServer,
 		    targetUsername);
 	    User targetUser = userMap.getUser();
 	    if ("grant".equalsIgnoreCase(method)) {
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java	(.../LearningDesignRepositoryServlet.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java	(.../LearningDesignRepositoryServlet.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -26,7 +26,7 @@
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.ExtUserUseridMap;
 import org.lamsfoundation.lams.integration.UserInfoFetchException;
 import org.lamsfoundation.lams.integration.UserInfoValidationException;
@@ -272,10 +272,10 @@
 	    }
 
 	    // get Server map
-	    ExtServerOrgMap serverMap = LearningDesignRepositoryServlet.integrationService.getExtServerOrgMap(serverId);
+	    ExtServer extServer = LearningDesignRepositoryServlet.integrationService.getExtServer(serverId);
 
 	    // authenticate
-	    Authenticator.authenticate(serverMap, datetime, username, hashValue);
+	    Authenticator.authenticate(extServer, datetime, username, hashValue);
 
 	    // get user map, user is created if this is their first use
 
@@ -287,7 +287,7 @@
 		    && (method.equals("getLearningDesignsJSON") || method.equals("getPagedHomeLearningDesignsJSON"))) {
 
 		Integer userId = getUserId(username, courseId, courseName, country, lang, usePrefix,
-			isUpdateUserDetails, firstName, lastName, email, serverMap);
+			isUpdateUserDetails, firstName, lastName, email, extServer);
 
 		boolean allowInvalidDesigns = WebUtil.readBooleanParam(request, "allowInvalidDesigns", false);
 
@@ -315,7 +315,7 @@
 	    } else if ((method != null) && method.equals("deleteLearningDesignJSON")) {
 
 		Integer userId = getUserId(username, courseId, courseName, country, lang, usePrefix,
-			isUpdateUserDetails, firstName, lastName, email, serverMap);
+			isUpdateUserDetails, firstName, lastName, email, extServer);
 
 		Long learningDesignId = WebUtil.readLongParam(request,
 			LearningDesignRepositoryServlet.PARAM_LEARING_DESIGN_ID);
@@ -337,15 +337,15 @@
 		ExtUserUseridMap userMap = null;
 		boolean prefix = usePrefix == null ? true : Boolean.parseBoolean(usePrefix);
 		if ((firstName == null) && (lastName == null)) {
-		    userMap = LearningDesignRepositoryServlet.integrationService.getExtUserUseridMap(serverMap,
+		    userMap = LearningDesignRepositoryServlet.integrationService.getExtUserUseridMap(extServer,
 			    username, prefix);
 		} else {
-		    userMap = LearningDesignRepositoryServlet.integrationService.getImplicitExtUserUseridMap(serverMap,
+		    userMap = LearningDesignRepositoryServlet.integrationService.getImplicitExtUserUseridMap(extServer,
 			    username, firstName, lastName, lang, country, email, prefix, isUpdateUserDetails);
 		}
 
 		// create group for external course if necessary
-		LearningDesignRepositoryServlet.integrationService.getExtCourseClassMap(serverMap, userMap, courseId,
+		LearningDesignRepositoryServlet.integrationService.getExtCourseClassMap(extServer, userMap, courseId,
 			country, lang, courseName, LoginRequestDispatcher.METHOD_AUTHOR);
 		Integer userId = userMap.getUser().getUserId();
 
@@ -384,19 +384,19 @@
 
     private Integer getUserId(String username, String courseId, String courseName, String country, String lang,
 	    String usePrefix, final boolean isUpdateUserDetails, String firstName, String lastName, String email,
-	    ExtServerOrgMap serverMap) throws UserInfoFetchException, UserInfoValidationException {
+	    ExtServer extServer) throws UserInfoFetchException, UserInfoValidationException {
 	ExtUserUseridMap userMap = null;
 	boolean prefix = usePrefix == null ? true : Boolean.parseBoolean(usePrefix);
 	if ((firstName == null) && (lastName == null)) {
-	    userMap = LearningDesignRepositoryServlet.integrationService.getExtUserUseridMap(serverMap, username,
+	    userMap = LearningDesignRepositoryServlet.integrationService.getExtUserUseridMap(extServer, username,
 		    prefix);
 	} else {
-	    userMap = LearningDesignRepositoryServlet.integrationService.getImplicitExtUserUseridMap(serverMap,
+	    userMap = LearningDesignRepositoryServlet.integrationService.getImplicitExtUserUseridMap(extServer,
 		    username, firstName, lastName, lang, country, email, prefix, isUpdateUserDetails);
 	}
 
 	// create group for external course if necessary
-	LearningDesignRepositoryServlet.integrationService.getExtCourseClassMap(serverMap, userMap, courseId, country,
+	LearningDesignRepositoryServlet.integrationService.getExtCourseClassMap(extServer, userMap, courseId, country,
 		lang, courseName, LoginRequestDispatcher.METHOD_AUTHOR);
 	Integer userId = userMap.getUser().getUserId();
 	return userId;
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
===================================================================
diff -u -rde884cf8c730a25d2f2296f7a768d3fd45508c99 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java	(.../LessonManagerServlet.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java	(.../LessonManagerServlet.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -34,7 +34,7 @@
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
 import org.lamsfoundation.lams.index.IndexLessonBean;
 import org.lamsfoundation.lams.integration.ExtCourseClassMap;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.ExtUserUseridMap;
 import org.lamsfoundation.lams.integration.UserInfoFetchException;
 import org.lamsfoundation.lams.integration.UserInfoValidationException;
@@ -364,10 +364,10 @@
 	    String courseId, String title, String desc, String countryIsoCode, String langIsoCode, String customCSV,
 	    boolean presenceEnable, boolean imEnable, boolean enableNotifications) throws RemoteException {
 	try {
-	    ExtServerOrgMap serverMap = integrationService.getExtServerOrgMap(serverId);
-	    Authenticator.authenticate(serverMap, datetime, username, hashValue);
-	    ExtUserUseridMap userMap = integrationService.getExtUserUseridMap(serverMap, username);
-	    ExtCourseClassMap orgMap = integrationService.getExtCourseClassMap(serverMap, userMap,
+	    ExtServer extServer = integrationService.getExtServer(serverId);
+	    Authenticator.authenticate(extServer, datetime, username, hashValue);
+	    ExtUserUseridMap userMap = integrationService.getExtUserUseridMap(extServer, username);
+	    ExtCourseClassMap orgMap = integrationService.getExtCourseClassMap(extServer, userMap,
 		    courseId, countryIsoCode, langIsoCode, null, LoginRequestDispatcher.METHOD_MONITOR);
 	    User user = userMap.getUser();
 	    Organisation organisation = orgMap.getOrganisation();
@@ -381,7 +381,7 @@
 	    // 3. start lesson
 	    monitoringService.startLesson(lesson.getLessonId(), user.getUserId());
 	    // store information which extServer has started the lesson
-	    integrationService.createExtServerLessonMap(lesson.getLessonId(), serverMap);
+	    integrationService.createExtServerLessonMap(lesson.getLessonId(), extServer);
 
 	    return lesson.getLessonId();
 	} catch (Exception e) {
@@ -394,10 +394,10 @@
 	    String customCSV, boolean presenceEnable, boolean imEnable, boolean enableNotifications)
 	    throws RemoteException {
 	try {
-	    ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
-	    Authenticator.authenticate(serverMap, datetime, username, hashValue);
-	    ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(serverMap, username);
-	    ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(serverMap, userMap,
+	    ExtServer extServer = LessonManagerServlet.integrationService.getExtServer(serverId);
+	    Authenticator.authenticate(extServer, datetime, username, hashValue);
+	    ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(extServer, username);
+	    ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(extServer, userMap,
 		    courseId, countryIsoCode, langIsoCode, null, LoginRequestDispatcher.METHOD_MONITOR);
 	    // 1. init lesson
 	    Lesson lesson = LessonManagerServlet.monitoringService.initializeLesson(title, desc, ldId,
@@ -418,13 +418,13 @@
     private Long cloneLesson(String serverId, String datetime, String hashValue, String username, long lsId,
 	    String courseId, String countryIsoCode, String langIsoCode) throws RemoteException {
 	try {
-	    ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
-	    Authenticator.authenticate(serverMap, datetime, username, hashValue);
+	    ExtServer extServer = LessonManagerServlet.integrationService.getExtServer(serverId);
+	    Authenticator.authenticate(extServer, datetime, username, hashValue);
 
-	    ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(serverMap, username);
+	    ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(extServer, username);
 	    Integer creatorId = userMap.getUser().getUserId();
 
-	    ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(serverMap, userMap,
+	    ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(extServer, userMap,
 		    courseId, countryIsoCode, langIsoCode, null, LoginRequestDispatcher.METHOD_MONITOR);
 	    if (orgMap == null) {
 		LessonManagerServlet.log.debug("No course exists for: " + courseId + ". Can't delete any lessons.");
@@ -436,7 +436,7 @@
 	    Long newLessonId = LessonManagerServlet.monitoringService.cloneLesson(lsId, creatorId, true, true, null,
 		    null, organisation);
 	    // store information which extServer has started the lesson
-	    LessonManagerServlet.integrationService.createExtServerLessonMap(newLessonId, serverMap);
+	    LessonManagerServlet.integrationService.createExtServerLessonMap(newLessonId, extServer);
 
 	    return newLessonId;
 	} catch (Exception e) {
@@ -448,14 +448,14 @@
     private Element getAllStudentProgress(Document document, String serverId, String datetime, String hashValue,
 	    String username, long lsId, String courseID) throws RemoteException {
 	try {
-	    ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
-	    Authenticator.authenticate(serverMap, datetime, username, hashValue);
+	    ExtServer extServer = LessonManagerServlet.integrationService.getExtServer(serverId);
+	    Authenticator.authenticate(extServer, datetime, username, hashValue);
 	    Lesson lesson = LessonManagerServlet.lessonService.getLesson(lsId);
 
 	    Element element = document.createElement(CentralConstants.ELEM_LESSON_PROGRESS);
 	    element.setAttribute(CentralConstants.ATTR_LESSON_ID, "" + lsId);
 
-	    String prefix = serverMap.getPrefix();
+	    String prefix = extServer.getPrefix();
 	    if (lesson != null) {
 
 		int activitiesTotal = lesson.getLearningDesign().getActivities().size();
@@ -466,7 +466,7 @@
 
 		    // get the username with the integration prefix removed
 		    String userNoPrefixName = learnerProgress.getUserName().substring(prefix.length() + 1);
-		    ExtUserUseridMap learnerMap = LessonManagerServlet.integrationService.getExtUserUseridMap(serverMap,
+		    ExtUserUseridMap learnerMap = LessonManagerServlet.integrationService.getExtUserUseridMap(extServer,
 			    userNoPrefixName);
 
 		    Element learnerProgElem = document.createElement(CentralConstants.ELEM_LEARNER_PROGRESS);
@@ -507,8 +507,8 @@
 	    String username, String firstName, String lastName, String language, String country, String email,
 	    long lsId, String courseID) throws RemoteException {
 	try {
-	    ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
-	    Authenticator.authenticate(serverMap, datetime, username, hashValue);
+	    ExtServer extServer = LessonManagerServlet.integrationService.getExtServer(serverId);
+	    Authenticator.authenticate(extServer, datetime, username, hashValue);
 	    Lesson lesson = LessonManagerServlet.lessonService.getLesson(lsId);
 
 	    Element element = document.createElement(CentralConstants.ELEM_LESSON_PROGRESS);
@@ -521,7 +521,7 @@
 		final boolean usePrefix = true;
 		final boolean isUpdateUserDetails = false;
 		ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getImplicitExtUserUseridMap(
-			serverMap, username, firstName, lastName, language, country, email, usePrefix,
+			extServer, username, firstName, lastName, language, country, email, usePrefix,
 			isUpdateUserDetails);
 
 		LearnerProgress learnProg = LessonManagerServlet.lessonService
@@ -580,9 +580,9 @@
     private boolean removeLesson(String serverId, String datetime, String hashValue, String username, long lsId)
 	    throws RemoteException {
 	try {
-	    ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
-	    Authenticator.authenticate(serverMap, datetime, username, hashValue);
-	    ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(serverMap, username);
+	    ExtServer extServer = LessonManagerServlet.integrationService.getExtServer(serverId);
+	    Authenticator.authenticate(extServer, datetime, username, hashValue);
+	    ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(extServer, username);
 	    LessonManagerServlet.monitoringService.removeLesson(lsId, userMap.getUser().getUserId());
 	    return true;
 	} catch (Exception e) {
@@ -598,13 +598,13 @@
 	// Create the root node of the xml document
 	Element lessonsElement = document.createElement("Lessons");
 
-	ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
-	Authenticator.authenticate(serverMap, datetime, username, hashValue);
+	ExtServer extServer = LessonManagerServlet.integrationService.getExtServer(serverId);
+	Authenticator.authenticate(extServer, datetime, username, hashValue);
 
-	ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(serverMap, username);
+	ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(extServer, username);
 
 	// find all lesons in organisation
-	ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(serverMap.getSid(),
+	ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(extServer.getSid(),
 		courseId);
 	if (orgMap == null) {
 	    LessonManagerServlet.log.debug("No course exists for: " + courseId + ". Can't delete any lessons.");
@@ -640,19 +640,19 @@
 	// Create the root node of the xml document
 	Element usersElement = document.createElement("Users");
 
-	ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
-	Authenticator.authenticate(serverMap, datetime, username, hashValue);
+	ExtServer extServer = LessonManagerServlet.integrationService.getExtServer(serverId);
+	Authenticator.authenticate(extServer, datetime, username, hashValue);
 
 	// check is user monitor
-	ExtUserUseridMap monitorMap = LessonManagerServlet.integrationService.getExtUserUseridMap(serverMap, username);
+	ExtUserUseridMap monitorMap = LessonManagerServlet.integrationService.getExtUserUseridMap(extServer, username);
 	LessonManagerServlet.securityService.isLessonMonitor(lsId, monitorMap.getUser().getUserId(), "remove user",
 		true);
 
 	// remove requested user
 	String[] extUsernames = (userIds != null) ? userIds.split(",") : new String[0];
 	for (String extUsername : extUsernames) {
 
-	    ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(serverMap,
+	    ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(extServer,
 		    extUsername);
 	    Integer userId = userMap.getUser().getUserId();
 	    // remove user
@@ -676,11 +676,11 @@
 	// Create the root node of the xml document
 	Element usersElement = document.createElement("Users");
 
-	ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
-	Authenticator.authenticate(serverMap, datetime, username, hashValue);
+	ExtServer extServer = LessonManagerServlet.integrationService.getExtServer(serverId);
+	Authenticator.authenticate(extServer, datetime, username, hashValue);
 
 	// check is user monitor
-	ExtUserUseridMap monitorMap = LessonManagerServlet.integrationService.getExtUserUseridMap(serverMap, username);
+	ExtUserUseridMap monitorMap = LessonManagerServlet.integrationService.getExtUserUseridMap(extServer, username);
 	LessonManagerServlet.securityService.isLessonMonitor(lsId, monitorMap.getUser().getUserId(), "remove all users",
 		true);
 
@@ -710,10 +710,10 @@
 	    boolean presenceEnable, boolean imEnable) throws RemoteException {
 
 	try {
-	    ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
-	    Authenticator.authenticate(serverMap, datetime, username, hashValue);
-	    ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(serverMap, username);
-	    ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(serverMap, userMap,
+	    ExtServer extServer = LessonManagerServlet.integrationService.getExtServer(serverId);
+	    Authenticator.authenticate(extServer, datetime, username, hashValue);
+	    ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(extServer, username);
+	    ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(extServer, userMap,
 		    courseId, countryIsoCode, langIsoCode, null, LoginRequestDispatcher.METHOD_MONITOR);
 	    Integer userId = userMap.getUser().getUserId();
 
@@ -743,11 +743,11 @@
 	Integer workspaceFolderUid = null;
 	ExtUserUseridMap userMap;
 	User user = null;
-	ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
+	ExtServer extServer = LessonManagerServlet.integrationService.getExtServer(serverId);
 
 	try {
 
-	    userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(serverMap, username);
+	    userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(extServer, username);
 
 	    user = userMap.getUser();
 
@@ -887,9 +887,9 @@
 	    try {
 
 		// get Server map
-		ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
+		ExtServer extServer = LessonManagerServlet.integrationService.getExtServer(serverId);
 		// authenticate
-		Authenticator.authenticate(serverMap, datetime, requestorUsername, hashValue);
+		Authenticator.authenticate(extServer, datetime, requestorUsername, hashValue);
 
 		String[] learnerIdArray = (learnerIds != null) ? learnerIds.split(",") : new String[0];
 		String[] monitorIdArray = (monitorIds != null) ? monitorIds.split(",") : new String[0];
@@ -922,7 +922,7 @@
 		    }
 
 		    if (StringUtils.isNotBlank(userName)) {
-			addUserToLesson(request, serverMap, LoginRequestDispatcher.METHOD_LEARNER, lsIdStr, userName,
+			addUserToLesson(request, extServer, LoginRequestDispatcher.METHOD_LEARNER, lsIdStr, userName,
 				firstName, lastName, email, courseId, countryIsoCode, langIsoCode);
 		    }
 		    i++;
@@ -939,7 +939,7 @@
 		    }
 
 		    if (StringUtils.isNotBlank(userName)) {
-			addUserToLesson(request, serverMap, LoginRequestDispatcher.METHOD_MONITOR, lsIdStr, userName,
+			addUserToLesson(request, extServer, LoginRequestDispatcher.METHOD_MONITOR, lsIdStr, userName,
 				firstName, lastName, email, courseId, countryIsoCode, langIsoCode);
 		    }
 		    i++;
@@ -958,7 +958,7 @@
 	    }
 	}
 
-	private void addUserToLesson(HttpServletRequest request, ExtServerOrgMap serverMap, String method,
+	private void addUserToLesson(HttpServletRequest request, ExtServer extServer, String method,
 		String lsIdStr, String username, String firstName, String lastName, String email, String courseId,
 		String countryIsoCode, String langIsoCode) throws UserInfoFetchException, UserInfoValidationException {
 
@@ -969,18 +969,18 @@
 
 	    ExtUserUseridMap userMap = null;
 	    if ((firstName == null) && (lastName == null)) {
-		userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(serverMap, username);
+		userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(extServer, username);
 	    } else {
 		final boolean usePrefix = true;
 		final boolean isUpdateUserDetails = false;
-		userMap = LessonManagerServlet.integrationService.getImplicitExtUserUseridMap(serverMap, username,
+		userMap = LessonManagerServlet.integrationService.getImplicitExtUserUseridMap(extServer, username,
 			firstName, lastName, langIsoCode, countryIsoCode, email, usePrefix, isUpdateUserDetails);
 	    }
 
-	    // ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(serverMap,
+	    // ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(extServer,
 	    // username);
 	    // adds user to group
-	    ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(serverMap, userMap,
+	    ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(extServer, userMap,
 		    courseId, countryIsoCode, langIsoCode, null, method);
 
 	    if (LessonManagerServlet.lessonService == null) {
@@ -1024,13 +1024,13 @@
     private Element getGradebookMarks(Document document, String serverId, String datetime, String hashValue,
 	    String username, Long lessonIdParam, String courseId, String outputsUser) throws Exception {
 
-	ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
-	Authenticator.authenticate(serverMap, datetime, username, hashValue);
+	ExtServer extServer = LessonManagerServlet.integrationService.getExtServer(serverId);
+	Authenticator.authenticate(extServer, datetime, username, hashValue);
 
 	List<Lesson> lessons = new LinkedList<Lesson>();
 	if (courseId != null) {
 
-	    ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(serverMap.getSid(),
+	    ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(extServer.getSid(),
 		    courseId);
 	    if (orgMap == null) {
 		LessonManagerServlet.log
@@ -1078,7 +1078,7 @@
 	    if (outputsUser != null) {
 
 		ExtUserUseridMap userMap = LessonManagerServlet.integrationService
-			.getExistingExtUserUseridMap(serverMap, outputsUser);
+			.getExistingExtUserUseridMap(extServer, outputsUser);
 		if (userMap == null) {
 		    throw new Exception("No user exists for: " + outputsUser + ". Cannot get tool outputs report.");
 		}
@@ -1099,7 +1099,7 @@
 	    }
 
 	    List<ExtUserUseridMap> allUsers = LessonManagerServlet.integrationService
-		    .getExtUserUseridMapByServerMap(serverMap);
+		    .getExtUserUseridMapByExtServer(extServer);
 
 	    for (GradebookUserLesson gradebookUserLesson : gradebookUserLessons) {
 		Integer userId = gradebookUserLesson.getLearner().getUserId();
@@ -1115,7 +1115,7 @@
 
 		if (extUser == null) {
 		    throw new Exception(
-			    "User with userId: " + userId + " doesn't belong to extServer: " + serverMap.getSid());
+			    "User with userId: " + userId + " doesn't belong to extServer: " + extServer.getSid());
 		}
 
 		Element learnerElement = document.createElement("Learner");
@@ -1154,8 +1154,8 @@
 	    String username, Long lessonId, String courseID, boolean isAuthoredToolOutputs, String outputsUser)
 	    throws Exception {
 
-	ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
-	Authenticator.authenticate(serverMap, datetime, username, hashValue);
+	ExtServer extServer = LessonManagerServlet.integrationService.getExtServer(serverId);
+	Authenticator.authenticate(extServer, datetime, username, hashValue);
 
 	Lesson lesson = LessonManagerServlet.lessonService.getLesson(lessonId);
 	if (lesson == null) {
@@ -1170,7 +1170,7 @@
 	// if outputsUser is null we build results for the whole lesson, otherwise - for the specified learner
 	if (outputsUser != null) {
 
-	    ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExistingExtUserUseridMap(serverMap,
+	    ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExistingExtUserUseridMap(extServer,
 		    outputsUser);
 	    if (userMap == null) {
 		// TODO: handle this error instead of throwing an exception
@@ -1212,7 +1212,7 @@
 
 	    Element learnerElement = document.createElement("LearnerOutput");
 
-	    String userNoPrefixName = learner.getLogin().substring(serverMap.getPrefix().length() + 1);
+	    String userNoPrefixName = learner.getLogin().substring(extServer.getPrefix().length() + 1);
 	    learnerElement.setAttribute("userName", userNoPrefixName);
 	    learnerElement.setAttribute("lamsUserName", learner.getLogin());
 	    learnerElement.setAttribute("lamsUserId", learner.getUserId().toString());
@@ -1295,8 +1295,8 @@
      */
     private boolean verify(String serverId, String datetime, String hash) throws Exception {
 	try {
-	    ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
-	    Authenticator.authenticate(serverMap, datetime, hash);
+	    ExtServer extServer = LessonManagerServlet.integrationService.getExtServer(serverId);
+	    Authenticator.authenticate(extServer, datetime, hash);
 	    return true;
 	} catch (Exception e) {
 	    LessonManagerServlet.log.error("Problem verifying external server: " + serverId, e);
@@ -1452,12 +1452,12 @@
      */
     private Element getLessonMonitorList(Document document, String serverId, String datetime, String hashValue,
 	    String username, String courseID, String countryIsoCode, String langIsoCode) throws Exception {
-	ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
-	Authenticator.authenticate(serverMap, datetime, username, hashValue);
+	ExtServer extServer = LessonManagerServlet.integrationService.getExtServer(serverId);
+	Authenticator.authenticate(extServer, datetime, username, hashValue);
 
-	ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExistingExtUserUseridMap(serverMap,
+	ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExistingExtUserUseridMap(extServer,
 		username);
-	ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(serverMap, userMap,
+	ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(extServer, userMap,
 		courseID, countryIsoCode, langIsoCode, null, LoginRequestDispatcher.METHOD_MONITOR);
 	Organisation organisation = orgMap.getOrganisation();
 
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/NotificationServlet.java
===================================================================
diff -u -re2bc2f7aa3ef64c4bcae675ba05e67e97ccc5ab4 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/NotificationServlet.java	(.../NotificationServlet.java)	(revision e2bc2f7aa3ef64c4bcae675ba05e67e97ccc5ab4)
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/NotificationServlet.java	(.../NotificationServlet.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -18,7 +18,7 @@
 import org.lamsfoundation.lams.events.DeliveryMethodNotification;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.events.Subscription;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.ExtUserUseridMap;
 import org.lamsfoundation.lams.integration.security.Authenticator;
 import org.lamsfoundation.lams.integration.service.IntegrationService;
@@ -67,9 +67,9 @@
 	String username = request.getParameter(CentralConstants.PARAM_USERNAME);
 
 	try {
-	    ExtServerOrgMap serverMap = NotificationServlet.integrationService.getExtServerOrgMap(serverId);
-	    Authenticator.authenticate(serverMap, datetime, username, hashValue);
-	    ExtUserUseridMap userMap = NotificationServlet.integrationService.getExtUserUseridMap(serverMap, username);
+	    ExtServer extServer = NotificationServlet.integrationService.getExtServer(serverId);
+	    Authenticator.authenticate(extServer, datetime, username, hashValue);
+	    ExtUserUseridMap userMap = NotificationServlet.integrationService.getExtUserUseridMap(extServer, username);
 	    String method = request.getParameter(CentralConstants.PARAM_METHOD);
 	    if ("getNotifications".equalsIgnoreCase(method)) {
 		getNotifications(userMap.getUser().getUserId(), request, response);
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/OrganisationGroupServlet.java
===================================================================
diff -u -rc39770c3f6bdcc88e858ca6c53b24dbb63bdc0d0 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/OrganisationGroupServlet.java	(.../OrganisationGroupServlet.java)	(revision c39770c3f6bdcc88e858ca6c53b24dbb63bdc0d0)
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/OrganisationGroupServlet.java	(.../OrganisationGroupServlet.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -13,7 +13,7 @@
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.security.Authenticator;
 import org.lamsfoundation.lams.integration.service.IntegrationService;
 import org.lamsfoundation.lams.usermanagement.OrganisationGroup;
@@ -59,8 +59,8 @@
 	String username = request.getParameter(CentralConstants.PARAM_USERNAME);
 
 	try {
-	    ExtServerOrgMap serverMap = OrganisationGroupServlet.integrationService.getExtServerOrgMap(serverId);
-	    Authenticator.authenticate(serverMap, datetime, username, hashValue);
+	    ExtServer extServer = OrganisationGroupServlet.integrationService.getExtServer(serverId);
+	    Authenticator.authenticate(extServer, datetime, username, hashValue);
 
 	    String method = request.getParameter(CentralConstants.PARAM_METHOD);
 	    if ("getGroupings".equalsIgnoreCase(method)) {
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml
===================================================================
diff -u -rc7798d2b81a0595194a5e905ef6c33e372ad8007 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml	(.../ExtCourseClassMap.hbm.xml)	(revision c7798d2b81a0595194a5e905ef6c33e372ad8007)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml	(.../ExtCourseClassMap.hbm.xml)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -55,10 +55,10 @@
 
     <!-- Associations -->
   
-    <!-- bi-directional many-to-one association to ExtServerOrgMap -->
+    <!-- bi-directional many-to-one association to ExtServer -->
     <many-to-one
-        name="extServerOrgMap"
-        class="org.lamsfoundation.lams.integration.ExtServerOrgMap"
+        name="extServer"
+        class="org.lamsfoundation.lams.integration.ExtServer"
         not-null="true"
     >
         <meta attribute="field-description">
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerLessonMap.hbm.xml
===================================================================
diff -u -rde884cf8c730a25d2f2296f7a768d3fd45508c99 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerLessonMap.hbm.xml	(.../ExtServerLessonMap.hbm.xml)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerLessonMap.hbm.xml	(.../ExtServerLessonMap.hbm.xml)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -45,7 +45,7 @@
 
         <many-to-one
             name="extServer"
-            class="org.lamsfoundation.lams.integration.ExtServerOrgMap"
+            class="org.lamsfoundation.lams.integration.ExtServer"
             cascade="none"
             outer-join="auto"
             update="true"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
===================================================================
diff -u -rde884cf8c730a25d2f2296f7a768d3fd45508c99 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	(.../ExtServerOrgMap.hbm.xml)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	(.../ExtServerOrgMap.hbm.xml)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -7,7 +7,7 @@
 <hibernate-mapping
 >
     <class
-        name="org.lamsfoundation.lams.integration.ExtServerOrgMap"
+        name="org.lamsfoundation.lams.integration.ExtServer"
         table="lams_ext_server_org_map"
     >
 
@@ -19,7 +19,7 @@
             <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
-                  hibernate-generator-params-ExtServerOrgMap.xml 
+                  hibernate-generator-params-ExtServer.xml 
                   containing the additional parameters and place it in your merge dir. 
               --> 
             </generator>
@@ -162,19 +162,6 @@
             column="time_to_live_login_request"
         />
 
-        <many-to-one
-            name="organisation"
-            class="org.lamsfoundation.lams.usermanagement.Organisation"
-            cascade="none"
-            outer-join="auto"
-            update="true"
-            insert="true"
-        >
-            <column
-                name="orgid" 
-            />
-        </many-to-one>
-
         <set
             name="extCourseClassMaps"
             lazy="true"
@@ -215,7 +202,7 @@
 
         <!--
             To add non XDoclet property mappings, create a file named
-                hibernate-properties-ExtServerOrgMap.xml
+                hibernate-properties-ExtServer.xml
             containing the additional properties and place it in your merge dir.
         -->
 
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.hbm.xml	(.../ExtServerToolAdapterMap.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.hbm.xml	(.../ExtServerToolAdapterMap.hbm.xml)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -41,7 +41,7 @@
 
         <many-to-one
             name="extServer"
-            class="org.lamsfoundation.lams.integration.ExtServerOrgMap"
+            class="org.lamsfoundation.lams.integration.ExtServer"
             cascade="none"
             outer-join="auto"
             update="true"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml
===================================================================
diff -u -rde884cf8c730a25d2f2296f7a768d3fd45508c99 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml	(.../ExtUserUseridMap.hbm.xml)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml	(.../ExtUserUseridMap.hbm.xml)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -50,8 +50,8 @@
         </many-to-one>
 
         <many-to-one
-            name="extServerOrgMap"
-            class="org.lamsfoundation.lams.integration.ExtServerOrgMap"
+            name="extServer"
+            class="org.lamsfoundation.lams.integration.ExtServer"
             cascade="none"
             outer-join="auto"
             update="true"
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040069.sql
===================================================================
diff -u -rde884cf8c730a25d2f2296f7a768d3fd45508c99 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040069.sql	(.../patch2040069.sql)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040069.sql	(.../patch2040069.sql)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -17,5 +17,9 @@
 ALTER TABLE lams_ext_server_lesson_map ADD COLUMN resource_link_id VARCHAR(255);
 ALTER TABLE lams_ext_user_userid_map ADD COLUMN tc_gradebook_id VARCHAR(250);
 
+-- LDEV-3998 Remove reference to Organisation from ExtServerOrgMap class
+ALTER TABLE lams_ext_server_org_map DROP FOREIGN KEY lams_ext_server_org_map_fk;
+ALTER TABLE lams_ext_server_org_map DROP COLUMN orgid, DROP INDEX orgid;
+
 COMMIT;
 SET AUTOCOMMIT = 1;
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtCourseClassMap.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtCourseClassMap.java	(.../ExtCourseClassMap.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtCourseClassMap.java	(.../ExtCourseClassMap.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -16,15 +16,15 @@
     private String courseid;
 
     /** persistent field */
-    private ExtServerOrgMap extServerOrgMap;
+    private ExtServer extServer;
 
     /** persistent field */
     private Organisation organisation;
 
     /** full constructor */
-    public ExtCourseClassMap(String courseid, ExtServerOrgMap extServerOrgMap, Organisation organisation) {
+    public ExtCourseClassMap(String courseid, ExtServer extServer, Organisation organisation) {
 	this.courseid = courseid;
-	this.extServerOrgMap = extServerOrgMap;
+	this.extServer = extServer;
 	this.organisation = organisation;
     }
 
@@ -48,12 +48,12 @@
 	this.courseid = courseid;
     }
 
-    public ExtServerOrgMap getExtServerOrgMap() {
-	return this.extServerOrgMap;
+    public ExtServer getExtServer() {
+	return this.extServer;
     }
 
-    public void setExtServerOrgMap(ExtServerOrgMap extServerOrgMap) {
-	this.extServerOrgMap = extServerOrgMap;
+    public void setExtServer(ExtServer extServer) {
+	this.extServer = extServer;
     }
 
     public Organisation getOrganisation() {
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -0,0 +1,234 @@
+package org.lamsfoundation.lams.integration;
+
+import java.io.Serializable;
+import java.util.Set;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+public class ExtServer implements Serializable, Comparable {
+
+    private static final long serialVersionUID = 337894825609071182L;
+    
+    /*
+     * static final variables indicating the type of servers available. 
+     */
+    /* **************************************************************** */
+    public static final int INTEGRATION_SERVER_TYPE = 1;
+    public static final int LTI_CONSUMER_SERVER_TYPE = 2;
+    /** *************************************************************** */
+
+    /** identifier field */
+    private Integer sid;
+
+    /** persistent field */
+    private String serverid;
+
+    /** persistent field */
+    private String serverkey;
+
+    /** persistent field */
+    private String servername;
+
+    /** persistent field */
+    private String serverdesc;
+    
+    /** The type of activity */
+    private Integer serverTypeId;
+
+    /** persistent field */
+    private String prefix;
+
+    /** persistent field */
+    private String userinfoUrl;
+
+    /** persistent field */
+    private String serverUrl;
+
+    /** persistent field */
+    private String timeoutUrl;
+
+    /** persistent field */
+    private String lessonFinishUrl;
+
+    private String extGroupsUrl;
+
+    /** persistent field */
+    private Boolean disabled;
+
+    private Boolean timeToLiveLoginRequestEnabled;
+
+    /** persistent field */
+    private int timeToLiveLoginRequest;
+
+    /** persistent field */
+    private Set extCourseClassMaps;
+
+    /** persistent field */
+    private Set extUserUseridMaps;
+
+    /** default constructor */
+    public ExtServer() {
+	timeToLiveLoginRequest = 80;
+    }
+
+    public Integer getSid() {
+	return this.sid;
+    }
+
+    public void setSid(Integer sid) {
+	this.sid = sid;
+    }
+
+    public String getServerid() {
+	return this.serverid;
+    }
+
+    public void setServerid(String serverid) {
+	this.serverid = serverid;
+    }
+
+    public String getServerkey() {
+	return this.serverkey;
+    }
+
+    public void setServerkey(String serverkey) {
+	this.serverkey = serverkey;
+    }
+
+    public String getServername() {
+	return this.servername;
+    }
+
+    public void setServername(String servername) {
+	this.servername = servername;
+    }
+
+    public String getServerdesc() {
+	return this.serverdesc;
+    }
+
+    public void setServerdesc(String serverdesc) {
+	this.serverdesc = serverdesc;
+    }
+    
+    public Integer getServerTypeId() {
+	return serverTypeId;
+    }
+
+    public void setServerTypeId(Integer serverTypeId) {
+	this.serverTypeId = serverTypeId;
+    }
+
+    public String getPrefix() {
+	return this.prefix;
+    }
+
+    public void setPrefix(String prefix) {
+	this.prefix = prefix;
+    }
+
+    public String getUserinfoUrl() {
+	return this.userinfoUrl;
+    }
+
+    public void setUserinfoUrl(String userinfoUrl) {
+	this.userinfoUrl = userinfoUrl;
+    }
+
+    public String getServerUrl() {
+	return this.serverUrl;
+    }
+
+    public void setServerUrl(String serverUrl) {
+	this.serverUrl = serverUrl;
+    }
+
+    public String getTimeoutUrl() {
+	return this.timeoutUrl;
+    }
+
+    public void setTimeoutUrl(String timeoutUrl) {
+	this.timeoutUrl = timeoutUrl;
+    }
+
+    public String getLessonFinishUrl() {
+	return this.lessonFinishUrl;
+    }
+
+    public void setLessonFinishUrl(String lessonFinishUrl) {
+	this.lessonFinishUrl = lessonFinishUrl;
+    }
+
+    public String getExtGroupsUrl() {
+	return this.extGroupsUrl;
+    }
+
+    public void setExtGroupsUrl(String extGroupsUrl) {
+	this.extGroupsUrl = extGroupsUrl;
+    }
+
+    public Boolean getDisabled() {
+	return this.disabled;
+    }
+
+    public void setDisabled(Boolean disabled) {
+	this.disabled = disabled;
+    }
+
+    public Boolean getTimeToLiveLoginRequestEnabled() {
+	return this.timeToLiveLoginRequestEnabled;
+    }
+
+    public void setTimeToLiveLoginRequestEnabled(Boolean timeToLiveLoginRequestEnabled) {
+	this.timeToLiveLoginRequestEnabled = timeToLiveLoginRequestEnabled;
+    }
+
+    /**
+     * Measured in minutes.
+     *
+     * @return
+     */
+    public int getTimeToLiveLoginRequest() {
+	return this.timeToLiveLoginRequest;
+    }
+
+    public void setTimeToLiveLoginRequest(int timeToLiveLoginRequest) {
+	this.timeToLiveLoginRequest = timeToLiveLoginRequest;
+    }
+
+    public Set getExtCourseClassMaps() {
+	return this.extCourseClassMaps;
+    }
+
+    public void setExtCourseClassMaps(Set extCourseClassMaps) {
+	this.extCourseClassMaps = extCourseClassMaps;
+    }
+
+    public Set getExtUserUseridMaps() {
+	return this.extUserUseridMaps;
+    }
+
+    public void setExtUserUseridMaps(Set extUserUseridMaps) {
+	this.extUserUseridMaps = extUserUseridMaps;
+    }
+
+    @Override
+    public String toString() {
+	return new ToStringBuilder(this).append("sid", getSid()).append("serverid", getServerid())
+		.append("serverkey", getServerkey()).append("servername", getServername()).toString();
+    }
+
+    @Override
+    public int compareTo(Object o) {
+	return serverid.compareToIgnoreCase(((ExtServer) o).getServerid());
+    }
+    
+    public boolean isIntegrationServer() {
+	return getServerTypeId().intValue() == ExtServer.INTEGRATION_SERVER_TYPE;
+    }
+    
+    public boolean isLtiConsumer() {
+	return getServerTypeId().intValue() == ExtServer.LTI_CONSUMER_SERVER_TYPE;
+    }
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java
===================================================================
diff -u -rde884cf8c730a25d2f2296f7a768d3fd45508c99 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java	(.../ExtServerLessonMap.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java	(.../ExtServerLessonMap.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -31,7 +31,7 @@
     private Long uid;
     private Long lessonId;
     private String resourceLinkId;
-    private ExtServerOrgMap extServer;
+    private ExtServer extServer;
 
     public ExtServerLessonMap() {
     }
@@ -83,11 +83,11 @@
      *
      *
      */
-    public ExtServerOrgMap getExtServer() {
+    public ExtServer getExtServer() {
 	return extServer;
     }
 
-    public void setExtServer(ExtServerOrgMap extServer) {
+    public void setExtServer(ExtServer extServer) {
 	this.extServer = extServer;
     }
 }
Fisheye: Tag 11b64f81e406ff277c7c35988304b0064300de57 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.java	(.../ExtServerToolAdapterMap.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.java	(.../ExtServerToolAdapterMap.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -34,12 +34,12 @@
 
     private Long uid;
     private Tool tool;
-    private ExtServerOrgMap extServer;
+    private ExtServer extServer;
 
     public ExtServerToolAdapterMap() {
     }
 
-    public ExtServerToolAdapterMap(Tool tool, ExtServerOrgMap extServer) {
+    public ExtServerToolAdapterMap(Tool tool, ExtServer extServer) {
 	this.tool = tool;
 	this.extServer = extServer;
     }
@@ -74,11 +74,11 @@
      *
      *
      */
-    public ExtServerOrgMap getExtServer() {
+    public ExtServer getExtServer() {
 	return extServer;
     }
 
-    public void setExtServer(ExtServerOrgMap extServer) {
+    public void setExtServer(ExtServer extServer) {
 	this.extServer = extServer;
     }
 }
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java
===================================================================
diff -u -rde884cf8c730a25d2f2296f7a768d3fd45508c99 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java	(.../ExtUserUseridMap.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java	(.../ExtUserUseridMap.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -22,16 +22,16 @@
     private User user;
 
     /** persistent field */
-    private ExtServerOrgMap extServerOrgMap;
+    private ExtServer extServer;
     
     /** id of gradebook item in LTI tool consumer */
     private String tcGradebookId;
 
     /** full constructor */
-    public ExtUserUseridMap(String extUsername, User user, ExtServerOrgMap extServerOrgMap) {
+    public ExtUserUseridMap(String extUsername, User user, ExtServer extServer) {
 	this.extUsername = extUsername;
 	this.user = user;
-	this.extServerOrgMap = extServerOrgMap;
+	this.extServer = extServer;
     }
 
     /** default constructor */
@@ -62,12 +62,12 @@
 	this.user = user;
     }
 
-    public ExtServerOrgMap getExtServerOrgMap() {
-	return this.extServerOrgMap;
+    public ExtServer getExtServer() {
+	return this.extServer;
     }
 
-    public void setExtServerOrgMap(ExtServerOrgMap extServerOrgMap) {
-	this.extServerOrgMap = extServerOrgMap;
+    public void setExtServer(ExtServer extServer) {
+	this.extServer = extServer;
     }
     
     public String getTcGradebookId() {
Index: lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java
===================================================================
diff -u -rde884cf8c730a25d2f2296f7a768d3fd45508c99 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java	(.../Authenticator.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java	(.../Authenticator.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -25,7 +25,7 @@
 
 import java.util.Date;
 
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.util.HashUtil;
 
 /**
@@ -47,7 +47,7 @@
      * @param hashValue
      * @throws AuthenticationException
      */
-    public static void authenticate(ExtServerOrgMap map, String datetime, String username, String method,
+    public static void authenticate(ExtServer map, String datetime, String username, String method,
 	    String hashValue) throws AuthenticationException {
 
 	if (map == null) {
@@ -75,7 +75,7 @@
      * @param hashValue
      * @throws AuthenticationException
      */
-    public static void authenticateLoginRequest(ExtServerOrgMap map, String datetime, String username, String method,
+    public static void authenticateLoginRequest(ExtServer map, String datetime, String username, String method,
 	    String lsid, String hashValue) throws AuthenticationException {
 
 	if (map == null) {
@@ -114,7 +114,7 @@
 	Authenticator.checkHash(plaintext, hashValue);
     }
 
-    public static void authenticate(ExtServerOrgMap map, String datetime, String username, String hashValue)
+    public static void authenticate(ExtServer map, String datetime, String username, String hashValue)
 	    throws AuthenticationException {
 	if (map == null) {
 	    throw new AuthenticationException("The third party server is not configured on LAMS server");
@@ -128,7 +128,7 @@
 	Authenticator.checkHash(plaintext, hashValue);
     }
 
-    public static void authenticate(ExtServerOrgMap map, String datetime, String hashValue)
+    public static void authenticate(ExtServer map, String datetime, String hashValue)
 	    throws AuthenticationException {
 	if (map == null) {
 	    throw new AuthenticationException("The third party server is not configured on LAMS server");
Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
===================================================================
diff -u -rde884cf8c730a25d2f2296f7a768d3fd45508c99 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java	(.../IIntegrationService.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java	(.../IIntegrationService.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -28,7 +28,7 @@
 
 import org.lamsfoundation.lams.integration.ExtCourseClassMap;
 import org.lamsfoundation.lams.integration.ExtServerLessonMap;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.ExtServerToolAdapterMap;
 import org.lamsfoundation.lams.integration.ExtUserUseridMap;
 import org.lamsfoundation.lams.integration.UserInfoFetchException;
@@ -46,53 +46,53 @@
  */
 public interface IIntegrationService {
 
-    ExtCourseClassMap getExtCourseClassMap(ExtServerOrgMap serverMap, ExtUserUseridMap userMap, String extCourseId,
+    ExtCourseClassMap getExtCourseClassMap(ExtServer extServer, ExtUserUseridMap userMap, String extCourseId,
 	    String countryIsoCode, String langIsoCode, String prettyCourseName, String method, Boolean prefix)
 	    throws UserInfoValidationException;
 
-    ExtCourseClassMap getExtCourseClassMap(ExtServerOrgMap serverMap, ExtUserUseridMap userMap, String extCourseId,
+    ExtCourseClassMap getExtCourseClassMap(ExtServer extServer, ExtUserUseridMap userMap, String extCourseId,
 	    String countryIsoCode, String langIsoCode, String prettyCourseName, String method)
 	    throws UserInfoValidationException;
 
-    ExtCourseClassMap getExtCourseClassMap(ExtServerOrgMap serverMap, ExtUserUseridMap userMap, String extCourseId,
+    ExtCourseClassMap getExtCourseClassMap(ExtServer extServer, ExtUserUseridMap userMap, String extCourseId,
 	    String extCourseName, String countryIsoCode, String langIsoCode, String parentOrgId, Boolean isTeacher,
 	    Boolean prefix) throws UserInfoValidationException;
 
-    ExtUserUseridMap getExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername, boolean prefix)
+    ExtUserUseridMap getExtUserUseridMap(ExtServer extServer, String extUsername, boolean prefix)
 	    throws UserInfoFetchException, UserInfoValidationException;
 
     /**
      * compatibility method to support existing integrations. It does callback call to integrated server to get user
      * details.
      *
-     * @param serverMap
+     * @param extServer
      * @param extUsername
      * @return
      * @throws UserInfoFetchException
      * @throws UserInfoValidationException
      */
-    ExtUserUseridMap getExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername)
+    ExtUserUseridMap getExtUserUseridMap(ExtServer extServer, String extUsername)
 	    throws UserInfoFetchException, UserInfoValidationException;
 
     /**
      * Returns ExtUserUseridMap from DB, and null if it doesn't exist
      *
-     * @param serverMap
+     * @param extServer
      * @param userId
      * @return
      */
-    // ExtUserUseridMap getExtUserUseridMapByUserId(ExtServerOrgMap serverMap, Integer userId);
+    // ExtUserUseridMap getExtUserUseridMapByUserId(ExtServer extServer, Integer userId);
 
-    List<ExtUserUseridMap> getExtUserUseridMapByServerMap(ExtServerOrgMap serverMap);
+    List<ExtUserUseridMap> getExtUserUseridMapByExtServer(ExtServer extServer);
 
     /**
      * Returns ExtUserUseridMap from DB, and null if it doesn't exist
      *
-     * @param serverMap
+     * @param extServer
      * @param extUsername
      * @return
      */
-    ExtUserUseridMap getExistingExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername)
+    ExtUserUseridMap getExistingExtUserUseridMap(ExtServer extServer, String extUsername)
 	    throws UserInfoFetchException;
 
     /**
@@ -101,15 +101,15 @@
      * @param serverId
      * @return
      */
-    ExtServerOrgMap getExtServerOrgMap(Integer sid);
+    ExtServer getExtServer(Integer sid);
 
     /**
      * Returns integration server by its human-entered serverId.
      * 
      * @param serverId
      * @return
      */
-    ExtServerOrgMap getExtServerOrgMap(String serverId);
+    ExtServer getExtServer(String serverId);
     
     /**
      * Returns ExtServerLessonMap for the LTI Tool Consumer identified by serverId. 
@@ -124,14 +124,14 @@
      * Returns ExtCourseClassMap. If ExtCourseClassMap doesn't existent - returns null and does not create a new
      * ExtCourseClassMap.
      *
-     * @param extServerOrgMapId
+     * @param sid
      * @param extCourseId
      * @return ExtCourseClassMap if it exists, null otherwise
      */
-    ExtCourseClassMap getExtCourseClassMap(Integer extServerOrgMapId, String extCourseId);
+    ExtCourseClassMap getExtCourseClassMap(Integer sid, String extCourseId);
 
     /**
-     * @param serverMap
+     * @param extServer
      * @param extUsername
      * @param firstName
      * @param lastName
@@ -144,26 +144,26 @@
      * @return
      * @throws UserInfoValidationException
      */
-    ExtUserUseridMap getImplicitExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername, String firstName,
+    ExtUserUseridMap getImplicitExtUserUseridMap(ExtServer extServer, String extUsername, String firstName,
 	    String lastName, String language, String country, String email, boolean prefix, boolean isUpdateUserDetails)
 	    throws UserInfoValidationException;
 
-    ExtUserUseridMap getImplicitExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername, String password,
+    ExtUserUseridMap getImplicitExtUserUseridMap(ExtServer extServer, String extUsername, String password,
 	    String salt, String firstName, String lastName, String email) throws UserInfoValidationException;
 
     /**
      * @return all available integrated servers (that is excluding tool consumers)
      */
-    List<ExtServerOrgMap> getAllExtServerOrgMaps();
+    List<ExtServer> getAllExtServers();
     
     /**
      * @return all available tool consumers
      */
-    List<ExtServerOrgMap> getAllToolConsumers();
+    List<ExtServer> getAllToolConsumers();
 
-    void saveExtServerOrgMap(ExtServerOrgMap map);
+    void saveExtServer(ExtServer map);
 
-    String hash(ExtServerOrgMap serverMap, String extUsername, String timestamp);
+    String hash(ExtServer extServer, String extUsername, String timestamp);
 
     List<ExtServerToolAdapterMap> getMappedServers(String toolSig);
 
@@ -179,7 +179,7 @@
      * @param lessonId
      * @param extServer
      */
-    void createExtServerLessonMap(Long lessonId, ExtServerOrgMap extServer);
+    void createExtServerLessonMap(Long lessonId, ExtServer extServer);
     
     /**
      * Creates new ExtServerLessonMap object. Method is suitable for creating lessons via LTI tool consumers as long as
@@ -189,7 +189,7 @@
      * @param resourceLinkId resource_link_id parameter sent by LTI tool consumer
      * @param extServer
      */
-    void createExtServerLessonMap(Long lessonId, String resourceLinkId, ExtServerOrgMap extServer);
+    void createExtServerLessonMap(Long lessonId, String resourceLinkId, ExtServer extServer);
 
     /**
      * Checks whether the lesson was created from extServer and returns lessonFinishCallbackUrl if it's not blank.
Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
===================================================================
diff -u -rde884cf8c730a25d2f2296f7a768d3fd45508c99 -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(.../IntegrationService.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(.../IntegrationService.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -50,7 +50,7 @@
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
 import org.lamsfoundation.lams.integration.ExtCourseClassMap;
 import org.lamsfoundation.lams.integration.ExtServerLessonMap;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.ExtServerToolAdapterMap;
 import org.lamsfoundation.lams.integration.ExtUserUseridMap;
 import org.lamsfoundation.lams.integration.UserInfoFetchException;
@@ -103,10 +103,10 @@
      * @return
      */
     @Override
-    public ExtServerOrgMap getExtServerOrgMap(String serverId) {
+    public ExtServer getExtServer(String serverId) {
 	Map<String, Object> properties = new HashMap<String, Object>();
 	properties.put("serverid", serverId);
-	List<ExtServerOrgMap> list = service.findByProperties(ExtServerOrgMap.class, properties);
+	List<ExtServer> list = service.findByProperties(ExtServer.class, properties);
 	if (list == null || list.size() == 0) {
 	    return null;
 	} else {
@@ -118,7 +118,7 @@
     public ExtCourseClassMap getExtCourseClassMap(Integer sid, String extCourseId) {
 	Map<String, Object> properties = new HashMap<String, Object>();
 	properties.put("courseid", extCourseId);
-	properties.put("extServerOrgMap.sid", sid);
+	properties.put("extServer.sid", sid);
 	List<ExtCourseClassMap> list = service.findByProperties(ExtCourseClassMap.class, properties);
 
 	if ((list == null) || (list.size() == 0)) {
@@ -130,7 +130,7 @@
 
     // wrapper method for compatibility with original integration modules
     @Override
-    public ExtCourseClassMap getExtCourseClassMap(ExtServerOrgMap serverMap, ExtUserUseridMap userMap,
+    public ExtCourseClassMap getExtCourseClassMap(ExtServer extServer, ExtUserUseridMap userMap,
 	    String extCourseId, String countryIsoCode, String langIsoCode, String prettyCourseName, String method,
 	    Boolean prefix) throws UserInfoValidationException {
 
@@ -144,52 +144,52 @@
 	
 	Boolean isTeacher = (StringUtils.equals(method, LoginRequestDispatcher.METHOD_AUTHOR)
 		|| StringUtils.equals(method, LoginRequestDispatcher.METHOD_MONITOR));
-	return getExtCourseClassMap(serverMap, userMap, extCourseId, courseName, countryIsoCode, langIsoCode,
+	return getExtCourseClassMap(extServer, userMap, extCourseId, courseName, countryIsoCode, langIsoCode,
 		service.getRootOrganisation().getOrganisationId().toString(), isTeacher, prefix);
     }
 
     // wrapper method for compatibility with original integration modules
     @Override
-    public ExtCourseClassMap getExtCourseClassMap(ExtServerOrgMap serverMap, ExtUserUseridMap userMap,
+    public ExtCourseClassMap getExtCourseClassMap(ExtServer extServer, ExtUserUseridMap userMap,
 	    String extCourseId, String countryIsoCode, String langIsoCode, String prettyCourseName, String method)
 	    throws UserInfoValidationException {
-	return getExtCourseClassMap(serverMap, userMap, extCourseId, countryIsoCode, langIsoCode, prettyCourseName,
+	return getExtCourseClassMap(extServer, userMap, extCourseId, countryIsoCode, langIsoCode, prettyCourseName,
 		method, true);
     }
 
     // newer method which accepts course name, a parent org id, a flag for whether user should get
     // 'teacher' roles, and a flag for whether to use a prefix in the org's name
     @Override
-    public ExtCourseClassMap getExtCourseClassMap(ExtServerOrgMap serverMap, ExtUserUseridMap userMap,
+    public ExtCourseClassMap getExtCourseClassMap(ExtServer extServer, ExtUserUseridMap userMap,
 	    String extCourseId, String extCourseName, String countryIsoCode, String langIsoCode, String parentOrgId,
 	    Boolean isTeacher, Boolean prefix) throws UserInfoValidationException {
 	Organisation org;
 	User user = userMap.getUser();
 
-	ExtCourseClassMap extCourseClassMap = getExtCourseClassMap(serverMap.getSid(), extCourseId);
+	ExtCourseClassMap extCourseClassMap = getExtCourseClassMap(extServer.getSid(), extCourseId);
 	if (extCourseClassMap == null) {
 	    //create new ExtCourseClassMap
 
-	    org = createOrganisation(serverMap, user, extCourseId, extCourseName, countryIsoCode, langIsoCode,
+	    org = createOrganisation(extServer, user, extCourseId, extCourseName, countryIsoCode, langIsoCode,
 		    parentOrgId, prefix);
 	    extCourseClassMap = new ExtCourseClassMap();
 	    extCourseClassMap.setCourseid(extCourseId);
-	    extCourseClassMap.setExtServerOrgMap(serverMap);
+	    extCourseClassMap.setExtServer(extServer);
 	    extCourseClassMap.setOrganisation(org);
 	    service.save(extCourseClassMap);
 
 	} else {
 	    org = extCourseClassMap.getOrganisation();
 
 	    // update external course name if if has changed
-	    String requestedCourseName = prefix ? buildName(serverMap.getPrefix(), extCourseName) : extCourseName;
+	    String requestedCourseName = prefix ? buildName(extServer.getPrefix(), extCourseName) : extCourseName;
 	    if ((extCourseName != null) && !org.getName().equals(requestedCourseName)) {
 
 		// validate org name
 		if (!ValidationUtil.isOrgNameValid(requestedCourseName)) {
 		    throw new UserInfoValidationException("Can't create organisation due to validation error: "
 			    + "organisation name cannot contain any of these characters < > ^ * @ % $. External server:"
-			    + serverMap.getServerid() + ", orgId:" + extCourseId + ", orgName:" + requestedCourseName);
+			    + extServer.getServerid() + ", orgId:" + extCourseId + ", orgName:" + requestedCourseName);
 		}
 
 		org.setName(requestedCourseName);
@@ -230,38 +230,38 @@
     }
 
     @Override
-    public List<ExtUserUseridMap> getExtUserUseridMapByServerMap(ExtServerOrgMap serverMap) {
+    public List<ExtUserUseridMap> getExtUserUseridMapByExtServer(ExtServer extServer) {
 	Map<String, Object> properties = new HashMap<String, Object>();
-	properties.put("extServerOrgMap.sid", serverMap.getSid());
+	properties.put("extServer.sid", extServer.getSid());
 	List list = service.findByProperties(ExtUserUseridMap.class, properties);
 	return list;
     }
 
     @Override
-    public ExtUserUseridMap getExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername, boolean prefix)
+    public ExtUserUseridMap getExtUserUseridMap(ExtServer extServer, String extUsername, boolean prefix)
 	    throws UserInfoFetchException, UserInfoValidationException {
-	ExtUserUseridMap extUserUseridMap = getExistingExtUserUseridMap(serverMap, extUsername);
+	ExtUserUseridMap extUserUseridMap = getExistingExtUserUseridMap(extServer, extUsername);
 
 	if (extUserUseridMap == null) {
-	    String[] userData = getUserDataFromExtServer(serverMap, extUsername);
+	    String[] userData = getUserDataFromExtServer(extServer, extUsername);
 	    String salt = HashUtil.salt();
 	    String password = HashUtil.sha256(RandomPasswordGenerator.nextPassword(10), salt);
-	    return createExtUserUseridMap(serverMap, extUsername, password, salt, userData, prefix);
+	    return createExtUserUseridMap(extServer, extUsername, password, salt, userData, prefix);
 	} else {
 	    return extUserUseridMap;
 	}
     }
 
     @Override
-    public ExtUserUseridMap getExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername)
+    public ExtUserUseridMap getExtUserUseridMap(ExtServer extServer, String extUsername)
 	    throws UserInfoFetchException, UserInfoValidationException {
-	return getExtUserUseridMap(serverMap, extUsername, true);
+	return getExtUserUseridMap(extServer, extUsername, true);
     }
 
     @Override
-    public ExtUserUseridMap getExistingExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername) {
+    public ExtUserUseridMap getExistingExtUserUseridMap(ExtServer extServer, String extUsername) {
 	Map<String, Object> properties = new HashMap<String, Object>();
-	properties.put("extServerOrgMap.sid", serverMap.getSid());
+	properties.put("extServer.sid", extServer.getSid());
 	properties.put("extUsername", extUsername);
 	List<ExtUserUseridMap> list = service.findByProperties(ExtUserUseridMap.class, properties);
 
@@ -273,33 +273,33 @@
     }
 
     @Override
-    public ExtUserUseridMap getImplicitExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername, String password,
+    public ExtUserUseridMap getImplicitExtUserUseridMap(ExtServer extServer, String extUsername, String password,
 	    String salt, String firstName, String lastName, String email) throws UserInfoValidationException {
-	ExtUserUseridMap extUserUseridMap = getExistingExtUserUseridMap(serverMap, extUsername);
+	ExtUserUseridMap extUserUseridMap = getExistingExtUserUseridMap(extServer, extUsername);
 
 	if (extUserUseridMap == null) {
 	    String[] defaultLangCountry = LanguageUtil.getDefaultLangCountry();
 	    String[] userData = { "", firstName, lastName, "", "", "", "", "", "", "", "", email, defaultLangCountry[1],
 		    defaultLangCountry[0] };
-	    return createExtUserUseridMap(serverMap, extUsername, password, salt, userData, false);
+	    return createExtUserUseridMap(extServer, extUsername, password, salt, userData, false);
 	} else {
 	    return extUserUseridMap;
 	}
     }
 
     @Override
-    public ExtUserUseridMap getImplicitExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername, String firstName,
+    public ExtUserUseridMap getImplicitExtUserUseridMap(ExtServer extServer, String extUsername, String firstName,
 	    String lastName, String language, String country, String email, boolean prefix, boolean isUpdateUserDetails)
 	    throws UserInfoValidationException {
 
-	ExtUserUseridMap extUserUseridMap = getExistingExtUserUseridMap(serverMap, extUsername);
+	ExtUserUseridMap extUserUseridMap = getExistingExtUserUseridMap(extServer, extUsername);
 
 	//create new one if it doesn't exist yet
 	if (extUserUseridMap == null) {
 	    String[] userData = { "", firstName, lastName, "", "", "", "", "", "", "", "", email, country, language };
 	    String salt = HashUtil.salt();
 	    String password = HashUtil.sha256(RandomPasswordGenerator.nextPassword(10), salt);
-	    return createExtUserUseridMap(serverMap, extUsername, password, salt, userData, prefix);
+	    return createExtUserUseridMap(extServer, extUsername, password, salt, userData, prefix);
 
 	    //update user details if it's required
 	} else if (isUpdateUserDetails) {
@@ -309,19 +309,19 @@
 	    // first name validation
 	    if (StringUtils.isNotBlank(firstName) && !ValidationUtil.isFirstLastNameValid(firstName)) {
 		throw new UserInfoValidationException("Can't update user details due to validation error: "
-			+ "First name contains invalid characters. External server:" + serverMap.getServerid()
+			+ "First name contains invalid characters. External server:" + extServer.getServerid()
 			+ ", Username:" + user.getLogin() + ", firstName:" + firstName + ", lastName:" + lastName);
 	    }
 	    // last name validation
 	    if (StringUtils.isNotBlank(lastName) && !ValidationUtil.isFirstLastNameValid(lastName)) {
 		throw new UserInfoValidationException("Can't update user details due to validation error: "
-			+ "Last name contains invalid characters. External server:" + serverMap.getServerid()
+			+ "Last name contains invalid characters. External server:" + extServer.getServerid()
 			+ ", Username:" + user.getLogin() + ", firstName:" + firstName + ", lastName:" + lastName);
 	    }
 	    // user email validation
 	    if (StringUtils.isNotBlank(email) && !ValidationUtil.isEmailValid(email)) {
 		throw new UserInfoValidationException("Can't update user details due to validation error: "
-			+ "Email format is invalid. External server:" + serverMap.getServerid() + ", Username:"
+			+ "Email format is invalid. External server:" + extServer.getServerid() + ", Username:"
 			+ user.getLogin() + ", firstName:" + firstName + ", lastName:" + lastName);
 	    }
 
@@ -340,18 +340,18 @@
 	}
     }
 
-    private Organisation createOrganisation(ExtServerOrgMap serverMap, User user, String extCourseId,
+    private Organisation createOrganisation(ExtServer extServer, User user, String extCourseId,
 	    String extCourseName, String countryIsoCode, String langIsoCode, String parentOrgId, Boolean prefix)
 	    throws UserInfoValidationException {
 
 	Organisation org = new Organisation();
 
 	// org name validation
-	String orgName = prefix ? buildName(serverMap.getPrefix(), extCourseName) : extCourseName;
+	String orgName = prefix ? buildName(extServer.getPrefix(), extCourseName) : extCourseName;
 	if (StringUtils.isNotBlank(orgName) && !ValidationUtil.isOrgNameValid(orgName)) {
 	    throw new UserInfoValidationException("Can't create organisation due to validation error: "
 		    + "organisation name cannot contain any of these characters < > ^ * @ % $. External server:"
-		    + serverMap.getServerid() + ", orgId:" + extCourseId + ", orgName:" + orgName);
+		    + extServer.getServerid() + ", orgId:" + extCourseId + ", orgName:" + orgName);
 	}
 	org.setName(orgName);
 
@@ -383,10 +383,10 @@
     }
 
     // flexible method to specify username and password
-    private ExtUserUseridMap createExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername, String password,
+    private ExtUserUseridMap createExtUserUseridMap(ExtServer extServer, String extUsername, String password,
 	    String salt, String[] userData, boolean prefix) throws UserInfoValidationException {
 
-	String login = prefix ? buildName(serverMap.getPrefix(), extUsername) : extUsername;
+	String login = prefix ? buildName(extServer.getPrefix(), extUsername) : extUsername;
 	String firstName = userData[1];
 	String lastName = userData[2];
 	String email = userData[11];
@@ -395,31 +395,31 @@
 	if (StringUtils.isBlank(login)) {
 	    throw new UserInfoValidationException(
 		    "Can't create user due to validation error: " + "Username cannot be blank. External server:"
-			    + serverMap.getServerid() + ", firstName:" + firstName + ", lastName:" + lastName);
+			    + extServer.getServerid() + ", firstName:" + firstName + ", lastName:" + lastName);
 	} else if (!ValidationUtil.isUserNameValid(login)) {
 	    throw new UserInfoValidationException("Can't create user due to validation error: "
 		    + "Username can only contain alphanumeric characters and no spaces. External server:"
-		    + serverMap.getServerid() + ", Username:" + login);
+		    + extServer.getServerid() + ", Username:" + login);
 	}
 
 	// first name validation
 	if (StringUtils.isNotBlank(firstName) && !ValidationUtil.isFirstLastNameValid(firstName)) {
 	    throw new UserInfoValidationException("Can't create user due to validation error: "
-		    + "First name contains invalid characters. External server:" + serverMap.getServerid()
+		    + "First name contains invalid characters. External server:" + extServer.getServerid()
 		    + ", Username:" + login + ", firstName:" + firstName + ", lastName:" + lastName);
 	}
 
 	// last name validation
 	if (StringUtils.isNotBlank(lastName) && !ValidationUtil.isFirstLastNameValid(lastName)) {
 	    throw new UserInfoValidationException("Can't create user due to validation error: "
-		    + "Last name contains invalid characters. External server:" + serverMap.getServerid()
+		    + "Last name contains invalid characters. External server:" + extServer.getServerid()
 		    + ", Username:" + login + ", firstName:" + firstName + ", lastName:" + lastName);
 	}
 
 	// user email validation
 	if (StringUtils.isNotBlank(email) && !ValidationUtil.isEmailValid(email)) {
 	    throw new UserInfoValidationException("Can't create user due to validation error: "
-		    + "Email format is invalid. External server:" + serverMap.getServerid() + ", Username:" + login
+		    + "Email format is invalid. External server:" + extServer.getServerid() + ", Username:" + login
 		    + ", firstName:" + firstName + ", lastName:" + lastName);
 	}
 
@@ -446,24 +446,24 @@
 	user.setLocale(LanguageUtil.getSupportedLocale(userData[13], userData[12]));
 	user.setTheme(service.getDefaultTheme());
 	service.save(user);
-	ExtUserUseridMap map = new ExtUserUseridMap();
-	map.setExtServerOrgMap(serverMap);
-	map.setExtUsername(extUsername);
-	map.setUser(user);
-	service.save(map);
-	return map;
+	ExtUserUseridMap extUserUseridMap = new ExtUserUseridMap();
+	extUserUseridMap.setExtServer(extServer);
+	extUserUseridMap.setExtUsername(extUsername);
+	extUserUseridMap.setUser(user);
+	service.save(extUserUseridMap);
+	return extUserUseridMap;
     }
 
-    private String[] getUserDataFromExtServer(ExtServerOrgMap serverMap, String extUsername)
+    private String[] getUserDataFromExtServer(ExtServer extServer, String extUsername)
 	    throws UserInfoFetchException {
 	// the callback url must contain %username%, %timestamp% and %hash%
 	// eg:
 	// "http://test100.ics.mq.edu.au/webapps/lams-plglamscontent-bb_bb60/UserData?uid=%username%&ts=%timestamp%&hash=%hash%";
 	// where %username%, %timestamp% and %hash% will be replaced with their real values
 	try {
-	    String userDataCallbackUrl = serverMap.getUserinfoUrl();
+	    String userDataCallbackUrl = extServer.getUserinfoUrl();
 	    String timestamp = Long.toString(new Date().getTime());
-	    String hash = hash(serverMap, extUsername, timestamp);
+	    String hash = hash(extServer, extUsername, timestamp);
 
 	    String encodedExtUsername = URLEncoder.encode(extUsername, "UTF8");
 
@@ -475,21 +475,21 @@
 	    URLConnection conn = url.openConnection();
 	    if (!(conn instanceof HttpURLConnection)) {
 		throw new UserInfoFetchException("Fail to fetch user data from external server:"
-			+ serverMap.getServerid() + "- Invalid connection type");
+			+ extServer.getServerid() + "- Invalid connection type");
 	    }
 
 	    HttpURLConnection httpConn = (HttpURLConnection) conn;
 	    if (httpConn.getResponseCode() != HttpURLConnection.HTTP_OK) {
 		throw new UserInfoFetchException("Fail to fetch user data from external server:"
-			+ serverMap.getServerid() + " - Unexpected return HTTP Status:" + httpConn.getResponseCode());
+			+ extServer.getServerid() + " - Unexpected return HTTP Status:" + httpConn.getResponseCode());
 	    }
 
 	    InputStream is = url.openConnection().getInputStream();
 	    BufferedReader isReader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
 	    String str = isReader.readLine();
 	    if (str == null) {
 		throw new UserInfoFetchException("Fail to fetch user data from external server:"
-			+ serverMap.getServerid() + " - No data returned from external server");
+			+ extServer.getServerid() + " - No data returned from external server");
 	    }
 
 	    return CSVUtil.parse(str);
@@ -507,9 +507,9 @@
     }
 
     @Override
-    public String hash(ExtServerOrgMap serverMap, String extUsername, String timestamp) {
-	String serverId = serverMap.getServerid();
-	String serverKey = serverMap.getServerkey();
+    public String hash(ExtServer extServer, String extUsername, String timestamp) {
+	String serverId = extServer.getServerid();
+	String serverKey = extServer.getServerkey();
 	String plaintext = timestamp.trim().toLowerCase() + extUsername.trim().toLowerCase()
 		+ serverId.trim().toLowerCase() + serverKey.trim().toLowerCase();
 	return HashUtil.sha1(plaintext);
@@ -520,17 +520,17 @@
     }
 
     @Override
-    public List<ExtServerOrgMap> getAllExtServerOrgMaps() {
+    public List<ExtServer> getAllExtServers() {
 	Map<String, Object> properties = new HashMap<String, Object>();
-	properties.put("serverTypeId", ExtServerOrgMap.INTEGRATION_SERVER_TYPE);
-	return service.findByProperties(ExtServerOrgMap.class, properties);
+	properties.put("serverTypeId", ExtServer.INTEGRATION_SERVER_TYPE);
+	return service.findByProperties(ExtServer.class, properties);
     }
     
     @Override
-    public List<ExtServerOrgMap> getAllToolConsumers() {
+    public List<ExtServer> getAllToolConsumers() {
 	Map<String, Object> properties = new HashMap<String, Object>();
-	properties.put("serverTypeId", ExtServerOrgMap.LTI_CONSUMER_SERVER_TYPE);
-	return service.findByProperties(ExtServerOrgMap.class, properties);
+	properties.put("serverTypeId", ExtServer.LTI_CONSUMER_SERVER_TYPE);
+	return service.findByProperties(ExtServer.class, properties);
     }
 
     @Override
@@ -567,22 +567,22 @@
     }
 
     @Override
-    public void saveExtServerOrgMap(ExtServerOrgMap map) {
+    public void saveExtServer(ExtServer map) {
 	service.save(map);
     }
 
     @Override
-    public ExtServerOrgMap getExtServerOrgMap(Integer sid) {
-	return (ExtServerOrgMap) service.findById(ExtServerOrgMap.class, sid);
+    public ExtServer getExtServer(Integer sid) {
+	return (ExtServer) service.findById(ExtServer.class, sid);
     }
 
     @Override
-    public void createExtServerLessonMap(Long lessonId, ExtServerOrgMap extServer) {
+    public void createExtServerLessonMap(Long lessonId, ExtServer extServer) {
 	createExtServerLessonMap(lessonId, null, extServer);;
     }
     
     @Override
-    public void createExtServerLessonMap(Long lessonId, String resourceLinkId, ExtServerOrgMap extServer) {
+    public void createExtServerLessonMap(Long lessonId, String resourceLinkId, ExtServer extServer) {
 	ExtServerLessonMap map = new ExtServerLessonMap();
 	map.setLessonId(lessonId);
 	map.setResourceLinkId(resourceLinkId);
@@ -603,14 +603,14 @@
 	    // checks whether the lesson was created from extServer and whether it has lessonFinishCallbackUrl setting
 	    if (extServerLesson != null
 		    && StringUtils.isNotBlank(extServerLesson.getExtServer().getLessonFinishUrl())) {
-		ExtServerOrgMap server = extServerLesson.getExtServer();
+		ExtServer server = extServerLesson.getExtServer();
 
 		ExtUserUseridMap extUser = getExtUserUseridMapByUserId(server, user.getUserId());
 		if (extUser != null) {
 		    String extUsername = extUser.getExtUsername();
 
 		    //return URL in case of integration server
-		    if (server.getServerTypeId().equals(ExtServerOrgMap.INTEGRATION_SERVER_TYPE)) {
+		    if (server.getServerTypeId().equals(ExtServer.INTEGRATION_SERVER_TYPE)) {
 			// construct real lessonFinishCallbackUrl
 			lessonFinishCallbackUrl = server.getLessonFinishUrl();
 			String timestamp = Long.toString(new Date().getTime());
@@ -726,10 +726,10 @@
 		    + " there is no corresponding ExtCourseClassMap for lessonId " + lessonId);
 	}
 
-	ExtServerOrgMap serverMap = extServerLesson.getExtServer();
+	ExtServer extServer = extServerLesson.getExtServer();
 
 	// construct real lessonFinishCallbackUrl
-	String lmsGroupsUrl = serverMap.getExtGroupsUrl();
+	String lmsGroupsUrl = extServer.getExtGroupsUrl();
 
 	//in case group info is also requested - provide selected groups' ids
 	if (extGroupIds != null && extGroupIds.length > 0) {
@@ -746,7 +746,7 @@
 
 	String timestamp = Long.toString(new Date().getTime());
 	String hashUsername = "username";
-	String hash = hash(serverMap, hashUsername, timestamp);
+	String hash = hash(extServer, hashUsername, timestamp);
 
 	// set values for the parameters
 	HashMap<String, String> params = new HashMap<String, String>();
@@ -779,7 +779,7 @@
 
 		    String extUsername = jsonUser.getString("userName");
 
-		    ExtUserUseridMap extUserUseridMap = getExistingExtUserUseridMap(serverMap, extUsername);
+		    ExtUserUseridMap extUserUseridMap = getExistingExtUserUseridMap(extServer, extUsername);
 
 		    //create extUserUseridMap if it's not available
 		    if (extUserUseridMap == null) {
@@ -793,7 +793,7 @@
 			}
 			String salt = HashUtil.salt();
 			String password = HashUtil.sha1(RandomPasswordGenerator.nextPassword(10));
-			extUserUseridMap = createExtUserUseridMap(serverMap, extUsername, password, salt, userData,
+			extUserUseridMap = createExtUserUseridMap(extServer, extUsername, password, salt, userData,
 				true);
 		    }
 		    User user = extUserUseridMap.getUser();
@@ -825,7 +825,7 @@
     public ExtCourseClassMap getExtCourseClassMap(Integer sid, Long lessonId) {
 	Lesson lesson = lessonService.getLesson(lessonId);
 	Map<String, Object> properties = new HashMap<String, Object>();
-	properties.put("extServerOrgMap.sid", sid);
+	properties.put("extServer.sid", sid);
 	properties.put("organisation.organisationId", lesson.getOrganisation().getOrganisationId());
 	List<ExtCourseClassMap> list = service.findByProperties(ExtCourseClassMap.class, properties);
 	return list == null || list.isEmpty() ? null : list.get(0);
@@ -850,9 +850,9 @@
 	}
     }
 
-    private ExtUserUseridMap getExtUserUseridMapByUserId(ExtServerOrgMap serverMap, Integer userId) {
+    private ExtUserUseridMap getExtUserUseridMapByUserId(ExtServer extServer, Integer userId) {
 	Map<String, Object> properties = new HashMap<String, Object>();
-	properties.put("extServerOrgMap.sid", serverMap.getSid());
+	properties.put("extServer.sid", extServer.getSid());
 	properties.put("user.userId", userId);
 	List list = service.findByProperties(ExtUserUseridMap.class, properties);
 	if ((list == null) || (list.size() == 0)) {
Index: lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -r11b64f81e406ff277c7c35988304b0064300de57
--- lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java	(.../LoginRequestDispatcher.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java	(.../LoginRequestDispatcher.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
@@ -27,7 +27,7 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.ExtUserUseridMap;
 import org.lamsfoundation.lams.integration.UserInfoFetchException;
 import org.lamsfoundation.lams.integration.UserInfoValidationException;
@@ -207,8 +207,8 @@
 	}
 	String serverId = request.getParameter(PARAM_SERVER_ID);
 	String extUsername = request.getParameter(PARAM_USER_ID);
-	ExtServerOrgMap serverMap = integrationService.getExtServerOrgMap(serverId);
-	ExtUserUseridMap userMap = integrationService.getExtUserUseridMap(serverMap, extUsername);
+	ExtServer extServer = integrationService.getExtServer(serverId);
+	ExtUserUseridMap userMap = integrationService.getExtUserUseridMap(extServer, extUsername);
 	User user = userMap.getUser();
 	if (user == null) {
 	    String error = "Unable to add user to lesson class as user is missing from the user map";