Index: lams_tool_vote/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r522aabf2d31dd0506374a3e7b50fc0a4a83a989d -rc9f26e671816b4220c0a45e76b2c5c7c4305a35b
--- lams_tool_vote/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 522aabf2d31dd0506374a3e7b50fc0a4a83a989d)
+++ lams_tool_vote/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision c9f26e671816b4220c0a45e76b2c5c7c4305a35b)
@@ -24,65 +24,14 @@
 
  	<!-- ========== Global Forward Definitions =================================== -->
    	<global-forwards>
-		<forward name="starter" path="/authoringStarter"/>   
+		<forward name="starter" path="/authoring.do"/>   
 	</global-forwards>
 	
   <!-- ========== Action Mapping Definitions =================================== -->
   <action-mappings>
-	<!--Authoring Starter Action: initializes the authoring module -->
-   <action path="/authoringStarter" 
-   			type="org.lamsfoundation.lams.tool.vote.web.VoteStarterAction" 
-   			name="VoteAuthoringForm" 
-	      	scope="request"
-   			input="/index.jsp"> 
-	
-	  	<forward
-		    name="load"
-		    path="/authoring/AuthoringMaincontent.jsp"
-		    redirect="false"
-	  	/>
-
-	  	<forward
-		    name="loadMonitoring"
-		    path="/monitoring/MonitoringMaincontent.jsp"
-		    redirect="false"
-	  	/>
-
-	  	<forward
-		    name="loadMonitoringEditActivity"
-		    path="/monitoring/MonitoringMaincontent.jsp"
-		    redirect="false"
-	  	/>
-	  	
-	  	<forward
-		    name="loadLearner"
-		    path="/learning/AnswersContent.jsp"
-		    redirect="false"
-	  	/>
-
-	  	<forward
-	        name="starter"
-	        path="/index.jsp"
-		    redirect="false"
-	     />
-	     
-	     <forward
-	        name="preview"
-	        path="/learning/Preview.jsp"
-		    redirect="false"
-	     />
-	  	
-	  	<forward
-		    name="errorList"
-		    path="/VoteErrorBox.jsp"
-		    redirect="false"
-	  	/>
-	</action>  
-	
-
 	<!--Authoring Main Action : interacts with the authoring module user-->
 	<action path="/authoring"
-	      	type="org.lamsfoundation.lams.tool.vote.web.VoteAction"
+	      	type="org.lamsfoundation.lams.tool.vote.web.AuthoringAction"
     	  	name="VoteAuthoringForm"
 	      	scope="request"
     	  	input="/authoring/AuthoringMaincontent.jsp"
@@ -94,11 +43,23 @@
 		    redirect="false"
 	      />
 
+          <forward
+		    name="loadMonitoringEditActivity"
+		    path="/monitoring/MonitoringMaincontent.jsp"
+		    redirect="false"
+	  	/>
+
 	      <forward
 	        name="loadNominations"
 	        path="/authoring/itemlist.jsp"
 		    redirect="false"
 	      />
+	      
+	      <forward
+		    name="loadLearner"
+		    path="/learning/AnswersContent.jsp"
+		    redirect="false"
+	  	/>
 	    
 	      <forward
 	        name="starter"
@@ -256,39 +217,12 @@
     </action>
     
     
-    <!--Monitoring Starter Action: initializes the Monitoring module -->
-   <action 	path="/monitoringStarter" 
-   			type="org.lamsfoundation.lams.tool.vote.web.VoteMonitoringStarterAction" 
-	      	scope="request"
-   			name="VoteMonitoringForm" 
-      		unknown="false"
-      		validate="false"
-   			input="/monitoringIndex.jsp"> 
-
-	  	<forward
-			name="loadMonitoring"
-			path="/monitoring/MonitoringMaincontent.jsp"
-			redirect="false"
-	  	/>
-	
-	  	<forward
-			name="refreshMonitoring"
-			path="/monitoring/MonitoringMaincontent.jsp"
-			redirect="false"
-	  	/>
-	         			
-   			
-	  	<forward
-		    name="errorList"
-	        path="/VoteErrorBox.jsp"
-		    redirect="false"
-	  	/>
-	</action>  
     
+    
    
    <!--Monitoring Main Action: interacts with the Monitoring module user -->
    <action 	path="/monitoring" 
-   			type="org.lamsfoundation.lams.tool.vote.web.VoteMonitoringAction" 
+   			type="org.lamsfoundation.lams.tool.vote.web.MonitoringAction" 
    			name="VoteMonitoringForm" 
 	      	scope="request"
    			input="/monitoring/MonitoringMaincontent.jsp"
@@ -340,7 +274,7 @@
 
 	    <forward
 			name="monitoringStarterRedirect"
-			path="/monitoringStarter.do"
+			path="/monitoring/start.do"
 			redirect="true"
 	    />
 
Index: lams_tool_vote/web/WEB-INF/web.xml
===================================================================
diff -u -r0b9090d0eea4ebffbe709fe84b35b13c787dea40 -rc9f26e671816b4220c0a45e76b2c5c7c4305a35b
--- lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision 0b9090d0eea4ebffbe709fe84b35b13c787dea40)
+++ lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision c9f26e671816b4220c0a45e76b2c5c7c4305a35b)
@@ -269,7 +269,6 @@
 			<web-resource-name>Authoring content</web-resource-name>
 			<url-pattern>/authoring/*</url-pattern>
 			<url-pattern>/authoring.do</url-pattern>
-			<url-pattern>/authoringStarter.do</url-pattern>
 			<url-pattern>/pedagogicalPlanner.do</url-pattern>
 		</web-resource-collection>
 		<auth-constraint>
@@ -283,7 +282,6 @@
 			<web-resource-name>Staff content</web-resource-name>
 			<url-pattern>/monitoring/*</url-pattern>
 			<url-pattern>/monitoring.do</url-pattern>
-			<url-pattern>/monitoringStarter.do</url-pattern>
 		</web-resource-collection>
 		<auth-constraint>
 			<role-name>MONITOR</role-name>
Index: lams_tool_vote/web/monitoring/Edit.jsp
===================================================================
diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -rc9f26e671816b4220c0a45e76b2c5c7c4305a35b
--- lams_tool_vote/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
+++ lams_tool_vote/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision c9f26e671816b4220c0a45e76b2c5c7c4305a35b)
@@ -25,7 +25,7 @@
 
 </table>
 
-<c:url  var="authoringUrl" value="/authoringStarter.do">
+<c:url  var="authoringUrl" value="/authoring.do?dispatch=start">
 	<c:param name="toolContentID" value="${formBean.toolContentID}" />
 	<c:param name="contentFolderID" value="${formBean.contentFolderID}" />
 	<c:param name="mode" value="teacher" />