diff --git a/apps/showcase/src/main/resources/struts-actionchaining.xml b/apps/showcase/src/main/resources/struts-actionchaining.xml
index bdefeb0a2..94d8b2857 100644
--- a/apps/showcase/src/main/resources/struts-actionchaining.xml
+++ b/apps/showcase/src/main/resources/struts-actionchaining.xml
@@ -12,7 +12,7 @@
 			<result type="chain">actionChain3</result>
 		</action>
 		<action name="actionChain3" class="org.apache.struts2.showcase.actionchaining.ActionChain3">
-			<result>/actionchaining/actionChainingResult.jsp</result>
+			<result>/WEB-INF/actionchaining/actionChainingResult.jsp</result>
 		</action>
 	</package>
 </struts>
diff --git a/apps/showcase/src/main/resources/struts-ajax.xml b/apps/showcase/src/main/resources/struts-ajax.xml
index 910112cf7..43d087686 100644
--- a/apps/showcase/src/main/resources/struts-ajax.xml
+++ b/apps/showcase/src/main/resources/struts-ajax.xml
@@ -6,27 +6,27 @@
 <struts>
     <package name="ajax" extends="struts-default">
         <action name="AjaxTest" class="org.apache.struts2.showcase.ajax.AjaxTestAction">
-            <result>/ajax/AjaxResult.jsp</result>
+            <result>/WEB-INF/ajax/AjaxResult.jsp</result>
         </action>
 
         <action name="AjaxRemoteLink" class="org.apache.struts2.showcase.ajax.AjaxTestAction">
-            <result>/ajax/AjaxResult2.js</result>
+            <result>/WEB-INF/ajax/AjaxResult2.js</result>
         </action>
 
         <action name="AjaxRemoteForm" class="org.apache.struts2.showcase.ajax.AjaxTestAction">
-            <result>/ajax/AjaxResult3.jsp</result>
+            <result>/WEB-INF/ajax/AjaxResult3.jsp</result>
         </action>
 
         <action name="Test1">
-            <result>/ajax/remoteforms/test2.jsp</result>
+            <result>/WEB-INF/ajax/remoteforms/test2.jsp</result>
         </action>
 
         <action name="Test2">
-            <result>/ajax/remoteforms/test3.jsp</result>
+            <result>/WEB-INF/ajax/remoteforms/test3.jsp</result>
         </action>
 
         <action name="Test3">
-            <result>/ajax/testjs.jsp</result>
+            <result>/WEB-INF/ajax/testjs.jsp</result>
         </action>
 
         <action name="JSONList">
@@ -34,54 +34,54 @@
         </action>
 
         <action name="tree">
-            <result>/ajax/tree/tree.jsp</result>
+            <result>/WEB-INF/ajax/tree/tree.jsp</result>
         </action>
 
         <action name="getCategory" class="org.apache.struts2.showcase.ajax.tree.GetCategory">
-            <result>/ajax/tree/getCategory.jsp</result>
+            <result>/WEB-INF/ajax/tree/getCategory.jsp</result>
         </action>
 
         <action name="toggle" class="org.apache.struts2.showcase.ajax.tree.Toggle">
-            <result>/ajax/tree/toggle.jsp</result>
+            <result>/WEB-INF/ajax/tree/toggle.jsp</result>
         </action>
 
         <action name="example4">
-        	<result type="freemarker">/ajax/tabbedpanel/example4.ftl</result>
+        	<result type="freemarker">/WEB-INF/ajax/tabbedpanel/example4.ftl</result>
         </action>
 
         <action name="example5" class="org.apache.struts2.showcase.ajax.Example5Action">
-        	<result name="input">/ajax/tabbedpanel/example5.jsp</result>
-        	<result>/ajax/tabbedpanel/example5Ok.jsp</result>
+        	<result name="input">/WEB-INF/ajax/tabbedpanel/example5.jsp</result>
+        	<result>/WEB-INF/ajax/tabbedpanel/example5Ok.jsp</result>
         </action>
     </package>
 
     <package name="ajaxNoDecorate" namespace="/nodecorate" extends="json-default">
     	<!--  example 4 -->
         <action name="panel1" class="org.apache.struts2.showcase.ajax.Example4ShowPanelAction" method="panel1">
-    		<result type="freemarker">/ajax/tabbedpanel/nodecorate/panel1.ftl</result>
+    		<result type="freemarker">/WEB-INF/ajax/tabbedpanel/nodecorate/panel1.ftl</result>
     	</action>
     	<action name="panel2">
-    		<result type="freemarker">/ajax/tabbedpanel/nodecorate/panel2.ftl</result>
+    		<result type="freemarker">/WEB-INF/ajax/tabbedpanel/nodecorate/panel2.ftl</result>
     	</action>
     	<action name="panel3">
-    		<result type="freemarker">/ajax/tabbedpanel/nodecorate/panel3.ftl</result>
+    		<result type="freemarker">/WEB-INF/ajax/tabbedpanel/nodecorate/panel3.ftl</result>
     	</action>
     	<action name="panel2Submit" class="org.apache.struts2.showcase.ajax.Example4ShowPanelAction" method="panel2">
-    		<result type="freemarker">/ajax/tabbedpanel/nodecorate/panel2Submit.ftl</result>
+    		<result type="freemarker">/WEB-INF/ajax/tabbedpanel/nodecorate/panel2Submit.ftl</result>
     	</action>
     	<action name="panel3Submit" class="org.apache.struts2.showcase.ajax.Example4ShowPanelAction" method="panel3">
-    		<result type="freemarker">/ajax/tabbedpanel/nodecorate/panel3Submit.ftl</result>
+    		<result type="freemarker">/WEB-INF/ajax/tabbedpanel/nodecorate/panel3Submit.ftl</result>
     	</action>
        <action name="AutocompleterExample" class="org.apache.struts2.showcase.ajax.AutocompleterExampleAction">
-           <result type="freemarker">/ajax/options.ftl</result>
+           <result type="freemarker">/WEB-INF/ajax/options.ftl</result>
        </action>
        <action name="quizAjax" class="org.apache.struts2.showcase.validation.QuizAction">
             <interceptor-ref name="jsonValidationWorkflowStack"/>
-            <result name="input">/validation/quiz-ajax.jsp</result>
-            <result>/validation/quiz-success.jsp</result>
+            <result name="input">/WEB-INF/validation/quiz-ajax.jsp</result>
+            <result>/WEB-INF/validation/quiz-success.jsp</result>
        </action>
        <action name="getNodes" class="org.apache.struts2.showcase.ShowAjaxDynamicTreeAction">
-            <result type="freemarker">/tags/ui/treeExampleAjaxDynamic.ftl</result>
+            <result type="freemarker">/WEB-INF/tags/ui/treeExampleAjaxDynamic.ftl</result>
         </action>
     </package>
 </struts>
diff --git a/apps/showcase/src/main/resources/struts-chat.xml b/apps/showcase/src/main/resources/struts-chat.xml
index 568b71a97..15ea15b1c 100644
--- a/apps/showcase/src/main/resources/struts-chat.xml
+++ b/apps/showcase/src/main/resources/struts-chat.xml
@@ -33,18 +33,18 @@
     </interceptors>
 
     <global-results>
-      <result name="login" type="freemarker">/chat/chatLogin.ftl</result>
+      <result name="login" type="freemarker">/WEB-INF/chat/chatLogin.ftl</result>
     </global-results>
 
     <action name="main">
       <interceptor-ref name="chatAuthentication" />
-      <result type="freemarker">/chat/roomSelection.ftl</result>
+      <result type="freemarker">/WEB-INF/chat/roomSelection.ftl</result>
     </action>
 
     <action name="login" class="chatLoginAction">
       <interceptor-ref name="defaultStack" />
       <result type="redirect">/chat/showRooms.action</result>
-      <result name="input" type="freemarker">/chat/chatLogin.ftl</result>
+      <result name="input" type="freemarker">/WEB-INF/chat/chatLogin.ftl</result>
     </action>
 
     <action name="logout" class="chatLogoutAction">
@@ -54,12 +54,12 @@
 
     <action name="showRooms">
       <interceptor-ref name="chatAuthenticationStack" />
-      <result type="freemarker">/chat/roomSelection.ftl</result>
+      <result type="freemarker">/WEB-INF/chat/roomSelection.ftl</result>
     </action>
 
     <action name="enterRoom" class="enterRoomAction">
       <interceptor-ref name="chatAuthenticationStack" />
-      <result type="freemarker">/chat/showRoom.ftl</result>
+      <result type="freemarker">/WEB-INF/chat/showRoom.ftl</result>
     </action>
 
     <action name="exitRoom" class="exitRoomAction">
@@ -100,35 +100,35 @@
 
     <action name="usersAvailable" class="usersAvailableAction">
       <interceptor-ref name="chatAuthenticationStack" />
-      <result type="freemarker">/chat/usersAvailable.ftl</result>
+      <result type="freemarker">/WEB-INF/chat/usersAvailable.ftl</result>
     </action>
 
     <action name="roomsAvailable" class="roomsAvailableAction">
       <interceptor-ref name="chatAuthenticationStack" />
-      <result type="freemarker">/chat/roomsAvailable.ftl</result>
+      <result type="freemarker">/WEB-INF/chat/roomsAvailable.ftl</result>
     </action>
 
     <action name="createRoom" class="crudRoomAction" method="create">
       <interceptor-ref name="chatAuthenticationStack" />
-      <result type="freemarker">/chat/createRoom.ftl</result>
-      <result name="input" type="freemarker">/chat/createRoom.ftl</result>
+      <result type="freemarker">/WEB-INF/chat/createRoom.ftl</result>
+      <result name="input" type="freemarker">/WEB-INF/chat/createRoom.ftl</result>
     </action>
 
     <action name="messagesAvailableInRoom" class="messagesAvailableInRoomAction">
       <interceptor-ref name="chatAuthenticationStack" />
-      <result type="freemarker">/chat/messagesAvailableInRoom.ftl</result>
-      <result name="input" type="freemarker">/chat/messagesAvailableInRoom.ftl</result>
+      <result type="freemarker">/WEB-INF/chat/messagesAvailableInRoom.ftl</result>
+      <result name="input" type="freemarker">/WEB-INF/chat/messagesAvailableInRoom.ftl</result>
     </action>
 
     <action name="sendMessageToRoom" class="sendMessageToRoomAction">
       <interceptor-ref name="chatAuthenticationStack" />
-      <result type="freemarker">/chat/sendMessageToRoomResult.ftl</result>
-      <result name="input" type="freemarker">/chat/sendMessageToRoomResult.ftl</result>
+      <result type="freemarker">/WEB-INF/chat/sendMessageToRoomResult.ftl</result>
+      <result name="input" type="freemarker">/WEB-INF/chat/sendMessageToRoomResult.ftl</result>
     </action>
 
     <action name="usersAvailableInRoom" class="usersAvailableInRoomAction">
       <interceptor-ref name="chatAuthenticationStack" />
-      <result type="freemarker">/chat/usersAvailableInRoom.ftl</result>
+      <result type="freemarker">/WEB-INF/chat/usersAvailableInRoom.ftl</result>
     </action>
   </package>
 </struts>
