Index: lams_build/build.xml
===================================================================
diff -u -r789b6b700e87d99e0fa7d58e8ab2c5faf477605c -r3a95b6e5a65bc77a5f4a3a9a011e452aebf30a3f
--- lams_build/build.xml	(.../build.xml)	(revision 789b6b700e87d99e0fa7d58e8ab2c5faf477605c)
+++ lams_build/build.xml	(.../build.xml)	(revision 3a95b6e5a65bc77a5f4a3a9a011e452aebf30a3f)
@@ -283,9 +283,8 @@
 	</target>
 	
 	
-	<target name="_deploy-tools-common">
-		
-		<echo>Deploying common Tools</echo>
+	<target name="_deploy-tools-lams">
+		<echo>Deploying Tools</echo>
 		<ant antfile="../${tool_forum_dir}/build.xml"         target="deploy-tool" inheritAll="false" />
 		<ant antfile="../${tool_lanb_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
 		<ant antfile="../${tool_laqa_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
@@ -310,22 +309,16 @@
 		<ant antfile="../${tool_wookie_dir}/build.xml"        target="deploy-tool" inheritAll="false" />
 		<ant antfile="../${tool_imscc_dir}/build.xml"         target="deploy-tool" inheritAll="false" />
 		<ant antfile="../${tool_bbb_dir}/build.xml"           target="deploy-tool" inheritAll="false" />
+		<ant antfile="../${tool_lamc_dir}/build.xml"          target="deploy-tool" inheritAll="false" />
 	</target>
 	
-	
-	<target name="_deploy-tools-lams" unless="isRAMS" depends="_deploy-tools-common">
-		<!-- Internal target: Deploys LAMS tools. -->
-		<echo>Deploying LAMS set of tools</echo>
-		<ant antfile="../${tool_lamc_dir}/build.xml" target="deploy-tool" inheritAll="false" />
-	</target>
-	
 
 	<target name="deploy-tools" depends="_deploy-tools-lams, deploy-learning-libraries" 
-		    description="Deploys LAMS or RAMS Tools and special parallel activities." />
+		    description="Deploys LAMS Tools and special parallel activities." />
 
 
 	<target name="deploy-tools-updater" depends="_deploy-tools-lams" 
-		description="Deploys LAMS or RAMS Tools and special parallel activities. For upgrader only!">
+		description="Deploys LAMS Tools. For upgrader only!">
 	</target>
 
 	
Index: lams_central/build.xml
===================================================================
diff -u -r73963b896de9269e9c4e5a5c229159588eb18c75 -r3a95b6e5a65bc77a5f4a3a9a011e452aebf30a3f
--- lams_central/build.xml	(.../build.xml)	(revision 73963b896de9269e9c4e5a5c229159588eb18c75)
+++ lams_central/build.xml	(.../build.xml)	(revision 3a95b6e5a65bc77a5f4a3a9a011e452aebf30a3f)
@@ -8,12 +8,8 @@
 	<property file="../lams_build/shared.properties"/>
 	
 	<available file="../${lams_planner}/build.xml" property="planner.available" />
+		
 	
-	<condition property="isRAMS">
-		<equals arg1="${conf.application}" arg2="rams" />
-	</condition>
-
-	
 	<!-- Below are Tool specifc targets and targets overriding ones from the imported base file. -->
 	<target name="_copy-planner" if="planner.available" depends="_copy-language">
 		<echo>Copying Pedagogical Planner files</echo>
@@ -39,15 +35,6 @@
 	</target>
 	
 	
-	<target name="_update-logo-for-RAMS" if="isRAMS">
-		<!-- Internal target: updates logo in built WAR for RAMS project -->
-		<echo>Setting login logo to RAMS</echo>
-		<move tofile="${build.lib}/${product}.war/images/css/lams_login.gif"
-			  file="${conf.web.dir}/images/ramsthemecss/rams_login.gif" 
-		      overwrite="true" verbose="true" />
-	</target>
-	
-	
 	<target name="_build-war"
 	        depends="_build-webdoclet, _build-manifest, _copy-war-resources, _copy-planner, _jsp-plaincopy, _jsp-precompile">
 		
@@ -66,8 +53,6 @@
 				<include name="MANIFEST.MF"/>
 			</fileset>
 		</copy>
-					
-		<antcall target="_update-logo-for-RAMS" />
 	</target>
 	
 	
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3a95b6e5a65bc77a5f4a3a9a011e452aebf30a3f
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java	(.../MainExportServlet.java)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java	(.../MainExportServlet.java)	(revision 3a95b6e5a65bc77a5f4a3a9a011e452aebf30a3f)
@@ -163,8 +163,7 @@
 	    }
 
 	    // correct all image links in created htmls.
