Index: lams_tool_lamc/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r9143e89a9c23c613879042751449004326a50bf6
--- lams_tool_lamc/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_lamc/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 9143e89a9c23c613879042751449004326a50bf6)
@@ -19,8 +19,7 @@
   USA
 
   http://www.gnu.org/licenses/gpl.txt
--->
-
+--> 
 <tiles-definitions>
 <!-- ============= template Definitions ====================== -->
 	<definition name=".baseDef" path="/Template.jsp">
@@ -37,76 +36,61 @@
 		<put name="content" value="/SystemErrorContent.jsp" />	
 	</definition>
 	
-	<definition name=".mcErrorBox" extends=".baseDef" >
+	<definition name=".qaErrorBox" extends=".baseDef" >
 		<put name="title" value="Error Page"/>
 		<put name="pageHeader" value = "Exception"/>
-		<put name="content" value="/McErrorBox.jsp" />	
+		<put name="content" value="/QaErrorBox.jsp" />	
 	</definition>
-
 	
-<!-- ============= Mc Authoring Module Definitions ====================== -->	
+
 	<definition name=".questions" extends=".baseDef" >
-		<put name="title" value="MCQ Tool Questions"/>
-		<put name="pageHeader" value = "MCQ Tool Questions"/>
-		<put name="content" value="/authoring/AuthoringMaincontent.jsp" />	
+		<put name="title" value="Q/A Tool Questions"/>
+		<put name="pageHeader" value = "Q/A Tool Questions"/>
+		<put name="content" value="/AuthoringMaincontent.jsp" />	
 	</definition>
 	
 	<definition name=".starter" extends=".baseDef" >
 		<put name="title" value="Starter for Multiple Choice Authoring"/>
-		<put name="pageHeader" value = "Starter for Multiple Choice Authoring"/>
+		<put name="pageHeader" value = "Starter for Q/A Authoring"/>
 		<put name="content" value="/index.jsp" />	
 	</definition>
 	
-	<definition name=".errorList" extends=".baseDef" >
-		<put name="title" value="Error"/>
-		<put name="pageHeader" value = "Error"/>
-		<put name="content" value="/ErrorList.jsp" />	
-	</definition>
-	
-<!-- ============= Mc Learning Module Definitions ====================== -->		
 	<definition name=".answers" extends=".baseDef" >
-		<put name="title" value="MCQ Tool Answers"/>
-		<put name="pageHeader" value = "MCQ Tool Answers"/>
-		<put name="content" value="/learning/AnswersContent.jsp" />	
+		<put name="title" value="Answers for Q/A"/>
+		<put name="pageHeader" value = "Answers for Q/A"/>
+		<put name="content" value="/answersContent.jsp" />	
 	</definition>
 	
 	<definition name=".learningStarter" extends=".baseDef" >
-		<put name="title" value="Starter for MCQ Learning"/>
-		<put name="pageHeader" value = "Starter for MCQ Learning"/>
+		<put name="title" value="Starter for Q/A Learning"/>
+		<put name="pageHeader" value = "Starter for Q/A Learning"/>
 		<put name="content" value="/learningIndex.jsp" />	
 	</definition>
-
-	<definition name=".individualReport" extends=".baseDef" >
-		<put name="title" value="MCQ Tool Individual Report"/>
-		<put name="pageHeader" value ="MCQ Tool Individual Report"/>
-		<put name="content" value="/learning/IndividualLearnerResults.jsp" />	
-	</definition>
 	
-	<definition name=".redoQuestions" extends=".baseDef" >
-		<put name="title" value="MCQ Tool Redo Questions"/>
-		<put name="pageHeader" value ="MCQ Tool Redo Questions"/>
-		<put name="content" value="/learning/RedoQuestions.jsp" />	
+	<definition name=".learnerReport" extends=".baseDef" >
+		<put name="title" value="Learner Report"/>
+		<put name="pageHeader" value = "Learner Report"/>
+		<put name="content" value="/learnerReport.jsp" />	
 	</definition>
 
-	<definition name=".singleQuestionAnswers" extends=".baseDef" >
-		<put name="title" value="MCQ Tool Answers"/>
-		<put name="pageHeader" value ="MCQ Tool Answers"/>
-		<put name="content" value="/learning/SingleQuestionAnswersContent.jsp" />	
+	<definition name=".monitoringReport" extends=".baseDef" >
+		<put name="title" value="Monitoring Report"/>
+		<put name="pageHeader" value = "Monitoring Report"/>
+		<put name="content" value="/monitoringReport.jsp" />	
+	</definition>	
+	
+	<definition name=".exportPortfolioStarter" extends=".baseDef" >
+		<put name="title" value="Starter for Q/A Export Portfolio"/>
+		<put name="pageHeader" value = "Starter for Q/A Export Portfolio"/>
+		<put name="content" value="/exportPortfolioIndex.jsp" />	
 	</definition>
 	
-	<definition name=".viewAnswers" extends=".baseDef" >
-		<put name="title" value="MCQ Tool View Previous Answers"/>
-		<put name="pageHeader" value = "MCQ Tool View Previous Answers"/>
-		<put name="content" value="/learning/ViewAnswers.jsp" />	
+	<definition name=".portfolioReport" extends=".baseDef" >
+		<put name="title" value="Portfolio Report"/>
+		<put name="pageHeader" value = "Portfolio Report"/>
+		<put name="content" value="/portfolioReport.jsp" />	
 	</definition>
-
-	<definition name=".resultsSummary" extends=".baseDef" >
-		<put name="title" value="MCQ Tool Results Summary"/>
-		<put name="pageHeader" value = "MCQ Tool Results Summary"/>
-		<put name="content" value="/learning/ResultsSummary.jsp" />	
-	</definition>
 	
-	<!-- ============= Mc Monitoring Module Definitions ====================== -->		
 	<definition name=".monitoringStarter" extends=".baseDef" >
 		<put name="title" value="Starter for MCQ Monitoring"/>
 		<put name="pageHeader" value = "Starter for MCQ Monitoring"/>
@@ -119,12 +103,6 @@
 		<put name="content" value="/monitoring/MonitoringMaincontent.jsp" />	
 	</definition>
 	
-	<definition name=".preview" extends=".baseDef" >
-		<put name="title" value="MCQ Preview"/>
-		<put name="pageHeader" value = "MCQ Preview"/>
-		<put name="content" value="/learning/Preview.jsp" />	
-	</definition>
-	
 	<definition name=".exportPortfolio" extends=".baseDef" >
 		<put name="title" value="MCQ Portfolio Export"/>
 		<put name="pageHeader" value = "MCQ Portfolio Export"/>