diff --git a/apps/showcase/src/main/resources/struts-conversion.xml b/apps/showcase/src/main/resources/struts-conversion.xml
index ad0b1a975..27dd6875f 100644
--- a/apps/showcase/src/main/resources/struts-conversion.xml
+++ b/apps/showcase/src/main/resources/struts-conversion.xml
@@ -9,65 +9,65 @@
 		<!-- Example populating a List inside an Action -->
 		<action name="enterPersonsInfo" method="input"
 				class="org.apache.struts2.showcase.conversion.PersonAction">
-			<result>enterPersonInfo.jsp</result>
+			<result>/WEB-INF/conversion/enterPersonInfo.jsp</result>
 		</action>
 		<action name="submitPersonInfo" method="submit"
 				class="org.apache.struts2.showcase.conversion.PersonAction">
-			<result>showPersonInfo.jsp</result>	
-			<result name="input">enterPersonInfo.jsp</result>
+			<result>/WEB-INF/conversion/showPersonInfo.jsp</result>
+			<result name="input">/WEB-INF/conversion/enterPersonInfo.jsp</result>
 		</action>
 		<action name="showPersonJspCode">
-			<result type="plainText">/conversion/enterPersonInfo.jsp</result>
+			<result type="plainText">/WEB-INF/conversion/enterPersonInfo.jsp</result>
 		</action>
 		<action name="showPersonActionJavaCode">
-			<result type="plainText">/conversion/PersonAction.java.txt</result>
+			<result type="plainText">/WEB-INF/conversion/PersonAction.java.txt</result>
 		</action>
 		<action name="showPersonJavaCode">
-			<result type="plainText">/conversion/Person.java.txt</result>
+			<result type="plainText">/WEB-INF/conversion/Person.java.txt</result>
 		</action>
 		
 		
 		<!-- Example populating a Set inside an Action -->
 		<action name="enterAddressesInfo" class="org.apache.struts2.showcase.conversion.AddressAction" method="input">
-			<result>enterAddressInfo.jsp</result>
+			<result>/WEB-INF/conversion/enterAddressInfo.jsp</result>
 		</action>
 		<action name="submitAddressesInfo" class="org.apache.struts2.showcase.conversion.AddressAction" method="submit">
-			<result>showAddressInfo.jsp</result>
-			<result name="input">enterAddressInfo.jsp</result>
+			<result>/WEB-INF/conversion/showAddressInfo.jsp</result>
+			<result name="input">/WEB-INF/conversion/enterAddressInfo.jsp</result>
 		</action>
 		<action name="showAddressJspCode">
-			<result type="plainText">/conversion/enterAddressInfo.jsp</result>
+			<result type="plainText">/WEB-INF/conversion/enterAddressInfo.jsp</result>
 		</action>
 		<action name="showAddressActionJavaCode">
-			<result type="plainText">/conversion/AddressAction.java.txt</result>
+			<result type="plainText">/WEB-INF/conversion/AddressAction.java.txt</result>
 		</action>
 		<action name="showAddressJavaCode">
-			<result type="plainText">/conversion/Address.java.txt</result>
+			<result type="plainText">/WEB-INF/conversion/Address.java.txt</result>
 		</action>
 		
 		
 		<!-- Example populating a List with Tiger 5 Enum  -->		
 		<action name="enterOperationEnumInfo" class="org.apache.struts2.showcase.conversion.OperationsEnumAction" method="input">
-			<result>enterOperations.jsp</result>
+			<result>/WEB-INF/conversion/enterOperations.jsp</result>
 		</action>
 		<action name="submitOperationEnumInfo" class="org.apache.struts2.showcase.conversion.OperationsEnumAction" method="submit">
-			<result>showOperations.jsp</result>
-			<result name="input">enterOperations.jsp</result>
+			<result>/WEB-INF/conversion/showOperations.jsp</result>
+			<result name="input">/WEB-INF/conversion/enterOperations.jsp</result>
 		</action>
 		<action name="showEnumJspCode">
-			<result type="plainText">/conversion/enterOperations.jsp</result>
+			<result type="plainText">/WEB-INF/conversion/enterOperations.jsp</result>
 		</action>
 		<action name="showOperationsEnumJavaCode">
-			<result type="plainText">/conversion/OperationsEnum.java.txt</result>
+			<result type="plainText">/WEB-INF/conversion/OperationsEnum.java.txt</result>
 		</action>
 		<action name="showOperationEnumActionJavaCode">
-			<result type="plainText">/conversion/OperationsEnumAction.java.txt</result>
+			<result type="plainText">/WEB-INF/conversion/OperationsEnumAction.java.txt</result>
 		</action>
 		<action name="showEnumTypeConverterJavaCode">
-			<result type="plainText">/conversion/EnumTypeConverter.java.txt</result>
+			<result type="plainText">/WEB-INF/conversion/EnumTypeConverter.java.txt</result>
 		</action>
 		<action name="showOperationsEnumActionConversionProperties">
-			<result type="plainText">/conversion/OperationsEnumActionConversion.txt</result>
+			<result type="plainText">/WEB-INF/conversion/OperationsEnumActionConversion.txt</result>
 		</action>
 		
 	</package>
diff --git a/apps/showcase/src/main/resources/struts-fileupload.xml b/apps/showcase/src/main/resources/struts-fileupload.xml
index 71071822e..5a81f614d 100644
--- a/apps/showcase/src/main/resources/struts-fileupload.xml
+++ b/apps/showcase/src/main/resources/struts-fileupload.xml
@@ -7,29 +7,29 @@
 	<package name="fileupload" extends="struts-default" namespace="/fileupload">
         
         <action name="upload" class="org.apache.struts2.showcase.fileupload.FileUploadAction" method="input">
-			<result>upload.jsp</result>
+			<result>/WEB-INF/fileupload/upload.jsp</result>
 		</action>
 
         <action name="doUpload" class="org.apache.struts2.showcase.fileupload.FileUploadAction" method="upload">
-        	<result name="input">upload.jsp</result>
-			<result>upload-success.jsp</result>
+        	<result name="input">/WEB-INF/fileupload/upload.jsp</result>
+			<result>/WEB-INF/fileupload/upload-success.jsp</result>
 		</action>
 		
 		<action name="multipleUploadUsingList">
-			<result>multipleUploadUsingList.jsp</result>
+			<result>/WEB-INF/fileupload/multipleUploadUsingList.jsp</result>
 		</action>
 		
 		<action name="doMultipleUploadUsingList" class="org.apache.struts2.showcase.fileupload.MultipleFileUploadUsingListAction" method="upload">
-			<result>multiple-success.jsp</result>
+			<result>/WEB-INF/fileupload/multiple-success.jsp</result>
 		</action>
 
 
 		<action name="multipleUploadUsingArray">
-			<result>multipleUploadUsingArray.jsp</result>
+			<result>/WEB-INF/fileupload/multipleUploadUsingArray.jsp</result>
 		</action>
 
 		<action name="doMultipleUploadUsingArray" class="org.apache.struts2.showcase.fileupload.MultipleFileUploadUsingArrayAction" method="upload">
-			<result>multiple-success.jsp</result>
+			<result>/WEB-INF/fileupload/multiple-success.jsp</result>
 		</action>
 
 
diff --git a/apps/showcase/src/main/resources/struts-freemarker.xml b/apps/showcase/src/main/resources/struts-freemarker.xml
index ae9334f13..8c70421cf 100644
--- a/apps/showcase/src/main/resources/struts-freemarker.xml
+++ b/apps/showcase/src/main/resources/struts-freemarker.xml
@@ -6,11 +6,11 @@
 <struts>
     <package name="freemarker" namespace="/freemarker" extends="struts-default">
         <action name="customFreemarkerManagerDemo">
-            <result type="freemarker">/freemarker/customFreemarkerManagerUsage.ftl</result>
+            <result type="freemarker">/WEB-INF/freemarker/customFreemarkerManagerUsage.ftl</result>
         </action>
         
         <action name="standardTags" class="org.apache.struts2.showcase.freemarker.StandardTagsAction">
-            <result type="freemarker">/freemarker/standardTags.ftl</result>
+            <result type="freemarker">/WEB-INF/freemarker/standardTags.ftl</result>
         </action>
     </package>
 </struts>	
diff --git a/apps/showcase/src/main/resources/struts-hangman.xml b/apps/showcase/src/main/resources/struts-hangman.xml
index 6c61a3db9..69abdbf7a 100644
--- a/apps/showcase/src/main/resources/struts-hangman.xml
+++ b/apps/showcase/src/main/resources/struts-hangman.xml
@@ -6,19 +6,19 @@
 <struts>
 	<package name="hangman" extends="struts-default" namespace="/hangman">
 		<action name="hangmanAjax" class="startHangmanAction">
-			<result type="freemarker">/hangman/hangmanAjax.ftl</result>		
+			<result type="freemarker">/WEB-INF/hangman/hangmanAjax.ftl</result>
 		</action>
 		<action name="hangmanNonAjax" class="startHangmanAction">
-			<result type="freemarker">/hangman/hangmanNonAjax.ftl</result>
+			<result type="freemarker">/WEB-INF/hangman/hangmanNonAjax.ftl</result>
 		</action>
 		<action name="test">
 			<result type="freemarker">/hangman/test.ftl</result>
 		</action>
 		<action name="guessCharacter" class="guessCharacterAction">
-			<result type="freemarker">/hangman/blank.ftl</result>
+			<result type="freemarker">/WEB-INF/hangman/blank.ftl</result>
 		</action>
 		<action name="guessCharacterNonAjax" class="guessCharacterAction">
-			<result type="freemarker">/hangman/hangmanNonAjax.ftl</result>
+			<result type="freemarker">/WEB-INF/hangman/hangmanNonAjax.ftl</result>
 		</action>
 	</package>
 	
@@ -26,19 +26,19 @@
 	
 	<package name="hangman-ajax" extends="struts-default" namespace="/hangman/ajax">
 		<action name="blank">
-			<result type="freemarker">/hangman/blank.ftl</result>
+			<result type="freemarker">/WEB-INF/hangman/blank.ftl</result>
 		</action>
 		<action name="updateVocabCharacters" class="getUpdatedHangmanAction">
-			<result type="freemarker">/hangman/updateVocabCharacters.ftl</result>
+			<result type="freemarker">/WEB-INF/hangman/updateVocabCharacters.ftl</result>
 		</action>
 		<action name="updateCharacterAvailable" class="getUpdatedHangmanAction">
-			<result type="freemarker">/hangman/updateCharacterAvailable.ftl</result>
+			<result type="freemarker">/WEB-INF/hangman/updateCharacterAvailable.ftl</result>
 		</action>
 		<action name="updateScaffold" class="getUpdatedHangmanAction">
-			<result type="freemarker">/hangman/updateScaffold.ftl</result>
+			<result type="freemarker">/WEB-INF/hangman/updateScaffold.ftl</result>
 		</action>
 		<action name="updateGuessLeft" class="getUpdatedHangmanAction">
-			<result type="freemarker">/hangman/updateGuessLeft.ftl</result>
+			<result type="freemarker">/WEB-INF/hangman/updateGuessLeft.ftl</result>
 		</action>
 	</package>
 </struts>	
diff --git a/apps/showcase/src/main/resources/struts-integration.xml b/apps/showcase/src/main/resources/struts-integration.xml
index 71d2776a3..d251f7272 100644
--- a/apps/showcase/src/main/resources/struts-integration.xml
+++ b/apps/showcase/src/main/resources/struts-integration.xml
@@ -39,8 +39,8 @@
     <action name="saveGangster" class="org.apache.struts2.s1.Struts1Action">
       <param name="className">org.apache.struts2.showcase.integration.SaveGangsterAction</param>
       <param name="validate">true</param>