-	    replaceImageFolderLinks(portfolios.getContentFolderID(),
-		    Configuration.get(ConfigurationKeys.SERVER_URL_CONTEXT_PATH));
+	    replaceImageFolderLinks(portfolios.getContentFolderID());
 
 	    // bundle the stylesheet with the package
 	    CSSBundler bundler = new CSSBundler(request, cookies, exportTmpDir, exportService.getUserThemes());
@@ -199,10 +198,8 @@
      * 
      * @param contentFolderI
      *            32-character content folder name
-     * @param lamsOrRams
-     *            "/rams" if we are running rams and "/lams" otherwise
      */
-    private void replaceImageFolderLinks(String contentFolderID, String lamsOrRams) {
+    private void replaceImageFolderLinks(String contentFolderID) {
 	File tempDir = new File(exportTmpDir);
 
 	// finds all the html extension files
@@ -212,7 +209,7 @@
 	for (Iterator it = jspFiles.iterator(); it.hasNext();) {
 	    Object element = it.next();
 	    MainExportServlet.log.debug("Correcting links in file " + element.toString());
-	    replaceImageFolderLinks(element.toString(), contentFolderID, lamsOrRams);
+	    replaceImageFolderLinks(element.toString(), contentFolderID);
 	}
     }
 
@@ -226,13 +223,13 @@
      * @param lamsOrRams
      *            "rams/" if we are running rams and "lams/" otherwise
      */
-    private void replaceImageFolderLinks(String filename, String contentFolderID, String lamsOrRams) {
+    private void replaceImageFolderLinks(String filename, String contentFolderID) {
 	try {
 	    // String to find
-	    String ckeditorpath = "/" + lamsOrRams + "/www/secure/" + contentFolderID;
+	    String ckeditorpath = "/lams/www/secure/" + contentFolderID;
 	    String ckeditorrecpath = "../" + contentFolderID + "/Recordings";
-	    String ckeditorsmiley = "/" + lamsOrRams + "/ckeditor/images/smiley";
-	    String ckeditorvr = "/" + lamsOrRams + "/ckeditor/plugins/videorecorder";
+	    String ckeditorsmiley = "/lams/ckeditor/images/smiley";
+	    String ckeditorvr = "/lams/ckeditor/plugins/videorecorder";
 
 	    // Replacing string
 	    String newckeditorpath = "../" + contentFolderID;
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3a95b6e5a65bc77a5f4a3a9a011e452aebf30a3f
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision 3a95b6e5a65bc77a5f4a3a9a011e452aebf30a3f)
@@ -184,8 +184,7 @@
 
 	    // Update image links
 	    WikiPageContentDTO contentDTO = wikiPageDTO.getCurrentWikiContentDTO();
-	    contentDTO.setBody(replaceImageFolderLinks(contentDTO.getBody(), wikiSession.getContentFolderID(),
-		    Configuration.get(ConfigurationKeys.SERVER_URL_CONTEXT_PATH)));
+	    contentDTO.setBody(replaceImageFolderLinks(contentDTO.getBody(), wikiSession.getContentFolderID()));
 	    wikiPageDTO.setCurrentWikiContentDTO(contentDTO);
 
 	    wikiPageDTOs.add(wikiPageDTO);
@@ -286,8 +285,7 @@
 
 		// Update image links
 		WikiPageContentDTO contentDTO = wikiPageDTO.getCurrentWikiContentDTO();
-		contentDTO.setBody(replaceImageFolderLinks(contentDTO.getBody(), wikiSession.getContentFolderID(),
-			Configuration.get(ConfigurationKeys.SERVER_URL_CONTEXT_PATH)));
+		contentDTO.setBody(replaceImageFolderLinks(contentDTO.getBody(), wikiSession.getContentFolderID()));
 		wikiPageDTO.setCurrentWikiContentDTO(contentDTO);
 
 		wikiPageDTOs.add(wikiPageDTO);
@@ -322,11 +320,11 @@
      * @param contentFolderID
      * @return
      */
-    private String replaceImageFolderLinks(String body, String contentFolderID, String lamsOrRams) {
-	String ckeditorpath = "/" + lamsOrRams + "/www/secure/" + contentFolderID;
+    private String replaceImageFolderLinks(String body, String contentFolderID) {
+	String ckeditorpath = "/lams/www/secure/" + contentFolderID;
 	String newckeditorpath = "./" + contentFolderID;
 
-	String ckeditorsmiley = "/" + lamsOrRams + "/ckeditor/images/smiley";
+	String ckeditorsmiley = "/lams/ckeditor/images/smiley";
 	String newckeditorsmiley = "./ckeditor/images/smiley";
 
 	// The pattern matches control characters