Index: lams_build/conf/j2ee/application.xml
===================================================================
diff -u -rd4cb08ab78bab8448267dda816bddd6087cc8f3c -rfc9a2c85435d2ac3908965f1a5300f7ced9856ea
--- lams_build/conf/j2ee/application.xml	(.../application.xml)	(revision d4cb08ab78bab8448267dda816bddd6087cc8f3c)
+++ lams_build/conf/j2ee/application.xml	(.../application.xml)	(revision fc9a2c85435d2ac3908965f1a5300f7ced9856ea)
@@ -7,10 +7,22 @@
     </description>
     <module>
         <web>
-            <web-uri>lams_central.war</web-uri>
+            <web-uri>lams-central.war</web-uri>
             <context-root>/lams</context-root>
 	</web>
     </module>
+    <module>
+        <web>
+            <web-uri>lams-workspace.war</web-uri>
+            <context-root>/lams/workspace</context-root>
+	</web>
+    </module>
+    <module>
+        <web>
+            <web-uri>lams-authoring.war</web-uri>
+            <context-root>/lams/authoring</context-root>
+	</web>
+    </module>
 <!--     <module>
         <web>
             <web-uri>lams_monitoring.war</web-uri>
@@ -100,12 +112,11 @@
     <!--  End Third Party JAR Files -->
     
     <!--  Tools -->
-<!--     <module>
+    <module>
         <web>
-            <web-uri>lams_tool_imscp.war</web-uri>
+            <web-uri>lams-tool-imscp.war</web-uri>
             <context-root>/lams/tool/imscp</context-root>
 	</web>
     </module>
-    -->
     
 </application>
\ No newline at end of file
Index: lams_build/master-build.xml
===================================================================
diff -u -rd4cb08ab78bab8448267dda816bddd6087cc8f3c -rfc9a2c85435d2ac3908965f1a5300f7ced9856ea
--- lams_build/master-build.xml	(.../master-build.xml)	(revision d4cb08ab78bab8448267dda816bddd6087cc8f3c)
+++ lams_build/master-build.xml	(.../master-build.xml)	(revision fc9a2c85435d2ac3908965f1a5300f7ced9856ea)
@@ -33,7 +33,7 @@
 	</target>
 
 	<!-- clean all projects -->
-	<target name="clean-subporjects" description="cleans sub projects" />
+	<target name="clean-subprojects" description="cleans sub projects" />
 
 
 	<!-- build sub-projects -->
@@ -45,7 +45,10 @@
 			target="build-jar" inheritAll="false" />
 		<ant antfile="../${lams_central}/build.xml" target="build-war"
 			inheritAll="false" />
-		<!--  <ant antfile="../${lams_authoring}/build.xml"  target="build-war" inheritAll="false"/> -->
+		<ant antfile="../${lams_workspace}/build.xml" target="build-war"
+			inheritAll="false" />
+		<ant antfile="../${lams_authoring}/build.xml"  target="build-war"
+			inheritAll="false"/>
 		<!--  <ant antfile="../${lams_learning}/build.xml" target="build-war" inheritAll="false"/> -->
 		<!--  <ant antfile="../${lams_monitoring}/build.xml"  target="build-war" inheritAll="false"/> -->
 		<!--
@@ -88,8 +91,11 @@
 				<include name="${lams.jar}" />
 				<include name="${lams_contentrepository.jar}" />
 				<include name="${lams_central.war}" />
-				<!--<include name="lams_authoring.war"/>
-				<include name="${lams_monitoring.war}"/>
+				<include name="${lams_workspace.jar}"/>
+				<include name="${lams_workspace.war}"/>
+				<include name="${lams_authoring.jar}"/>
+				<include name="${lams_authoring.war}"/>
+			<!-- 	<include name="${lams_monitoring.war}"/>
 				<include name="lams_learning.war"/>
 					<include name="lams_admin.war"/-->
 
Index: lams_build/shared.properties
===================================================================
diff -u -r49c977067df3da97570afce0d9a470d71c529169 -rfc9a2c85435d2ac3908965f1a5300f7ced9856ea
--- lams_build/shared.properties	(.../shared.properties)	(revision 49c977067df3da97570afce0d9a470d71c529169)
+++ lams_build/shared.properties	(.../shared.properties)	(revision fc9a2c85435d2ac3908965f1a5300f7ced9856ea)
@@ -30,13 +30,17 @@
 lams_learning=lams_learning
 lams_monitoring=lams_monitoring
 lams_authoring=lams_authoring
+lams_workspace=lams_workspace
 lams_central=lams_central
 lams_contentrepository=lams_contentrepository
 sub.build.dir=build/lib
 lams.jar=${lams_common}/${sub.build.dir}/lams.jar
 lams_admin.war=${lams_admin}/${sub.build.dir}/lams_admin.war
 lams_learning.war=${lams_learning}/${sub.build.dir}/lams_learning.war
-lams_authoring.war=${lams_authoring}/${sub.build.dir}/lams_authoring.war
+lams_authoring.jar=${lams_authoring}/${sub.build.dir}/lams-authoring.jar
+lams_authoring.war=${lams_authoring}/${sub.build.dir}/lams-authoring.war
 lams_monitoring.war=${lams_monitoring}/${sub.build.dir}/lams_monitoring.war
-lams_central.war=${lams_central}/${sub.build.dir}/lams_central.war
-lams_contentrepository.jar=${lams_contentrepository}/${sub.build.dir}/lams_contentrepository.jar
+lams_workspace.jar=${lams_workspace}/${sub.build.dir}/lams-workspace.jar
+lams_workspace.war=${lams_workspace}/${sub.build.dir}/lams-workspace.war
+lams_central.war=${lams_central}/${sub.build.dir}/lams-central.war
+lams_contentrepository.jar=${lams_contentrepository}/${sub.build.dir}/lams-contentrepository.jar