-      <result name="input">modelDriven.jsp</result>
-      <result>modelDrivenResult.jsp</result>
+      <result name="input">/WEB-INF/integration/modelDriven.jsp</result>
+      <result>/WEB-INF/integration/modelDrivenResult.jsp</result>
     </action>
 
   </package>
diff --git a/apps/showcase/src/main/resources/struts-interactive.xml b/apps/showcase/src/main/resources/struts-interactive.xml
index 4c1d801f6..424aabb0d 100644
--- a/apps/showcase/src/main/resources/struts-interactive.xml
+++ b/apps/showcase/src/main/resources/struts-interactive.xml
@@ -9,7 +9,7 @@
             <interceptor-ref name="params"/>
             <interceptor-ref name="debugging"/>
             <interceptor-ref name="annotationWorkflow" />
-            <result>/interactive/demo.jsp</result>
+            <result>/WEB-INF/interactive/demo.jsp</result>
         </action>
         <action name="example" class="org.apache.struts2.showcase.action.ExampleAction" />
     </package>
diff --git a/apps/showcase/src/main/resources/struts-model-driven.xml b/apps/showcase/src/main/resources/struts-model-driven.xml
index cc085d18e..dc9b839a3 100644
--- a/apps/showcase/src/main/resources/struts-model-driven.xml
+++ b/apps/showcase/src/main/resources/struts-model-driven.xml
@@ -7,12 +7,12 @@
 	<package name="modelDriven" extends="struts-default" namespace="/modelDriven">
 	    <!-- Diplay entry page that uses Model-Driven technique -->
 		<action name="modelDriven" class="org.apache.struts2.showcase.modelDriven.ModelDrivenAction" method="input">
-			<result>modelDriven.jsp</result>
+			<result>/WEB-INF/modelDriven/modelDriven.jsp</result>
 		</action>
 		
 		<!-- Display the result page whose content is populated using the Model-Driven technique -->
 		<action name="modelDrivenResult" class="org.apache.struts2.showcase.modelDriven.ModelDrivenAction">
-			<result>modelDrivenResult.jsp</result>
+			<result>/WEB-INF/modelDriven/modelDrivenResult.jsp</result>
 		</action>
 	</package>
 </struts>	
diff --git a/apps/showcase/src/main/resources/struts-tags-non-ui.xml b/apps/showcase/src/main/resources/struts-tags-non-ui.xml
index 20c5a8dbb..c296fd202 100644
--- a/apps/showcase/src/main/resources/struts-tags-non-ui.xml
+++ b/apps/showcase/src/main/resources/struts-tags-non-ui.xml
@@ -11,19 +11,19 @@
 	
 	<package name="actionTag" extends="struts-default" namespace="/tags/non-ui/actionTag">
 		<action name="showActionTagDemo" class="org.apache.struts2.showcase.tag.nonui.actiontag.ActionTagDemo" method="show">
-			<result>/tags/non-ui/actionTag/showActionTagDemo.jsp</result>
+			<result>/WEB-INF/tags/non-ui/actionTag/showActionTagDemo.jsp</result>
 		</action>
 		<action name="includePage" class="org.apache.struts2.showcase.tag.nonui.actiontag.ActionTagDemo" method="doInclude">
-			<result>/tags/non-ui/actionTag/includedPage.jsp</result>
+			<result>/WEB-INF/tags/non-ui/actionTag/includedPage.jsp</result>
 		</action>
 		<action name="includePage2">
-			<result>/tags/non-ui/actionTag/includedPage2.jsp</result>
+			<result>/WEB-INF/tags/non-ui/actionTag/includedPage2.jsp</result>
 		</action>
 		<action name="includePage3">
-			<result>/tags/non-ui/actionTag/includedPage3.jsp</result>
+			<result>/WEB-INF/tags/non-ui/actionTag/includedPage3.jsp</result>
 		</action>
 		<action name="lookAtSource">
-			<result type="plainText">/tags/non-ui/actionTag/showActionTagDemo.jsp</result>
+			<result type="plainText">/WEB-INF/tags/non-ui/actionTag/showActionTagDemo.jsp</result>
 		</action>
 	</package>
 	
@@ -33,11 +33,11 @@
 	
 	<package name="iteratorGeneratorTag" extends="struts-default" namespace="/tags/non-ui/iteratorGeneratorTag">
 		<action name="showGeneratorTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.IteratorGeneratorTagDemo" method="input">
-			<result>/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp</result>
+			<result>/WEB-INF/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp</result>
 		</action>
 		<action name="submitGeneratorTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.IteratorGeneratorTagDemo" method="submit">
-			<result name="input">/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp</result>
-			<result>/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp</result>
+			<result name="input">/WEB-INF/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp</result>
+			<result>/WEB-INF/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp</result>
 		</action>
 	</package>
 	
@@ -47,11 +47,11 @@
 	<!-- ========================================== -->
 	<package name="appendIteratorTag" extends="struts-default" namespace="/tags/non-ui/appendIteratorTag">
 		<action name="showAppendTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.AppendIteratorTagDemo" method="input">
-			<result>/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp</result>
+			<result>/WEB-INF/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp</result>
 		</action>
 		<action name="submitAppendTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.AppendIteratorTagDemo" method="submit">
-			<result name="input">/tag/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp</result>
-			<result>/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp</result>
+			<result name="input">/WEB-INF/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp</result>
+			<result>/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp</result>
 		</action>
 	</package>
 	
@@ -61,11 +61,11 @@
 	<!-- ========================================= -->
 	<package name="mergeIteratorTag" extends="struts-default" namespace="/tags/non-ui/mergeIteratorTag">
 		<action name="showMergeTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.MergeIteratorTagDemo" method="input">
-			<result>/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp</result>
+			<result>/WEB-INF/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp</result>
 		</action>
 		<action name="submitMergeTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.MergeIteratorTagDemo" method="submit">
-			<result name="input">/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp</result>
-			<result>/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp</result>
+			<result name="input">/WEB-INF/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp</result>
+			<result>/WEB-INF/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp</result>
 		</action>
 	</package>
 	
@@ -74,11 +74,11 @@
 	<!-- =========================================== -->
 	<package name="subsetIteratorTag" extends="struts-default" namespace="/tags/non-ui/subsetIteratorTag">
 		<action name="showSubsetTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.SubsetIteratorTagDemo" method="input">
-			<result>/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp</result>
+			<result>/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp</result>
 		</action>
 		<action name="submitSubsetTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.SubsetIteratorTagDemo" method="submit">
-			<result name="input">/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp</result>
-			<result>/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp</result>
+			<result name="input">/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp</result>
+			<result>/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp</result>
 		</action>
 	</package>
 	
@@ -87,28 +87,28 @@
 	<!-- ========================================= -->
 	<package name="actionPrefix" extends="struts-default" namespace="/tags/non-ui/actionPrefix">
 		<action name="actionPrefixExampleUsingFreemarker">
-			<result type="freemarker">/tags/non-ui/actionPrefix/actionPrefixExample.ftl</result>
+			<result type="freemarker">/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl</result>
 		</action>	
 		<action name="submit" class="org.apache.struts2.showcase.tag.nonui.actionPrefix.SubmitAction">
-			<result type="freemarker">/tags/non-ui/actionPrefix/normalSubmit.ftl</result>
+			<result type="freemarker">/WEB-INF/tags/non-ui/actionPrefix/normalSubmit.ftl</result>
 		</action>
 		<action name="submit" class="org.apache.struts2.showcase.tag.nonui.actionPrefix.SubmitAction" method="alternateMethod">
-			<result name="methodPrefixResult" type="freemarker">/tags/non-ui/actionPrefix/methodPrefix.ftl</result>
+			<result name="methodPrefixResult" type="freemarker">/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl</result>
 		</action>
 		<action name="actionPrefix" class="org.apache.struts2.showcase.tag.nonui.actionPrefix.SubmitAction">
-			<result type="freemarker">/tags/non-ui/actionPrefix/actionPrefix.ftl</result>
+			<result type="freemarker">/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl</result>
 		</action>
 		<action name="redirectPrefix">
-			<result type="freemarker">/tags/non-ui/actionPrefix/redirectPrefix.ftl</result>
+			<result type="freemarker">/WEB-INF/tags/non-ui/actionPrefix/redirectPrefix.ftl</result>
 		</action>
 		<action name="redirectActionPrefix">
-			<result type="freemarker">/tags/non-ui/actionPrefix/redirectActionPrefix.ftl</result>
+			<result type="freemarker">/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl</result>
 		</action>
         <action name="redirectActionPrefixAction">
             <result type="redirect">redirectActionPrefix</result>
         </action>
 		<action name="viewSource">
-			<result type="plainText">/tags/non-ui/actionPrefix/actionPrefixExample.ftl</result>
+			<result type="plainText">/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl</result>
 		</action>
 	</package>
 	
@@ -117,10 +117,10 @@
 	<!--  ========================================== -->
 	<package name="ifTagPackage" extends="struts-default" namespace="/tags/non-ui/ifTag">
 		<action name="testIfTagJsp">
-			<result>/tags/non-ui/ifTag/testIf.jsp</result>
+			<result>/WEB-INF/tags/non-ui/ifTag/testIf.jsp</result>
 		</action>
 		<action name="testIfTagFreemarker">
-			<result type="freemarker">/tags/non-ui/ifTag/testIf.ftl</result>
+			<result type="freemarker">/WEB-INF/tags/non-ui/ifTag/testIf.ftl</result>
 		</action>
 	</package>
 
@@ -129,7 +129,7 @@
     <!--  ========================================== -->
     <package name="debugTagPackage" extends="struts-default" namespace="/tags/non-ui">
         <action name="debugTagDemo">
-            <result>/tags/non-ui/debug.jsp</result>
+            <result>/WEB-INF/tags/non-ui/debug.jsp</result>
         </action>
     </package>
 </struts>
diff --git a/apps/showcase/src/main/resources/struts-tags-ui.xml b/apps/showcase/src/main/resources/struts-tags-ui.xml
index 449958fc5..563fbc1fc 100644
--- a/apps/showcase/src/main/resources/struts-tags-ui.xml
+++ b/apps/showcase/src/main/resources/struts-tags-ui.xml
@@ -6,57 +6,57 @@
 <struts>
     <package name="ui-tags" extends="struts-default" namespace="/tags/ui">
         <action name="example" class="org.apache.struts2.showcase.UITagExample">
-            <result>example.jsp</result>
-            <result name="input">example.jsp</result>
+            <result>/WEB-INF/tags/ui/example.jsp</result>
+            <result name="input">/WEB-INF/tags/ui/example.jsp</result>
         </action>
         <action name="exampleSubmit" class="org.apache.struts2.showcase.UITagExample" method="doSubmit">
-        	<result>exampleSubmited.jsp</result>
-        	<result name="input">example.jsp</result>
+        	<result>/WEB-INF/tags/ui/exampleSubmited.jsp</result>
+        	<result name="input">/WEB-INF/tags/ui/example.jsp</result>
         </action>
         <action name="exampleVelocity" class="org.apache.struts2.showcase.UITagExample">
-            <result type="velocity">example.vm</result>
-            <result name="input" type="velocity">example.vm</result>
+            <result type="velocity">/WEB-INF/tags/ui/example.vm</result>
+            <result name="input" type="velocity">/WEB-INF/tags/ui/example.vm</result>
         </action>
         <action name="exampleSubmitVelocity" class="org.apache.struts2.showcase.UITagExample" method="doSubmit">
-        	<result type="velocity">exampleSubmited.vm</result>
-        	<result name="input" type="velocity">example.vm</result>
+        	<result type="velocity">/WEB-INF/tags/ui/exampleSubmited.vm</result>
+        	<result name="input" type="velocity">/WEB-INF/tags/ui/example.vm</result>
         </action>
 
         <action name="lotsOfOptiontransferselect" class="org.apache.struts2.showcase.LotsOfOptiontransferselectAction" method="input">
-        	<result>lotsOfOptiontransferselect.jsp</result>
+        	<result>/WEB-INF/tags/ui/lotsOfOptiontransferselect.jsp</result>
         </action>
         <action name="lotsOfOptiontransferselectSubmit" class="org.apache.struts2.showcase.LotsOfOptiontransferselectAction" method="submit">
-        	<result name="input">lotsOfOptiontransferselect.jsp</result>
-        	<result>lotsOfOptiontransferselectSubmit.jsp</result>
+        	<result name="input">/WEB-INF/tags/ui/lotsOfOptiontransferselect.jsp</result>
+        	<result>/WEB-INF/tags/ui/lotsOfOptiontransferselectSubmit.jsp</result>
         </action>
 
          <action name="moreSelects" class="org.apache.struts2.showcase.MoreSelectsAction" method="input">
-        	<result>moreSelects.jsp</result>
+        	<result>/WEB-INF/tags/ui/moreSelects.jsp</result>
         </action>
         <action name="moreSelectsSubmit" class="org.apache.struts2.showcase.MoreSelectsAction" method="submit">
-        	<result name="input">moreSelects.jsp</result>
-        	<result>moreSelectsSubmit.jsp</result>
+        	<result name="input">/WEB-INF/tags/ui/moreSelects.jsp</result>
+        	<result>/WEB-INF/tags/ui/moreSelectsSubmit.jsp</result>
         </action>
 
         <!--  START SNIPPET: treeExampleDynamicXWorkXml -->
 
         <action name="showDynamicTreeAction" class="org.apache.struts2.showcase.ShowDynamicTreeAction">
-        	<result>/tags/ui/treeExampleDynamic.jsp</result>
+        	<result>/WEB-INF/tags/ui/treeExampleDynamic.jsp</result>
         </action>
 
         <!--  END SNIPPET: treeExampleDynamicXWorkXml -->
 
         <action name="showDynamicAjaxTreeAction">
-            <result>/tags/ui/treeExampleAjaxDynamic.jsp</result>
+            <result>/WEB-INF/tags/ui/treeExampleAjaxDynamic.jsp</result>
         </action>
 
         <action name="showComponentTagExampleCode">
-        	<result type="plainText">/tags/ui/componentTagExample.jsp</result>
+        	<result type="plainText">/WEB-INF/tags/ui/componentTagExample.jsp</result>
         </action>
 
         <action name="actionTagExample">
-            <result>/tags/ui/actionTagExampleCalled.jsp</result>
-            <result name="input">/tags/ui/actionTagExampleCalling.jsp</result>
+            <result>/WEB-INF/tags/ui/actionTagExampleCalled.jsp</result>
+            <result name="input">/WEB-INF/tags/ui/actionTagExampleCalling.jsp</result>
         </action>
 	</package>
 
@@ -65,10 +65,10 @@
 	<package name="ui-tags-ajax" namespace="/tags/ui/ajax" extends="struts-default">
         <!-- Actions dealing with Tree Example  -->
         <action name="staticTreeSelectAction">
-        	<result>/tags/ui/staticTreeSelect.jsp</result>
+        	<result>/WEB-INF/tags/ui/staticTreeSelect.jsp</result>
         </action>
         <action name="dynamicTreeSelectAction" class="org.apache.struts2.showcase.DynamicTreeSelectAction">
-        	<result>/tags/ui/dynamicTreeSelect.jsp</result>
+        	<result>/WEB-INF/tags/ui/dynamicTreeSelect.jsp</result>
         </action>
     </package>
 
diff --git a/apps/showcase/src/main/resources/struts-tiles.xml b/apps/showcase/src/main/resources/struts-tiles.xml
index d749d77b2..9fbe0258b 100644
--- a/apps/showcase/src/main/resources/struts-tiles.xml
+++ b/apps/showcase/src/main/resources/struts-tiles.xml
@@ -21,7 +21,7 @@
         </action>
 
         <action name="sanity">
-            <result type="redirect">/tiles/layout.jsp</result>
+            <result type="redirect">/WEB-INF/tiles/layout.jsp</result>
             <result type="redirect" name="success">/tiles/layout.jsp</result>
         </action>
     </package>
diff --git a/apps/showcase/src/main/resources/struts-token.xml b/apps/showcase/src/main/resources/struts-token.xml
index 06f347730..d43435bd3 100644
--- a/apps/showcase/src/main/resources/struts-token.xml
+++ b/apps/showcase/src/main/resources/struts-token.xml
@@ -7,56 +7,56 @@
 
         <action name="tokenPrepare!*" class="org.apache.struts2.showcase.token.TokenAction" method="{1}">
             <interceptor-ref name="defaultStack"/>
-            <result name="input">example1.jsp</result>
+            <result name="input">/WEB-INF/token/example1.jsp</result>
         </action>
 
         <action name="transfer" class="org.apache.struts2.showcase.token.TokenAction">
             <interceptor-ref name="defaultStack"/>
             <interceptor-ref name="token"/>
-            <result name="invalid.token">doublePost.jsp</result>
-            <result name="success">transferDone.jsp</result>
+            <result name="invalid.token">/WEB-INF/token/doublePost.jsp</result>
+            <result name="success">/WEB-INF/token/transferDone.jsp</result>
         </action>
 
 
 
         <action name="tokenPrepare2!*" class="org.apache.struts2.showcase.token.TokenAction" method="{1}">
             <interceptor-ref name="defaultStack"/>
-            <result name="input">example2.jsp</result>
+            <result name="input">/WEB-INF/token/example2.jsp</result>
         </action>
 
         <action name="transfer2" class="org.apache.struts2.showcase.token.TokenAction">
             <interceptor-ref name="defaultStack"/>
             <interceptor-ref name="token"/>
-            <result name="invalid.token">doublePost.jsp</result>
-            <result name="success" type="redirect">transferDone.jsp</result>
+            <result name="invalid.token">/WEB-INF/token/doublePost.jsp</result>
+            <result name="success" type="redirect">/WEB-INF/token/transferDone.jsp</result>
         </action>
 
 
 
         <action name="tokenPrepare3!*" class="org.apache.struts2.showcase.token.TokenAction" method="{1}">
             <interceptor-ref name="defaultStack"/>
-            <result name="input">example3.jsp</result>
+            <result name="input">/WEB-INF/token/example3.jsp</result>
         </action>
 
         <action name="transfer3" class="org.apache.struts2.showcase.token.TokenAction">
             <interceptor-ref name="defaultStack"/>
             <interceptor-ref name="tokenSession"/>
-            <result name="invalid.token">doublePost.jsp</result>
-            <result name="success" type="redirect">transferDone.jsp</result>
+            <result name="invalid.token">/WEB-INF/token/doublePost.jsp</result>
+            <result name="success" type="redirect">/WEB-INF/token/transferDone.jsp</result>
         </action>
 
 
         <action name="tokenPrepare4!*" class="org.apache.struts2.showcase.token.TokenAction" method="{1}">
             <interceptor-ref name="defaultStack"/>
             <interceptor-ref name="createSession"/> <!-- we must have a session when using freemarker and the @s.token tag -->
-            <result name="input" type="freemarker">example4.ftl</result>
+            <result name="input" type="freemarker">/WEB-INF/token/example4.ftl</result>
         </action>
 
         <action name="transfer4" class="org.apache.struts2.showcase.token.TokenAction">
             <interceptor-ref name="defaultStack"/>
             <interceptor-ref name="token"/>
-            <result name="invalid.token">doublePost.jsp</result>
-            <result name="success">transferDone.jsp</result>
+            <result name="invalid.token">/WEB-INF/token/doublePost.jsp</result>
+            <result name="success">/WEB-INF/token/transferDone.jsp</result>
         </action>
 
     </package>
diff --git a/apps/showcase/src/main/resources/struts-validation.xml b/apps/showcase/src/main/resources/struts-validation.xml
index 5351b1ebc..778a2109b 100755
--- a/apps/showcase/src/main/resources/struts-validation.xml
+++ b/apps/showcase/src/main/resources/struts-validation.xml
@@ -40,12 +40,12 @@
 		<!-- ======================== -->
 		
 		<action name="showFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.FieldValidatorsExampleAction" method="input">
-			<result name="input" type="dispatcher">/validation/fieldValidatorsExample.jsp</result>
+			<result name="input" type="dispatcher">/WEB-INF/validation/fieldValidatorsExample.jsp</result>
 		</action>
 		
 		<action name="submitFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.FieldValidatorsExampleAction" method="submit">
-			<result name="input" type="dispatcher">/validation/fieldValidatorsExample.jsp</result>
-			<result type="dispatcher">/validation/successFieldValidatorsExample.jsp</result>
+			<result name="input" type="dispatcher">/WEB-INF/validation/fieldValidatorsExample.jsp</result>
+			<result type="dispatcher">/WEB-INF/validation/successFieldValidatorsExample.jsp</result>
 		</action>
 		
 		
@@ -55,12 +55,12 @@
 		<!-- ============================ -->
 		
 		<action name="showNonFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.NonFieldValidatorsExampleAction" method="input">
-			<result name="input">/validation/nonFieldValidatorsExample.jsp</result>		
+			<result name="input">/WEB-INF/validation/nonFieldValidatorsExample.jsp</result>
 		</action>
 		
 		<action name="submitNonFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.NonFieldValidatorsExampleAction" method="submit">
-			<result name="input">/validation/nonFieldValidatorsExample.jsp</result>		
-			<result>/validation/successNonFieldValidatorsExample.jsp</result>
+			<result name="input">/WEB-INF/validation/nonFieldValidatorsExample.jsp</result>
+			<result>/WEB-INF/validation/successNonFieldValidatorsExample.jsp</result>
 		</action>
 		
 		
@@ -70,12 +70,12 @@
 		<!-- ========================== -->
 		
 		<action name="showVisitorValidatorsExamples" class="org.apache.struts2.showcase.validation.VisitorValidatorsExampleAction" method="input">
-			<result name="input">/validation/visitorValidatorsExample.jsp</result>
+			<result name="input">/WEB-INF/validation/visitorValidatorsExample.jsp</result>
 		</action>
 		
 		<action name="submitVisitorValidatorsExamples" class="org.apache.struts2.showcase.validation.VisitorValidatorsExampleAction" method="submit">
-			<result name="input">/validation/visitorValidatorsExample.jsp</result>
-			<result>/validation/successVisitorValidatorsExample.jsp</result>
+			<result name="input">/WEB-INF/validation/visitorValidatorsExample.jsp</result>
+			<result>/WEB-INF/validation/successVisitorValidatorsExample.jsp</result>
 		</action>
 
 
@@ -85,12 +85,12 @@
 		<!-- ========================== -->
 
 		<action name="clientSideValidationExample" class="org.apache.struts2.showcase.validation.FieldValidatorsExampleAction" method="input">
-			<result name="input">/validation/clientSideValidationExample.jsp</result>
+			<result name="input">/WEB-INF/validation/clientSideValidationExample.jsp</result>
 		</action>
 
 		<action name="submitClientSideValidationExample" class="org.apache.struts2.showcase.validation.FieldValidatorsExampleAction" method="submit">
-			<result name="input">/validation/clientSideValidationExample.jsp</result>
-			<result>/validation/successClientSideValidationExample.jsp</result>
+			<result name="input">/WEB-INF/validation/clientSideValidationExample.jsp</result>
+			<result>/WEB-INF/validation/successClientSideValidationExample.jsp</result>
 		</action>
 
 		<!-- =========================================== -->
@@ -109,16 +109,16 @@
 			<interceptor-ref name="store">
 				<param name="operationMode">RETRIEVE</param>
 			</interceptor-ref>
-			<result>/validation/storeErrorsAcrossRequestExample.jsp</result>
+			<result>/WEB-INF/validation/storeErrorsAcrossRequestExample.jsp</result>
 		</action>
 		<action name="applicationOk" class="org.apache.struts2.showcase.validation.SubmitApplication" method="applicationOk">
 			<interceptor-ref name="store">
 				<param name="operationMode">RETRIEVE</param>
 			</interceptor-ref>
-			<result>/validation/storeErrorsAcrossRequestOk.jsp</result>
+			<result>/WEB-INF/validation/storeErrorsAcrossRequestOk.jsp</result>
 		</action>
 		<action name="cancelApplication" class="org.apache.struts2.showcase.validation.SubmitApplication" method="cancelApplication">
-			<result>/validation/storeErrorsAcrossRequestCancel.jsp</result>
+			<result>/WEB-INF/validation/storeErrorsAcrossRequestCancel.jsp</result>
 		</action>
 		
     </package>
diff --git a/apps/showcase/src/main/resources/struts-wait.xml b/apps/showcase/src/main/resources/struts-wait.xml
index 521c2c754..8ea291124 100644
--- a/apps/showcase/src/main/resources/struts-wait.xml
+++ b/apps/showcase/src/main/resources/struts-wait.xml
@@ -9,8 +9,8 @@
         <action name="longProcess1" class="org.apache.struts2.showcase.wait.LongProcessAction">
             <interceptor-ref name="defaultStack"/>
             <interceptor-ref name="execAndWait"/>
-            <result name="wait">wait.jsp</result>
-            <result name="success">complete.jsp</result>
+            <result name="wait">/WEB-INF/wait/wait.jsp</result>
+            <result name="success">/WEB-INF/wait/complete.jsp</result>
         </action>
 
         <action name="longProcess2" class="org.apache.struts2.showcase.wait.LongProcessAction">
@@ -18,8 +18,8 @@
             <interceptor-ref name="execAndWait">
                 <param name="delay">2000</param>
             </interceptor-ref>
-            <result name="wait">wait.jsp</result>
-            <result name="success">complete.jsp</result>
+            <result name="wait">/WEB-INF/wait/wait.jsp</result>
+            <result name="success">/WEB-INF/wait/complete.jsp</result>
         </action>
 
         <action name="longProcess3" class="org.apache.struts2.showcase.wait.LongProcessAction">
@@ -28,8 +28,8 @@
                 <param name="delay">3000</param>
                 <param name="delaySleepInterval">1000</param>
             </interceptor-ref>
-            <result name="wait">wait.jsp</result>
-            <result name="success">complete.jsp</result>
+            <result name="wait">/WEB-INF/wait/wait.jsp</result>
+            <result name="success">/WEB-INF/wait/complete.jsp</result>
         </action>
 
     </package>
diff --git a/apps/showcase/src/main/resources/struts.xml b/apps/showcase/src/main/resources/struts.xml
index 3c1ebf3a4..74c59c651 100644
--- a/apps/showcase/src/main/resources/struts.xml
+++ b/apps/showcase/src/main/resources/struts.xml
@@ -75,15 +75,15 @@
         <default-action-ref name="showcase" />
 
         <action name="showcase">
-            <result>showcase.jsp</result>
+            <result>../webapp/WEB-INF/showcase.jsp</result>
         </action>
 
         <action name="viewSource" class="org.apache.struts2.showcase.source.ViewSourceAction">
-            <result>viewSource.jsp</result>
+            <result>../webapp/WEB-INF/viewSource.jsp</result>
         </action>
 
         <action name="date" class="org.apache.struts2.showcase.DateAction" method="browse">
-            <result name="success">/date.jsp</result>
+            <result name="success">/WEB-INF/date.jsp</result>
         </action>
 
     </package>
diff --git a/apps/showcase/src/main/webapp/actionchaining/actionChainingResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/actionchaining/actionChainingResult.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/actionchaining/actionChainingResult.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/actionchaining/actionChainingResult.jsp
diff --git a/apps/showcase/src/main/webapp/ajax/AjaxResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/ajax/AjaxResult.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult.jsp
diff --git a/apps/showcase/src/main/webapp/ajax/AjaxResult2.js b/apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult2.js
similarity index 100%
rename from apps/showcase/src/main/webapp/ajax/AjaxResult2.js
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult2.js
diff --git a/apps/showcase/src/main/webapp/ajax/AjaxResult3.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult3.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/ajax/AjaxResult3.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult3.jsp
diff --git a/apps/showcase/src/main/webapp/ajax/autocompleter/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/autocompleter/index.jsp
similarity index 98%
rename from apps/showcase/src/main/webapp/ajax/autocompleter/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/autocompleter/index.jsp
index 9079e7d3c..c67257fb1 100644
--- a/apps/showcase/src/main/webapp/ajax/autocompleter/index.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/autocompleter/index.jsp
@@ -6,7 +6,7 @@
     <title>Ajax Examples</title>
 
     <!--// START SNIPPET: common-include-->
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsplude.jsp"/>
     <!--// END SNIPPET: common-include-->
 </head>
 
diff --git a/apps/showcase/src/main/webapp/ajax/bind/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/bind/index.jsp
similarity index 96%
rename from apps/showcase/src/main/webapp/ajax/bind/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/bind/index.jsp
index 779e453af..046006cbb 100644
--- a/apps/showcase/src/main/webapp/ajax/bind/index.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/bind/index.jsp
@@ -5,7 +5,7 @@
 <html>
 <head>
     <title>Bind Examples</title>
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 <script type="text/javascript">
diff --git a/apps/showcase/src/main/webapp/ajax/commonInclude.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/commonInclude.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/ajax/commonInclude.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/commonInclude.jsp
diff --git a/apps/showcase/src/main/webapp/ajax/footer.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/footer.jsp
similarity index 67%
rename from apps/showcase/src/main/webapp/ajax/footer.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/footer.jsp
index 366ebb89b..5521cb410 100644
--- a/apps/showcase/src/main/webapp/ajax/footer.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/footer.jsp
@@ -2,7 +2,7 @@
 
 <hr/>
 
-<s:url var="backToAjaxExamples" value="../index.jsp" />
+<s:url var="backToAjaxExamples" value="../../index.jsp" />
 
 <s:a href="%{backToAjaxExamples}">Back To AJAX Examples</s:a>&nbsp;
 
diff --git a/apps/showcase/src/main/webapp/ajax/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/index.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/ajax/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/index.jsp
diff --git a/apps/showcase/src/main/webapp/ajax/options.ftl b/apps/showcase/src/main/webapp/WEB-INF/ajax/options.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/ajax/options.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/options.ftl
diff --git a/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotebutton/index.jsp
similarity index 96%
rename from apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/remotebutton/index.jsp
index 4dfe10d17..b8486ae57 100644
--- a/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotebutton/index.jsp
@@ -5,7 +5,7 @@
 <html>
 <head>
     <title>Ajax Examples</title>
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsplude.jsp"/>
 </head>
 
 <script type="text/javascript">
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example1.jsp
similarity index 88%
rename from apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example1.jsp
index 652ad0bec..4dfdd1d55 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example1.jsp
@@ -5,7 +5,7 @@
 <html>
 <head>
     <title>Ajax Examples</title>
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 <s:url var="ajaxTest" value="/AjaxTest.action" />
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example10.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example10.jsp
similarity index 91%
rename from apps/showcase/src/main/webapp/ajax/remotediv/example10.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example10.jsp
index f214e1ce0..43509847b 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example10.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example10.jsp
@@ -5,7 +5,7 @@
 <html>
 <head>
     <title>Ajax Examples</title>
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 <script type="text/javascript">
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example2.jsp
similarity index 91%
rename from apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example2.jsp
index a13eb229a..4257d7247 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example2.jsp
@@ -5,7 +5,7 @@
 <html>
 <head>
     <title>Ajax Examples</title>
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example3.jsp
similarity index 90%
rename from apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example3.jsp
index e263ce976..1ea2b1703 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example3.jsp
@@ -5,7 +5,7 @@
 <html>
 <head>
     <title>Ajax Examples</title>
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 <body>
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example4.jsp
similarity index 91%
rename from apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example4.jsp
index c8a857690..959cff1c9 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example4.jsp
@@ -5,7 +5,7 @@
 <html>
 <head>
     <title>Ajax Examples</title>
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 <body>
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example5.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example5.jsp
similarity index 90%
rename from apps/showcase/src/main/webapp/ajax/remotediv/example5.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example5.jsp
index dbc87eb47..ac06d1e54 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example5.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example5.jsp
@@ -5,7 +5,7 @@
 <html>
 <head>
     <title>Ajax Examples</title>
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 <body>
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example6.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example6.jsp
similarity index 89%
rename from apps/showcase/src/main/webapp/ajax/remotediv/example6.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example6.jsp
index b33caf900..c9440057b 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example6.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example6.jsp
@@ -5,7 +5,7 @@
 <html>
 <head>
     <title>Ajax Examples</title>
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 <body>
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example7.jsp
similarity index 89%
rename from apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example7.jsp
index 44b391779..d44447419 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example7.jsp
@@ -5,7 +5,7 @@
 <html>
 <head>
     <title>Ajax Examples</title>
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 <body>
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example8.jsp
similarity index 95%
rename from apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example8.jsp
index 231d05bd0..3314475bc 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example8.jsp
@@ -5,7 +5,7 @@
 <html>
 <head>
     <title>Ajax Examples</title>
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 <body>
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example9.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example9.jsp
similarity index 96%
rename from apps/showcase/src/main/webapp/ajax/remotediv/example9.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example9.jsp
index e4d599f23..14ab4f05e 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example9.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example9.jsp
@@ -5,7 +5,7 @@
 <html>
 <head>
     <title>Ajax Examples</title>
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 <body>
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/index.jsp
similarity index 95%
rename from apps/showcase/src/main/webapp/ajax/remotediv/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/index.jsp
index 753db3777..a0e97112b 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/index.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/index.jsp
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>AJAX-based remote DIV tag</title>
-    <%@ include file="/ajax/commonInclude.jsp" %>
+    <%@ include file="/WEB-INF/ajax/commonInclude.jsp" %>
 </head>
 
 <body>
diff --git a/apps/showcase/src/main/webapp/ajax/remoteforms/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remoteforms/index.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/ajax/remoteforms/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/remoteforms/index.jsp
diff --git a/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotelink/index.jsp
similarity index 98%
rename from apps/showcase/src/main/webapp/ajax/remotelink/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/remotelink/index.jsp
index a5070cae2..89e32f3e6 100644
--- a/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotelink/index.jsp
@@ -5,7 +5,7 @@
 <html>
 <head>
     <title>Ajax Examples</title>
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 <script type="text/javascript">
diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example1.jsp
similarity index 98%
rename from apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example1.jsp
index 99932dda4..8d455beb7 100644
--- a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example1.jsp
@@ -6,7 +6,7 @@
 <head>
     <title>Ajax examples - tabbled panel</title>
 
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 <s:url var="ajaxTest" value="/AjaxTest.action" />
diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example2.jsp
similarity index 90%
rename from apps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example2.jsp
index 283bbddbe..65b54d29c 100644
--- a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example2.jsp
@@ -6,7 +6,7 @@
 <head>
     <title>Ajax examples - tabbled panel</title>
 
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 <body>
diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example3.jsp
similarity index 96%
rename from apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example3.jsp
index 2456d3986..cd3c9b6a3 100644
--- a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example3.jsp
@@ -6,7 +6,7 @@
 <head>
     <title>Ajax examples - tabbled panel</title>
 
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 <s:url var="ajaxTest" value="/AjaxTest.action" />
diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example4.jsp
similarity index 96%
rename from apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example4.jsp
index 3b960fa91..e6f1b2b21 100644
--- a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example4.jsp
@@ -6,7 +6,7 @@
 <head>
     <title>Ajax examples - tabbled panel</title>
 
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 <script>
diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example5.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example5.jsp
similarity index 93%
rename from apps/showcase/src/main/webapp/ajax/tabbedpanel/example5.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example5.jsp
index 40dd71f4c..25ed4f7c5 100644
--- a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example5.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example5.jsp
@@ -6,7 +6,7 @@
 <head>
     <title>Ajax examples - tabbled panel</title>
 
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 <body>
diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example5Ok.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example5Ok.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/ajax/tabbedpanel/example5Ok.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example5Ok.jsp
diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example6.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example6.jsp
similarity index 94%
rename from apps/showcase/src/main/webapp/ajax/tabbedpanel/example6.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example6.jsp
index be6e9efb4..3bc62cd6a 100644
--- a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example6.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example6.jsp
@@ -6,7 +6,7 @@
 <head>
     <title>Ajax examples - tabbled panel</title>
 
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 <script>
diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/index.jsp
similarity index 94%
rename from apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/index.jsp
index d2d3e9cc2..196d0d4e0 100644
--- a/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/index.jsp
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>Tabbed Panes</title>
-    <%@ include file="/ajax/commonInclude.jsp" %>
+    <%@ include file="/WEB-INF/ajax/commonInclude.jsp" %>
 </head>
 
 <body>
diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel1.ftl b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel1.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel1.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel1.ftl
diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel2.ftl b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel2.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel2.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel2.ftl
diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel2Submit.ftl b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel2Submit.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel2Submit.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel2Submit.ftl
diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel3.ftl b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel3.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel3.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel3.ftl
diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel3Submit.ftl b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel3Submit.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel3Submit.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel3Submit.ftl
diff --git a/apps/showcase/src/main/webapp/ajax/testjs.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/testjs.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/ajax/testjs.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/testjs.jsp
diff --git a/apps/showcase/src/main/webapp/ajax/tree/getCategory.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/tree/getCategory.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/ajax/tree/getCategory.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/tree/getCategory.jsp
diff --git a/apps/showcase/src/main/webapp/ajax/tree/partialChunkHeader.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/tree/partialChunkHeader.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/ajax/tree/partialChunkHeader.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/tree/partialChunkHeader.jsp
diff --git a/apps/showcase/src/main/webapp/ajax/tree/toggle.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/tree/toggle.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/ajax/tree/toggle.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/tree/toggle.jsp
diff --git a/apps/showcase/src/main/webapp/ajax/tree/tree.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/tree/tree.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/ajax/tree/tree.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/tree/tree.jsp
diff --git a/apps/showcase/src/main/webapp/ajax/widgets/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/widgets/index.jsp
similarity index 94%
rename from apps/showcase/src/main/webapp/ajax/widgets/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/ajax/widgets/index.jsp
index 5e43c6f4c..e86efbdff 100644
--- a/apps/showcase/src/main/webapp/ajax/widgets/index.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/ajax/widgets/index.jsp
@@ -5,7 +5,7 @@
 <html>
 <head>
     <title>Ajax Widgets</title>
-    <jsp:include page="/ajax/commonInclude.jsp"/>
+    <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
 </head>
 
 <body>
diff --git a/apps/showcase/src/main/webapp/chat/chatLogin.ftl b/apps/showcase/src/main/webapp/WEB-INF/chat/chatLogin.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/chat/chatLogin.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/chat/chatLogin.ftl
diff --git a/apps/showcase/src/main/webapp/chat/createRoom.ftl b/apps/showcase/src/main/webapp/WEB-INF/chat/createRoom.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/chat/createRoom.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/chat/createRoom.ftl
diff --git a/apps/showcase/src/main/webapp/chat/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/chat/index.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/chat/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/chat/index.jsp
diff --git a/apps/showcase/src/main/webapp/chat/messagesAvailableInRoom.ftl b/apps/showcase/src/main/webapp/WEB-INF/chat/messagesAvailableInRoom.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/chat/messagesAvailableInRoom.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/chat/messagesAvailableInRoom.ftl
diff --git a/apps/showcase/src/main/webapp/chat/roomSelection.ftl b/apps/showcase/src/main/webapp/WEB-INF/chat/roomSelection.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/chat/roomSelection.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/chat/roomSelection.ftl
diff --git a/apps/showcase/src/main/webapp/chat/roomsAvailable.ftl b/apps/showcase/src/main/webapp/WEB-INF/chat/roomsAvailable.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/chat/roomsAvailable.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/chat/roomsAvailable.ftl
diff --git a/apps/showcase/src/main/webapp/chat/sendMessageToRoomResult.ftl b/apps/showcase/src/main/webapp/WEB-INF/chat/sendMessageToRoomResult.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/chat/sendMessageToRoomResult.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/chat/sendMessageToRoomResult.ftl
diff --git a/apps/showcase/src/main/webapp/chat/showRoom.ftl b/apps/showcase/src/main/webapp/WEB-INF/chat/showRoom.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/chat/showRoom.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/chat/showRoom.ftl
diff --git a/apps/showcase/src/main/webapp/chat/usersAvailable.ftl b/apps/showcase/src/main/webapp/WEB-INF/chat/usersAvailable.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/chat/usersAvailable.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/chat/usersAvailable.ftl
diff --git a/apps/showcase/src/main/webapp/chat/usersAvailableInRoom.ftl b/apps/showcase/src/main/webapp/WEB-INF/chat/usersAvailableInRoom.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/chat/usersAvailableInRoom.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/chat/usersAvailableInRoom.ftl
diff --git a/apps/showcase/src/main/webapp/conversion/Address.java.txt b/apps/showcase/src/main/webapp/WEB-INF/conversion/Address.java.txt
similarity index 100%
rename from apps/showcase/src/main/webapp/conversion/Address.java.txt
rename to apps/showcase/src/main/webapp/WEB-INF/conversion/Address.java.txt
diff --git a/apps/showcase/src/main/webapp/conversion/AddressAction.java.txt b/apps/showcase/src/main/webapp/WEB-INF/conversion/AddressAction.java.txt
similarity index 100%
rename from apps/showcase/src/main/webapp/conversion/AddressAction.java.txt
rename to apps/showcase/src/main/webapp/WEB-INF/conversion/AddressAction.java.txt
diff --git a/apps/showcase/src/main/webapp/conversion/EnumTypeConverter.java.txt b/apps/showcase/src/main/webapp/WEB-INF/conversion/EnumTypeConverter.java.txt
similarity index 100%
rename from apps/showcase/src/main/webapp/conversion/EnumTypeConverter.java.txt
rename to apps/showcase/src/main/webapp/WEB-INF/conversion/EnumTypeConverter.java.txt
diff --git a/apps/showcase/src/main/webapp/conversion/OperationsEnum.java.txt b/apps/showcase/src/main/webapp/WEB-INF/conversion/OperationsEnum.java.txt
similarity index 100%
rename from apps/showcase/src/main/webapp/conversion/OperationsEnum.java.txt
rename to apps/showcase/src/main/webapp/WEB-INF/conversion/OperationsEnum.java.txt
diff --git a/apps/showcase/src/main/webapp/conversion/OperationsEnumAction.java.txt b/apps/showcase/src/main/webapp/WEB-INF/conversion/OperationsEnumAction.java.txt
similarity index 100%
rename from apps/showcase/src/main/webapp/conversion/OperationsEnumAction.java.txt
rename to apps/showcase/src/main/webapp/WEB-INF/conversion/OperationsEnumAction.java.txt
diff --git a/apps/showcase/src/main/webapp/conversion/OperationsEnumActionConversion.txt b/apps/showcase/src/main/webapp/WEB-INF/conversion/OperationsEnumActionConversion.txt
similarity index 100%
rename from apps/showcase/src/main/webapp/conversion/OperationsEnumActionConversion.txt
rename to apps/showcase/src/main/webapp/WEB-INF/conversion/OperationsEnumActionConversion.txt
diff --git a/apps/showcase/src/main/webapp/conversion/Person.java.txt b/apps/showcase/src/main/webapp/WEB-INF/conversion/Person.java.txt
similarity index 100%
rename from apps/showcase/src/main/webapp/conversion/Person.java.txt
rename to apps/showcase/src/main/webapp/WEB-INF/conversion/Person.java.txt
diff --git a/apps/showcase/src/main/webapp/conversion/PersonAction.java.txt b/apps/showcase/src/main/webapp/WEB-INF/conversion/PersonAction.java.txt
similarity index 100%
rename from apps/showcase/src/main/webapp/conversion/PersonAction.java.txt
rename to apps/showcase/src/main/webapp/WEB-INF/conversion/PersonAction.java.txt
diff --git a/apps/showcase/src/main/webapp/conversion/enterAddressInfo.jsp b/apps/showcase/src/main/webapp/WEB-INF/conversion/enterAddressInfo.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/conversion/enterAddressInfo.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/conversion/enterAddressInfo.jsp
diff --git a/apps/showcase/src/main/webapp/conversion/enterOperations.jsp b/apps/showcase/src/main/webapp/WEB-INF/conversion/enterOperations.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/conversion/enterOperations.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/conversion/enterOperations.jsp
diff --git a/apps/showcase/src/main/webapp/conversion/enterPersonInfo.jsp b/apps/showcase/src/main/webapp/WEB-INF/conversion/enterPersonInfo.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/conversion/enterPersonInfo.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/conversion/enterPersonInfo.jsp
diff --git a/apps/showcase/src/main/webapp/conversion/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/conversion/index.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/conversion/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/conversion/index.jsp
diff --git a/apps/showcase/src/main/webapp/conversion/showAddressInfo.jsp b/apps/showcase/src/main/webapp/WEB-INF/conversion/showAddressInfo.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/conversion/showAddressInfo.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/conversion/showAddressInfo.jsp
diff --git a/apps/showcase/src/main/webapp/conversion/showOperations.jsp b/apps/showcase/src/main/webapp/WEB-INF/conversion/showOperations.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/conversion/showOperations.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/conversion/showOperations.jsp
diff --git a/apps/showcase/src/main/webapp/conversion/showPersonInfo.jsp b/apps/showcase/src/main/webapp/WEB-INF/conversion/showPersonInfo.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/conversion/showPersonInfo.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/conversion/showPersonInfo.jsp
diff --git a/apps/showcase/src/main/webapp/customTemplateDir/customTheme/ftlCustomTemplate.ftl b/apps/showcase/src/main/webapp/WEB-INF/customTemplateDir/customTheme/ftlCustomTemplate.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/customTemplateDir/customTheme/ftlCustomTemplate.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/customTemplateDir/customTheme/ftlCustomTemplate.ftl
diff --git a/apps/showcase/src/main/webapp/customTemplateDir/customTheme/jspCustomTemplate.jsp b/apps/showcase/src/main/webapp/WEB-INF/customTemplateDir/customTheme/jspCustomTemplate.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/customTemplateDir/customTheme/jspCustomTemplate.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/customTemplateDir/customTheme/jspCustomTemplate.jsp
diff --git a/apps/showcase/src/main/webapp/date.jsp b/apps/showcase/src/main/webapp/WEB-INF/date.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/date.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/date.jsp
diff --git a/apps/showcase/src/main/webapp/empmanager/editEmployee.jsp b/apps/showcase/src/main/webapp/WEB-INF/empmanager/editEmployee.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/empmanager/editEmployee.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/empmanager/editEmployee.jsp
diff --git a/apps/showcase/src/main/webapp/empmanager/editSkill.jsp b/apps/showcase/src/main/webapp/WEB-INF/empmanager/editSkill.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/empmanager/editSkill.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/empmanager/editSkill.jsp
diff --git a/apps/showcase/src/main/webapp/empmanager/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/empmanager/index.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/empmanager/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/empmanager/index.jsp
diff --git a/apps/showcase/src/main/webapp/empmanager/listEmployees.jsp b/apps/showcase/src/main/webapp/WEB-INF/empmanager/listEmployees.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/empmanager/listEmployees.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/empmanager/listEmployees.jsp
diff --git a/apps/showcase/src/main/webapp/empmanager/listSkills.jsp b/apps/showcase/src/main/webapp/WEB-INF/empmanager/listSkills.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/empmanager/listSkills.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/empmanager/listSkills.jsp
diff --git a/apps/showcase/src/main/webapp/filedownload/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/filedownload/index.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/filedownload/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/filedownload/index.jsp
diff --git a/apps/showcase/src/main/webapp/fileupload/multipleUploadUsingArray.jsp b/apps/showcase/src/main/webapp/WEB-INF/fileupload/multipleUploadUsingArray.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/fileupload/multipleUploadUsingArray.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/fileupload/multipleUploadUsingArray.jsp
diff --git a/apps/showcase/src/main/webapp/fileupload/multipleUploadUsingList.jsp b/apps/showcase/src/main/webapp/WEB-INF/fileupload/multipleUploadUsingList.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/fileupload/multipleUploadUsingList.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/fileupload/multipleUploadUsingList.jsp
diff --git a/apps/showcase/src/main/webapp/fileupload/upload-success.jsp b/apps/showcase/src/main/webapp/WEB-INF/fileupload/upload-success.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/fileupload/upload-success.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/fileupload/upload-success.jsp
diff --git a/apps/showcase/src/main/webapp/fileupload/upload.jsp b/apps/showcase/src/main/webapp/WEB-INF/fileupload/upload.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/fileupload/upload.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/fileupload/upload.jsp
diff --git a/apps/showcase/src/main/webapp/freemarker/customFreemarkerManagerUsage.ftl b/apps/showcase/src/main/webapp/WEB-INF/freemarker/customFreemarkerManagerUsage.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/freemarker/customFreemarkerManagerUsage.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/freemarker/customFreemarkerManagerUsage.ftl
diff --git a/apps/showcase/src/main/webapp/freemarker/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/freemarker/index.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/freemarker/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/freemarker/index.jsp
diff --git a/apps/showcase/src/main/webapp/freemarker/standardTags.ftl b/apps/showcase/src/main/webapp/WEB-INF/freemarker/standardTags.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/freemarker/standardTags.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/freemarker/standardTags.ftl
diff --git a/apps/showcase/src/main/webapp/hangman/blank.ftl b/apps/showcase/src/main/webapp/WEB-INF/hangman/blank.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/hangman/blank.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/hangman/blank.ftl
diff --git a/apps/showcase/src/main/webapp/hangman/hangmanAjax.ftl b/apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanAjax.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/hangman/hangmanAjax.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanAjax.ftl
diff --git a/apps/showcase/src/main/webapp/hangman/hangmanNonAjax.ftl b/apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanNonAjax.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/hangman/hangmanNonAjax.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanNonAjax.ftl
diff --git a/apps/showcase/src/main/webapp/hangman/updateCharacterAvailable.ftl b/apps/showcase/src/main/webapp/WEB-INF/hangman/updateCharacterAvailable.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/hangman/updateCharacterAvailable.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/hangman/updateCharacterAvailable.ftl
diff --git a/apps/showcase/src/main/webapp/hangman/updateGuessLeft.ftl b/apps/showcase/src/main/webapp/WEB-INF/hangman/updateGuessLeft.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/hangman/updateGuessLeft.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/hangman/updateGuessLeft.ftl
diff --git a/apps/showcase/src/main/webapp/hangman/updateScaffold.ftl b/apps/showcase/src/main/webapp/WEB-INF/hangman/updateScaffold.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/hangman/updateScaffold.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/hangman/updateScaffold.ftl
diff --git a/apps/showcase/src/main/webapp/hangman/updateVocabCharacters.ftl b/apps/showcase/src/main/webapp/WEB-INF/hangman/updateVocabCharacters.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/hangman/updateVocabCharacters.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/hangman/updateVocabCharacters.ftl
diff --git a/apps/showcase/src/main/webapp/help.jsp b/apps/showcase/src/main/webapp/WEB-INF/help.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/help.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/help.jsp
diff --git a/apps/showcase/src/main/webapp/integration/modelDriven.jsp b/apps/showcase/src/main/webapp/WEB-INF/integration/modelDriven.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/integration/modelDriven.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/integration/modelDriven.jsp
diff --git a/apps/showcase/src/main/webapp/integration/modelDrivenResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/integration/modelDrivenResult.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/integration/modelDrivenResult.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/integration/modelDrivenResult.jsp
diff --git a/apps/showcase/src/main/webapp/interactive/demo.jsp b/apps/showcase/src/main/webapp/WEB-INF/interactive/demo.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/interactive/demo.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/interactive/demo.jsp
diff --git a/apps/showcase/src/main/webapp/interactive/example-action.jsp b/apps/showcase/src/main/webapp/WEB-INF/interactive/example-action.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/interactive/example-action.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/interactive/example-action.jsp
diff --git a/apps/showcase/src/main/webapp/interactive/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/interactive/index.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/interactive/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/interactive/index.jsp
diff --git a/apps/showcase/src/main/webapp/interactive/jsp_0.jsp b/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_0.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/interactive/jsp_0.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_0.jsp
diff --git a/apps/showcase/src/main/webapp/interactive/jsp_1.jsp b/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_1.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/interactive/jsp_1.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_1.jsp
diff --git a/apps/showcase/src/main/webapp/interactive/jsp_2.jsp b/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_2.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/interactive/jsp_2.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_2.jsp
diff --git a/apps/showcase/src/main/webapp/interactive/jsp_3.jsp b/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_3.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/interactive/jsp_3.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_3.jsp
diff --git a/apps/showcase/src/main/webapp/interactive/jsp_4.jsp b/apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_4.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/interactive/jsp_4.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_4.jsp
diff --git a/apps/showcase/src/main/webapp/interactive/ognl_0.jsp b/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_0.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/interactive/ognl_0.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_0.jsp
diff --git a/apps/showcase/src/main/webapp/interactive/ognl_1.jsp b/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_1.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/interactive/ognl_1.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_1.jsp
diff --git a/apps/showcase/src/main/webapp/interactive/ognl_2.jsp b/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_2.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/interactive/ognl_2.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_2.jsp
diff --git a/apps/showcase/src/main/webapp/interactive/ognl_3.jsp b/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_3.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/interactive/ognl_3.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_3.jsp
diff --git a/apps/showcase/src/main/webapp/interactive/ognl_4.jsp b/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_4.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/interactive/ognl_4.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_4.jsp
diff --git a/apps/showcase/src/main/webapp/interactive/ognl_5.jsp b/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_5.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/interactive/ognl_5.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_5.jsp
diff --git a/apps/showcase/src/main/webapp/interactive/ognl_6.jsp b/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_6.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/interactive/ognl_6.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_6.jsp
diff --git a/apps/showcase/src/main/webapp/interactive/ognl_7.jsp b/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_7.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/interactive/ognl_7.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_7.jsp
diff --git a/apps/showcase/src/main/webapp/interactive/ognl_8.jsp b/apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_8.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/interactive/ognl_8.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_8.jsp
diff --git a/apps/showcase/src/main/webapp/jsf/employee/edit.jsp b/apps/showcase/src/main/webapp/WEB-INF/jsf/employee/edit.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/jsf/employee/edit.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/jsf/employee/edit.jsp
diff --git a/apps/showcase/src/main/webapp/jsf/employee/list.jsp b/apps/showcase/src/main/webapp/WEB-INF/jsf/employee/list.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/jsf/employee/list.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/jsf/employee/list.jsp
diff --git a/apps/showcase/src/main/webapp/jsf/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/jsf/index.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/jsf/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/jsf/index.jsp
diff --git a/apps/showcase/src/main/webapp/modelDriven/modelDriven.jsp b/apps/showcase/src/main/webapp/WEB-INF/modelDriven/modelDriven.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/modelDriven/modelDriven.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/modelDriven/modelDriven.jsp
diff --git a/apps/showcase/src/main/webapp/modelDriven/modelDrivenResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/modelDriven/modelDrivenResult.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/modelDriven/modelDrivenResult.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/modelDriven/modelDrivenResult.jsp
diff --git a/apps/showcase/src/main/webapp/person/edit-person.jsp b/apps/showcase/src/main/webapp/WEB-INF/person/edit-person.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/person/edit-person.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/person/edit-person.jsp
diff --git a/apps/showcase/src/main/webapp/person/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/person/index.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/person/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/person/index.jsp
diff --git a/apps/showcase/src/main/webapp/person/list-people.ftl b/apps/showcase/src/main/webapp/WEB-INF/person/list-people.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/person/list-people.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/person/list-people.ftl
diff --git a/apps/showcase/src/main/webapp/person/new-person.ftl b/apps/showcase/src/main/webapp/WEB-INF/person/new-person.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/person/new-person.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/person/new-person.ftl
diff --git a/apps/showcase/src/main/webapp/showcase.jsp b/apps/showcase/src/main/webapp/WEB-INF/showcase.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/showcase.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/showcase.jsp
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefix.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefix.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/methodPrefix.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/methodPrefix.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/normalSubmit.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/normalSubmit.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/normalSubmit.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/normalSubmit.ftl
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/redirectActionPrefix.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/redirectActionPrefix.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionTag/includedPage.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionTag/includedPage.jsp
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage2.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionTag/includedPage2.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage2.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionTag/includedPage2.jsp
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage3.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionTag/includedPage3.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage3.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionTag/includedPage3.jsp
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionTag/showActionTagDemo.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionTag/showActionTagDemo.jsp
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/date.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/date.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/date.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/date.jsp
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/debug.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/debug.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/debug.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/debug.jsp
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/ifTag/testIf.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/ifTag/testIf.ftl
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/ifTag/testIf.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/ifTag/testIf.jsp
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
diff --git a/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalled.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/actionTagExampleCalled.jsp
similarity index 55%
rename from apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalled.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/actionTagExampleCalled.jsp
index 0c496a901..c97dc675a 100644
--- a/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalled.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/actionTagExampleCalled.jsp
@@ -1,2 +1,2 @@
-<%@taglib prefix="s" uri="/struts-tags" %>
+<%@taglib prefix="s" uri="/struts-tags" %>
 This text is from the called class
\ No newline at end of file
diff --git a/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalling.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/actionTagExampleCalling.jsp
similarity index 94%
rename from apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalling.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/actionTagExampleCalling.jsp
index 750465d4a..160851cb4 100644
--- a/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalling.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/actionTagExampleCalling.jsp
@@ -1,24 +1,24 @@
-<%@taglib prefix="s" uri="/struts-tags" %>
-<html>
-<head>
-	<title>Struts2 Showcase - UI Tags - Action Tag</title>
-	<s:head/>
-</head>
-<body>
-<div class="page-header">
-	<h1>UI Tags - Action Tag</h1>
-</div>
-
-<div class="container-fluid">
-	<div class="row-fluid">
-		<div class="span12">
-			  <b>Example 1:</b>
-			  This example calls an action and includes the output on the page
-			  <p id="example1" class="well">
-			    <s:action namespace="/tags/ui" name="actionTagExample" executeResult="true"/>
-			  </p>
-		</div>
-	</div>
-</div>
-</body>
+<%@taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head>
+	<title>Struts2 Showcase - UI Tags - Action Tag</title>
+	<s:head/>
+</head>
+<body>
+<div class="page-header">
+	<h1>UI Tags - Action Tag</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+			  <b>Example 1:</b>
+			  This example calls an action and includes the output on the page
+			  <p id="example1" class="well">
+			    <s:action namespace="/tags/ui" name="actionTagExample" executeResult="true"/>
+			  </p>
+		</div>
+	</div>
+</div>
+</body>
 </html>
\ No newline at end of file
diff --git a/apps/showcase/src/main/webapp/tags/ui/componentTagExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/componentTagExample.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/componentTagExample.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/componentTagExample.jsp
diff --git a/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/datepicker/index.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/datepicker/index.jsp
diff --git a/apps/showcase/src/main/webapp/tags/ui/dynamicTreeSelect.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/dynamicTreeSelect.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/dynamicTreeSelect.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/dynamicTreeSelect.jsp
diff --git a/apps/showcase/src/main/webapp/tags/ui/example.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/example.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.jsp
diff --git a/apps/showcase/src/main/webapp/tags/ui/example.vm b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.vm
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/example.vm
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.vm
diff --git a/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/exampleSubmited.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/exampleSubmited.jsp
diff --git a/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/exampleSubmited.vm
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/exampleSubmited.vm
diff --git a/apps/showcase/src/main/webapp/tags/ui/images/backgroundImage.jpg b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/images/backgroundImage.jpg
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/images/backgroundImage.jpg
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/images/backgroundImage.jpg
diff --git a/apps/showcase/src/main/webapp/tags/ui/images/leopard.jpg b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/images/leopard.jpg
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/images/leopard.jpg
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/images/leopard.jpg
diff --git a/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/lotsOfOptiontransferselect.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/lotsOfOptiontransferselect.jsp
diff --git a/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/lotsOfOptiontransferselectSubmit.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/lotsOfOptiontransferselectSubmit.jsp
diff --git a/apps/showcase/src/main/webapp/tags/ui/moreSelects.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/moreSelects.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/moreSelects.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/moreSelects.jsp
diff --git a/apps/showcase/src/main/webapp/tags/ui/moreSelectsSubmit.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/moreSelectsSubmit.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/moreSelectsSubmit.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/moreSelectsSubmit.jsp
diff --git a/apps/showcase/src/main/webapp/tags/ui/staticTreeSelect.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/staticTreeSelect.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/staticTreeSelect.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/staticTreeSelect.jsp
diff --git a/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/timepicker/index.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/timepicker/index.jsp
diff --git a/apps/showcase/src/main/webapp/tags/ui/treeExampleAjaxDynamic.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleAjaxDynamic.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/treeExampleAjaxDynamic.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleAjaxDynamic.ftl
diff --git a/apps/showcase/src/main/webapp/tags/ui/treeExampleAjaxDynamic.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleAjaxDynamic.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/treeExampleAjaxDynamic.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleAjaxDynamic.jsp
diff --git a/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleDynamic.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleDynamic.jsp
diff --git a/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleStatic.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleStatic.jsp
diff --git a/apps/showcase/src/main/webapp/template/xhtml/mytemplate.jsp b/apps/showcase/src/main/webapp/WEB-INF/template/xhtml/mytemplate.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/template/xhtml/mytemplate.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/template/xhtml/mytemplate.jsp
diff --git a/apps/showcase/src/main/webapp/tiles/body.ftl b/apps/showcase/src/main/webapp/WEB-INF/tiles/body.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/tiles/body.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/tiles/body.ftl
diff --git a/apps/showcase/src/main/webapp/tiles/body.jsp b/apps/showcase/src/main/webapp/WEB-INF/tiles/body.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tiles/body.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tiles/body.jsp
diff --git a/apps/showcase/src/main/webapp/tiles/header.jsp b/apps/showcase/src/main/webapp/WEB-INF/tiles/header.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tiles/header.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tiles/header.jsp
diff --git a/apps/showcase/src/main/webapp/tiles/layout.ftl b/apps/showcase/src/main/webapp/WEB-INF/tiles/layout.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/tiles/layout.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/tiles/layout.ftl
diff --git a/apps/showcase/src/main/webapp/tiles/layout.jsp b/apps/showcase/src/main/webapp/WEB-INF/tiles/layout.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/tiles/layout.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/tiles/layout.jsp
diff --git a/apps/showcase/src/main/webapp/token/doublePost.jsp b/apps/showcase/src/main/webapp/WEB-INF/token/doublePost.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/token/doublePost.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/token/doublePost.jsp
diff --git a/apps/showcase/src/main/webapp/token/example1.jsp b/apps/showcase/src/main/webapp/WEB-INF/token/example1.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/token/example1.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/token/example1.jsp
diff --git a/apps/showcase/src/main/webapp/token/example2.jsp b/apps/showcase/src/main/webapp/WEB-INF/token/example2.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/token/example2.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/token/example2.jsp
diff --git a/apps/showcase/src/main/webapp/token/example3.jsp b/apps/showcase/src/main/webapp/WEB-INF/token/example3.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/token/example3.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/token/example3.jsp
diff --git a/apps/showcase/src/main/webapp/token/example4.ftl b/apps/showcase/src/main/webapp/WEB-INF/token/example4.ftl
similarity index 100%
rename from apps/showcase/src/main/webapp/token/example4.ftl
rename to apps/showcase/src/main/webapp/WEB-INF/token/example4.ftl
diff --git a/apps/showcase/src/main/webapp/token/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/token/index.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/token/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/token/index.jsp
diff --git a/apps/showcase/src/main/webapp/token/transferDone.jsp b/apps/showcase/src/main/webapp/WEB-INF/token/transferDone.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/token/transferDone.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/token/transferDone.jsp
diff --git a/apps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/clientSideValidationExample.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/validation/clientSideValidationExample.jsp
diff --git a/apps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/fieldValidatorsExample.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/validation/fieldValidatorsExample.jsp
diff --git a/apps/showcase/src/main/webapp/validation/footer.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/footer.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/validation/footer.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/validation/footer.jsp
diff --git a/apps/showcase/src/main/webapp/validation/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/validation/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp
diff --git a/apps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/nonFieldValidatorsExample.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/validation/nonFieldValidatorsExample.jsp
diff --git a/apps/showcase/src/main/webapp/validation/quiz-ajax.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-ajax.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/validation/quiz-ajax.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/validation/quiz-ajax.jsp
diff --git a/apps/showcase/src/main/webapp/validation/quiz-basic.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-basic.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/validation/quiz-basic.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/validation/quiz-basic.jsp
diff --git a/apps/showcase/src/main/webapp/validation/quiz-client-css.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-client-css.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/validation/quiz-client-css.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/validation/quiz-client-css.jsp
diff --git a/apps/showcase/src/main/webapp/validation/quiz-client.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-client.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/validation/quiz-client.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/validation/quiz-client.jsp
diff --git a/apps/showcase/src/main/webapp/validation/quiz-success.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-success.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/validation/quiz-success.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/validation/quiz-success.jsp
diff --git a/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestCancel.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestCancel.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestCancel.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestCancel.jsp
diff --git a/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestExample.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestExample.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestExample.jsp
diff --git a/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestOk.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestOk.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestOk.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestOk.jsp
diff --git a/apps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/successClientSideValidationExample.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/validation/successClientSideValidationExample.jsp
diff --git a/apps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/successFieldValidatorsExample.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/validation/successFieldValidatorsExample.jsp
diff --git a/apps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/successNonFieldValidatorsExample.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/validation/successNonFieldValidatorsExample.jsp
diff --git a/apps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/successVisitorValidatorsExample.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/validation/successVisitorValidatorsExample.jsp
diff --git a/apps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/visitorValidatorsExample.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/validation/visitorValidatorsExample.jsp
diff --git a/apps/showcase/src/main/webapp/viewSource.jsp b/apps/showcase/src/main/webapp/WEB-INF/viewSource.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/viewSource.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/viewSource.jsp
diff --git a/apps/showcase/src/main/webapp/wait/complete.jsp b/apps/showcase/src/main/webapp/WEB-INF/wait/complete.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/wait/complete.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/wait/complete.jsp
diff --git a/apps/showcase/src/main/webapp/wait/example1.jsp b/apps/showcase/src/main/webapp/WEB-INF/wait/example1.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/wait/example1.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/wait/example1.jsp
diff --git a/apps/showcase/src/main/webapp/wait/example2.jsp b/apps/showcase/src/main/webapp/WEB-INF/wait/example2.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/wait/example2.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/wait/example2.jsp
diff --git a/apps/showcase/src/main/webapp/wait/example3.jsp b/apps/showcase/src/main/webapp/WEB-INF/wait/example3.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/wait/example3.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/wait/example3.jsp
diff --git a/apps/showcase/src/main/webapp/wait/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/wait/index.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/wait/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/wait/index.jsp
diff --git a/apps/showcase/src/main/webapp/wait/wait.jsp b/apps/showcase/src/main/webapp/WEB-INF/wait/wait.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/wait/wait.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/wait/wait.jsp
diff --git a/apps/showcase/src/main/webapp/xslt/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/xslt/index.jsp
similarity index 100%
rename from apps/showcase/src/main/webapp/xslt/index.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/xslt/index.jsp