diff --git a/webapps/blank/pom.xml b/apps/blank/pom.xml
similarity index 100%
rename from webapps/blank/pom.xml
rename to apps/blank/pom.xml
diff --git a/webapps/blank/src/main/java/org/apache/struts/action2/example/HomeAction.java b/apps/blank/src/main/java/org/apache/struts/action2/example/HomeAction.java
similarity index 100%
rename from webapps/blank/src/main/java/org/apache/struts/action2/example/HomeAction.java
rename to apps/blank/src/main/java/org/apache/struts/action2/example/HomeAction.java
diff --git a/webapps/blank/src/main/webapp/WEB-INF/applicationContext.xml b/apps/blank/src/main/webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from webapps/blank/src/main/webapp/WEB-INF/applicationContext.xml
rename to apps/blank/src/main/webapp/WEB-INF/applicationContext.xml
diff --git a/webapps/blank/src/main/webapp/WEB-INF/classes/struts.properties b/apps/blank/src/main/webapp/WEB-INF/classes/struts.properties
similarity index 100%
rename from webapps/blank/src/main/webapp/WEB-INF/classes/struts.properties
rename to apps/blank/src/main/webapp/WEB-INF/classes/struts.properties
diff --git a/webapps/blank/src/main/webapp/WEB-INF/classes/xwork.xml b/apps/blank/src/main/webapp/WEB-INF/classes/xwork.xml
similarity index 100%
rename from webapps/blank/src/main/webapp/WEB-INF/classes/xwork.xml
rename to apps/blank/src/main/webapp/WEB-INF/classes/xwork.xml
diff --git a/webapps/blank/src/main/webapp/WEB-INF/pages/home.jsp b/apps/blank/src/main/webapp/WEB-INF/pages/home.jsp
similarity index 100%
rename from webapps/blank/src/main/webapp/WEB-INF/pages/home.jsp
rename to apps/blank/src/main/webapp/WEB-INF/pages/home.jsp
diff --git a/webapps/blank/src/main/webapp/WEB-INF/web.xml b/apps/blank/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from webapps/blank/src/main/webapp/WEB-INF/web.xml
rename to apps/blank/src/main/webapp/WEB-INF/web.xml
diff --git a/webapps/blank/src/main/webapp/index.jsp b/apps/blank/src/main/webapp/index.jsp
similarity index 100%
rename from webapps/blank/src/main/webapp/index.jsp
rename to apps/blank/src/main/webapp/index.jsp
diff --git a/webapps/blank/src/test/java/org/apache/struts/action2/example/HomeActionTest.java b/apps/blank/src/test/java/org/apache/struts/action2/example/HomeActionTest.java
similarity index 100%
rename from webapps/blank/src/test/java/org/apache/struts/action2/example/HomeActionTest.java
rename to apps/blank/src/test/java/org/apache/struts/action2/example/HomeActionTest.java
diff --git a/webapps/build.xml b/apps/build.xml
similarity index 100%
rename from webapps/build.xml
rename to apps/build.xml
diff --git a/webapps/pom.xml b/apps/pom.xml
similarity index 99%
rename from webapps/pom.xml
rename to apps/pom.xml
index 829f8c2d6..3ca76ba5e 100644
--- a/webapps/pom.xml
+++ b/apps/pom.xml
@@ -22,7 +22,7 @@
      <distributionManagement>
         <site>
             <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/struts-action2/webapps</url>
+            <url>scp://people.apache.org/www/struts.apache.org/struts-action2/apps</url>
         </site>
     </distributionManagement>
     
diff --git a/webapps/portlet/pom.xml b/apps/portlet/pom.xml
similarity index 89%
rename from webapps/portlet/pom.xml
rename to apps/portlet/pom.xml
index 70fabdfa7..6aac8ab43 100644
--- a/webapps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -37,5 +37,12 @@
            <version>2.4</version>
            <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.0</version>
+        </dependency>
+
+
     </dependencies>
 </project>
diff --git a/webapps/portlet/src/main/etc/exo/web.xml b/apps/portlet/src/main/etc/exo/web.xml
similarity index 100%
rename from webapps/portlet/src/main/etc/exo/web.xml
rename to apps/portlet/src/main/etc/exo/web.xml
diff --git a/webapps/portlet/src/main/etc/gridsphere/README-gridsphere.txt b/apps/portlet/src/main/etc/gridsphere/README-gridsphere.txt
similarity index 100%
rename from webapps/portlet/src/main/etc/gridsphere/README-gridsphere.txt
rename to apps/portlet/src/main/etc/gridsphere/README-gridsphere.txt
diff --git a/webapps/portlet/src/main/etc/gridsphere/gridsphere-portlet.xml b/apps/portlet/src/main/etc/gridsphere/gridsphere-portlet.xml
similarity index 100%
rename from webapps/portlet/src/main/etc/gridsphere/gridsphere-portlet.xml
rename to apps/portlet/src/main/etc/gridsphere/gridsphere-portlet.xml
diff --git a/webapps/portlet/src/main/etc/gridsphere/gridsphere-ui-tags-2.1.2.jar b/apps/portlet/src/main/etc/gridsphere/gridsphere-ui-tags-2.1.2.jar
similarity index 100%
rename from webapps/portlet/src/main/etc/gridsphere/gridsphere-ui-tags-2.1.2.jar
rename to apps/portlet/src/main/etc/gridsphere/gridsphere-ui-tags-2.1.2.jar
diff --git a/webapps/portlet/src/main/etc/gridsphere/group.xml b/apps/portlet/src/main/etc/gridsphere/group.xml
similarity index 100%
rename from webapps/portlet/src/main/etc/gridsphere/group.xml
rename to apps/portlet/src/main/etc/gridsphere/group.xml
diff --git a/webapps/portlet/src/main/etc/gridsphere/layout.xml b/apps/portlet/src/main/etc/gridsphere/layout.xml
similarity index 100%
rename from webapps/portlet/src/main/etc/gridsphere/layout.xml
rename to apps/portlet/src/main/etc/gridsphere/layout.xml
diff --git a/webapps/portlet/src/main/etc/gridsphere/struts-portlet b/apps/portlet/src/main/etc/gridsphere/struts-portlet
similarity index 100%
rename from webapps/portlet/src/main/etc/gridsphere/struts-portlet
rename to apps/portlet/src/main/etc/gridsphere/struts-portlet
diff --git a/webapps/portlet/src/main/etc/gridsphere/web.xml b/apps/portlet/src/main/etc/gridsphere/web.xml
similarity index 100%
rename from webapps/portlet/src/main/etc/gridsphere/web.xml
rename to apps/portlet/src/main/etc/gridsphere/web.xml
diff --git a/webapps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml b/apps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml
similarity index 100%
rename from webapps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml
rename to apps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml
diff --git a/webapps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml b/apps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml
similarity index 100%
rename from webapps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml
rename to apps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml
diff --git a/webapps/portlet/src/main/etc/jbossportal2.0/jboss-web.xml b/apps/portlet/src/main/etc/jbossportal2.0/jboss-web.xml
similarity index 100%
rename from webapps/portlet/src/main/etc/jbossportal2.0/jboss-web.xml
rename to apps/portlet/src/main/etc/jbossportal2.0/jboss-web.xml
diff --git a/webapps/portlet/src/main/etc/jbossportal2.0/portlet-instances.xml b/apps/portlet/src/main/etc/jbossportal2.0/portlet-instances.xml
similarity index 100%
rename from webapps/portlet/src/main/etc/jbossportal2.0/portlet-instances.xml
rename to apps/portlet/src/main/etc/jbossportal2.0/portlet-instances.xml
diff --git a/webapps/portlet/src/main/etc/jbossportal2.0/struts-portlet-pages.xml b/apps/portlet/src/main/etc/jbossportal2.0/struts-portlet-pages.xml
similarity index 100%
rename from webapps/portlet/src/main/etc/jbossportal2.0/struts-portlet-pages.xml
rename to apps/portlet/src/main/etc/jbossportal2.0/struts-portlet-pages.xml
diff --git a/webapps/portlet/src/main/etc/jbossportal2.2/jboss-app.xml b/apps/portlet/src/main/etc/jbossportal2.2/jboss-app.xml
similarity index 100%
rename from webapps/portlet/src/main/etc/jbossportal2.2/jboss-app.xml
rename to apps/portlet/src/main/etc/jbossportal2.2/jboss-app.xml
diff --git a/webapps/portlet/src/main/etc/jbossportal2.2/jboss-portlet.xml b/apps/portlet/src/main/etc/jbossportal2.2/jboss-portlet.xml
similarity index 100%
rename from webapps/portlet/src/main/etc/jbossportal2.2/jboss-portlet.xml
rename to apps/portlet/src/main/etc/jbossportal2.2/jboss-portlet.xml
diff --git a/webapps/portlet/src/main/etc/jbossportal2.2/jboss-web.xml b/apps/portlet/src/main/etc/jbossportal2.2/jboss-web.xml
similarity index 100%
rename from webapps/portlet/src/main/etc/jbossportal2.2/jboss-web.xml
rename to apps/portlet/src/main/etc/jbossportal2.2/jboss-web.xml
diff --git a/webapps/portlet/src/main/etc/jbossportal2.2/struts-portlet-object.xml b/apps/portlet/src/main/etc/jbossportal2.2/struts-portlet-object.xml
similarity index 100%
rename from webapps/portlet/src/main/etc/jbossportal2.2/struts-portlet-object.xml
rename to apps/portlet/src/main/etc/jbossportal2.2/struts-portlet-object.xml
diff --git a/webapps/portlet/src/main/etc/jetspeed2/README-jetspeed2.txt b/apps/portlet/src/main/etc/jetspeed2/README-jetspeed2.txt
similarity index 100%
rename from webapps/portlet/src/main/etc/jetspeed2/README-jetspeed2.txt
rename to apps/portlet/src/main/etc/jetspeed2/README-jetspeed2.txt
diff --git a/webapps/portlet/src/main/etc/jetspeed2/struts-portlet.psml b/apps/portlet/src/main/etc/jetspeed2/struts-portlet.psml
similarity index 100%
rename from webapps/portlet/src/main/etc/jetspeed2/struts-portlet.psml
rename to apps/portlet/src/main/etc/jetspeed2/struts-portlet.psml
diff --git a/webapps/portlet/src/main/etc/liferay3.6.1/web.xml b/apps/portlet/src/main/etc/liferay3.6.1/web.xml
similarity index 100%
rename from webapps/portlet/src/main/etc/liferay3.6.1/web.xml
rename to apps/portlet/src/main/etc/liferay3.6.1/web.xml
diff --git a/webapps/portlet/src/main/java/commons-logging.properties b/apps/portlet/src/main/java/commons-logging.properties
similarity index 100%
rename from webapps/portlet/src/main/java/commons-logging.properties
rename to apps/portlet/src/main/java/commons-logging.properties
diff --git a/webapps/portlet/src/main/java/log4j.xml b/apps/portlet/src/main/java/log4j.xml
similarity index 100%
rename from webapps/portlet/src/main/java/log4j.xml
rename to apps/portlet/src/main/java/log4j.xml
diff --git a/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/ChartExampleAction.java b/apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/ChartExampleAction.java
similarity index 100%
rename from webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/ChartExampleAction.java
rename to apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/ChartExampleAction.java
diff --git a/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/ExampleAction.java b/apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/ExampleAction.java
similarity index 100%
rename from webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/ExampleAction.java
rename to apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/ExampleAction.java
diff --git a/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormExample-processValidationExample-validation.xml b/apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormExample-processValidationExample-validation.xml
similarity index 100%
rename from webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormExample-processValidationExample-validation.xml
rename to apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormExample-processValidationExample-validation.xml
diff --git a/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormExample.java b/apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormExample.java
similarity index 100%
rename from webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormExample.java
rename to apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormExample.java
diff --git a/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormExampleWithValidation.java b/apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormExampleWithValidation.java
similarity index 100%
rename from webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormExampleWithValidation.java
rename to apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormExampleWithValidation.java
diff --git a/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormResultAction.java b/apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormResultAction.java
similarity index 100%
rename from webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormResultAction.java
rename to apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormResultAction.java
diff --git a/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormTestAction.java b/apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormTestAction.java
similarity index 100%
rename from webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormTestAction.java
rename to apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormTestAction.java
diff --git a/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/SavePrefsAction.java b/apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/SavePrefsAction.java
similarity index 100%
rename from webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/SavePrefsAction.java
rename to apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/SavePrefsAction.java
diff --git a/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/spring/SpringAction.java b/apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/spring/SpringAction.java
similarity index 100%
rename from webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/spring/SpringAction.java
rename to apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/spring/SpringAction.java
diff --git a/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/spring/ThingManager.java b/apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/spring/ThingManager.java
similarity index 100%
rename from webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/spring/ThingManager.java
rename to apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/spring/ThingManager.java
diff --git a/webapps/portlet/src/main/java/struts.properties b/apps/portlet/src/main/java/struts.properties
similarity index 100%
rename from webapps/portlet/src/main/java/struts.properties
rename to apps/portlet/src/main/java/struts.properties
diff --git a/webapps/portlet/src/main/java/template/xhtml/components/checkbox.vm b/apps/portlet/src/main/java/template/xhtml/components/checkbox.vm
similarity index 100%
rename from webapps/portlet/src/main/java/template/xhtml/components/checkbox.vm
rename to apps/portlet/src/main/java/template/xhtml/components/checkbox.vm
diff --git a/webapps/portlet/src/main/java/template/xhtml/components/datefield.vm b/apps/portlet/src/main/java/template/xhtml/components/datefield.vm
similarity index 100%
rename from webapps/portlet/src/main/java/template/xhtml/components/datefield.vm
rename to apps/portlet/src/main/java/template/xhtml/components/datefield.vm
diff --git a/webapps/portlet/src/main/java/template/xhtml/components/mytextfield.vm b/apps/portlet/src/main/java/template/xhtml/components/mytextfield.vm
similarity index 100%
rename from webapps/portlet/src/main/java/template/xhtml/components/mytextfield.vm
rename to apps/portlet/src/main/java/template/xhtml/components/mytextfield.vm
diff --git a/webapps/portlet/src/main/java/validators.xml b/apps/portlet/src/main/java/validators.xml
similarity index 100%
rename from webapps/portlet/src/main/java/validators.xml
rename to apps/portlet/src/main/java/validators.xml
diff --git a/webapps/portlet/src/main/java/xwork.xml b/apps/portlet/src/main/java/xwork.xml
similarity index 100%
rename from webapps/portlet/src/main/java/xwork.xml
rename to apps/portlet/src/main/java/xwork.xml
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/applicationContext.xml b/apps/portlet/src/main/webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/applicationContext.xml
rename to apps/portlet/src/main/webapp/WEB-INF/applicationContext.xml
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/dwr.xml b/apps/portlet/src/main/webapp/WEB-INF/dwr.xml
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/dwr.xml
rename to apps/portlet/src/main/webapp/WEB-INF/dwr.xml
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/edit/defaultEdit.jsp b/apps/portlet/src/main/webapp/WEB-INF/edit/defaultEdit.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/edit/defaultEdit.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/edit/defaultEdit.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/edit/formExample.jsp b/apps/portlet/src/main/webapp/WEB-INF/edit/formExample.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/edit/formExample.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/edit/formExample.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/edit/formExampleInput.jsp b/apps/portlet/src/main/webapp/WEB-INF/edit/formExampleInput.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/edit/formExampleInput.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/edit/formExampleInput.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/edit/index.jsp b/apps/portlet/src/main/webapp/WEB-INF/edit/index.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/edit/index.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/edit/index.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/edit/namespaceTest.jsp b/apps/portlet/src/main/webapp/WEB-INF/edit/namespaceTest.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/edit/namespaceTest.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/edit/namespaceTest.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/edit/prefsForm.jsp b/apps/portlet/src/main/webapp/WEB-INF/edit/prefsForm.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/edit/prefsForm.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/edit/prefsForm.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/edit/prefsSaved.jsp b/apps/portlet/src/main/webapp/WEB-INF/edit/prefsSaved.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/edit/prefsSaved.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/edit/prefsSaved.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/edit/test.jsp b/apps/portlet/src/main/webapp/WEB-INF/edit/test.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/edit/test.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/edit/test.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/help/defaultHelp.jsp b/apps/portlet/src/main/webapp/WEB-INF/help/defaultHelp.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/help/defaultHelp.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/help/defaultHelp.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/help/index.jsp b/apps/portlet/src/main/webapp/WEB-INF/help/index.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/help/index.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/help/index.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/lib/batik-awt-util.jar b/apps/portlet/src/main/webapp/WEB-INF/lib/batik-awt-util.jar
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/lib/batik-awt-util.jar
rename to apps/portlet/src/main/webapp/WEB-INF/lib/batik-awt-util.jar
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/lib/batik-svggen.jar b/apps/portlet/src/main/webapp/WEB-INF/lib/batik-svggen.jar
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/lib/batik-svggen.jar
rename to apps/portlet/src/main/webapp/WEB-INF/lib/batik-svggen.jar
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/lib/batik-util.jar b/apps/portlet/src/main/webapp/WEB-INF/lib/batik-util.jar
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/lib/batik-util.jar
rename to apps/portlet/src/main/webapp/WEB-INF/lib/batik-util.jar
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/lib/cewolf.jar b/apps/portlet/src/main/webapp/WEB-INF/lib/cewolf.jar
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/lib/cewolf.jar
rename to apps/portlet/src/main/webapp/WEB-INF/lib/cewolf.jar
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/portlet.xml b/apps/portlet/src/main/webapp/WEB-INF/portlet.xml
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/portlet.xml
rename to apps/portlet/src/main/webapp/WEB-INF/portlet.xml
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/readme.txt b/apps/portlet/src/main/webapp/WEB-INF/readme.txt
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/readme.txt
rename to apps/portlet/src/main/webapp/WEB-INF/readme.txt
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/tld/cewolf.tld b/apps/portlet/src/main/webapp/WEB-INF/tld/cewolf.tld
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/tld/cewolf.tld
rename to apps/portlet/src/main/webapp/WEB-INF/tld/cewolf.tld
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/view/ajax.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/ajax.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/view/ajax.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/view/ajax.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/view/ajaxData.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/ajaxData.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/view/ajaxData.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/view/ajaxData.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/view/chartExample.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/chartExample.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/view/chartExample.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/view/chartExample.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/view/formExample.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/formExample.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/view/formExample.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/view/formExample.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/view/formExampleInput.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInput.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/view/formExampleInput.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/view/formExampleInput.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/view/formExampleInputValidation.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInputValidation.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/view/formExampleInputValidation.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/view/formExampleInputValidation.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExample.ftl b/apps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExample.ftl
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExample.ftl
rename to apps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExample.ftl
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExampleInput.ftl b/apps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExampleInput.ftl
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExampleInput.ftl
rename to apps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExampleInput.ftl
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm b/apps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm
rename to apps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/view/index.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/view/index.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/view/notImplemented.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/notImplemented.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/view/notImplemented.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/view/notImplemented.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/view/springExample.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/springExample.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/view/springExample.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/view/springExample.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/view/tokenExample.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/tokenExample.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/view/tokenExample.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/view/tokenExample.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/view/tokenExampleInput.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/tokenExampleInput.jsp
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/view/tokenExampleInput.jsp
rename to apps/portlet/src/main/webapp/WEB-INF/view/tokenExampleInput.jsp
diff --git a/webapps/portlet/src/main/webapp/WEB-INF/web.xml b/apps/portlet/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from webapps/portlet/src/main/webapp/WEB-INF/web.xml
rename to apps/portlet/src/main/webapp/WEB-INF/web.xml
diff --git a/webapps/portlet/src/main/webapp/styles/styles.css b/apps/portlet/src/main/webapp/styles/styles.css
similarity index 100%
rename from webapps/portlet/src/main/webapp/styles/styles.css
rename to apps/portlet/src/main/webapp/styles/styles.css
diff --git a/webapps/shopping-cart/pom.xml b/apps/shopping-cart/pom.xml
similarity index 100%
rename from webapps/shopping-cart/pom.xml
rename to apps/shopping-cart/pom.xml
diff --git a/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/AbstractModifyCartAction-validation.xml b/apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/AbstractModifyCartAction-validation.xml
similarity index 100%
rename from webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/AbstractModifyCartAction-validation.xml
rename to apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/AbstractModifyCartAction-validation.xml
diff --git a/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/AbstractModifyCartAction.java b/apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/AbstractModifyCartAction.java
similarity index 100%
rename from webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/AbstractModifyCartAction.java
rename to apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/AbstractModifyCartAction.java
diff --git a/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/ActiveCategory.java b/apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/ActiveCategory.java
similarity index 100%
rename from webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/ActiveCategory.java
rename to apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/ActiveCategory.java
diff --git a/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/SetActiveCategory.java b/apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/SetActiveCategory.java
similarity index 100%
rename from webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/SetActiveCategory.java
rename to apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/SetActiveCategory.java
diff --git a/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/ShowCart.java b/apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/ShowCart.java
similarity index 100%
rename from webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/ShowCart.java
rename to apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/ShowCart.java
diff --git a/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/ShowCatalog.java b/apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/ShowCatalog.java
similarity index 100%
rename from webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/ShowCatalog.java
rename to apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/ShowCatalog.java
diff --git a/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/UpdateQuantityInCart.java b/apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/UpdateQuantityInCart.java
similarity index 100%
rename from webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/UpdateQuantityInCart.java
rename to apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/UpdateQuantityInCart.java
diff --git a/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/cart/DefaultCart.java b/apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/cart/DefaultCart.java
similarity index 100%
rename from webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/cart/DefaultCart.java
rename to apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/cart/DefaultCart.java
diff --git a/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/cart/ShoppingCart.java b/apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/cart/ShoppingCart.java
similarity index 100%
rename from webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/cart/ShoppingCart.java
rename to apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/cart/ShoppingCart.java
diff --git a/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Catalog.java b/apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Catalog.java
similarity index 100%
rename from webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Catalog.java
rename to apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Catalog.java
diff --git a/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Category.java b/apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Category.java
similarity index 100%
rename from webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Category.java
rename to apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Category.java
diff --git a/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Identifiable.java b/apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Identifiable.java
similarity index 100%
rename from webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Identifiable.java
rename to apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Identifiable.java
diff --git a/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Product.java b/apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Product.java
similarity index 100%
rename from webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Product.java
rename to apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Product.java
diff --git a/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/TestCatalog.java b/apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/TestCatalog.java
similarity index 100%
rename from webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/TestCatalog.java
rename to apps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/TestCatalog.java
diff --git a/webapps/shopping-cart/src/main/webapp/WEB-INF/applicationContext.xml b/apps/shopping-cart/src/main/webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/WEB-INF/applicationContext.xml
rename to apps/shopping-cart/src/main/webapp/WEB-INF/applicationContext.xml
diff --git a/webapps/shopping-cart/src/main/webapp/WEB-INF/classes/default.properties b/apps/shopping-cart/src/main/webapp/WEB-INF/classes/default.properties
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/WEB-INF/classes/default.properties
rename to apps/shopping-cart/src/main/webapp/WEB-INF/classes/default.properties
diff --git a/webapps/shopping-cart/src/main/webapp/WEB-INF/classes/log4j.properties b/apps/shopping-cart/src/main/webapp/WEB-INF/classes/log4j.properties
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/WEB-INF/classes/log4j.properties
rename to apps/shopping-cart/src/main/webapp/WEB-INF/classes/log4j.properties
diff --git a/webapps/shopping-cart/src/main/webapp/WEB-INF/classes/struts.properties b/apps/shopping-cart/src/main/webapp/WEB-INF/classes/struts.properties
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/WEB-INF/classes/struts.properties
rename to apps/shopping-cart/src/main/webapp/WEB-INF/classes/struts.properties
diff --git a/webapps/shopping-cart/src/main/webapp/WEB-INF/classes/validators.xml b/apps/shopping-cart/src/main/webapp/WEB-INF/classes/validators.xml
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/WEB-INF/classes/validators.xml
rename to apps/shopping-cart/src/main/webapp/WEB-INF/classes/validators.xml
diff --git a/webapps/shopping-cart/src/main/webapp/WEB-INF/classes/xwork.xml b/apps/shopping-cart/src/main/webapp/WEB-INF/classes/xwork.xml
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/WEB-INF/classes/xwork.xml
rename to apps/shopping-cart/src/main/webapp/WEB-INF/classes/xwork.xml
diff --git a/webapps/shopping-cart/src/main/webapp/WEB-INF/decorators.xml b/apps/shopping-cart/src/main/webapp/WEB-INF/decorators.xml
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/WEB-INF/decorators.xml
rename to apps/shopping-cart/src/main/webapp/WEB-INF/decorators.xml
diff --git a/webapps/shopping-cart/src/main/webapp/WEB-INF/decorators/main.jsp b/apps/shopping-cart/src/main/webapp/WEB-INF/decorators/main.jsp
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/WEB-INF/decorators/main.jsp
rename to apps/shopping-cart/src/main/webapp/WEB-INF/decorators/main.jsp
diff --git a/webapps/shopping-cart/src/main/webapp/WEB-INF/dwr.xml b/apps/shopping-cart/src/main/webapp/WEB-INF/dwr.xml
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/WEB-INF/dwr.xml
rename to apps/shopping-cart/src/main/webapp/WEB-INF/dwr.xml
diff --git a/webapps/shopping-cart/src/main/webapp/WEB-INF/lib/sitemesh-2.2.1.jar b/apps/shopping-cart/src/main/webapp/WEB-INF/lib/sitemesh-2.2.1.jar
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/WEB-INF/lib/sitemesh-2.2.1.jar
rename to apps/shopping-cart/src/main/webapp/WEB-INF/lib/sitemesh-2.2.1.jar
diff --git a/webapps/shopping-cart/src/main/webapp/WEB-INF/sitemesh-decorator.tld b/apps/shopping-cart/src/main/webapp/WEB-INF/sitemesh-decorator.tld
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/WEB-INF/sitemesh-decorator.tld
rename to apps/shopping-cart/src/main/webapp/WEB-INF/sitemesh-decorator.tld
diff --git a/webapps/shopping-cart/src/main/webapp/WEB-INF/sitemesh-page.tld b/apps/shopping-cart/src/main/webapp/WEB-INF/sitemesh-page.tld
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/WEB-INF/sitemesh-page.tld
rename to apps/shopping-cart/src/main/webapp/WEB-INF/sitemesh-page.tld
diff --git a/webapps/shopping-cart/src/main/webapp/WEB-INF/sitemesh.xml b/apps/shopping-cart/src/main/webapp/WEB-INF/sitemesh.xml
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/WEB-INF/sitemesh.xml
rename to apps/shopping-cart/src/main/webapp/WEB-INF/sitemesh.xml
diff --git a/webapps/shopping-cart/src/main/webapp/WEB-INF/velocity.properties b/apps/shopping-cart/src/main/webapp/WEB-INF/velocity.properties
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/WEB-INF/velocity.properties
rename to apps/shopping-cart/src/main/webapp/WEB-INF/velocity.properties
diff --git a/webapps/shopping-cart/src/main/webapp/WEB-INF/web.xml b/apps/shopping-cart/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/WEB-INF/web.xml
rename to apps/shopping-cart/src/main/webapp/WEB-INF/web.xml
diff --git a/webapps/shopping-cart/src/main/webapp/cart.jsp b/apps/shopping-cart/src/main/webapp/cart.jsp
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/cart.jsp
rename to apps/shopping-cart/src/main/webapp/cart.jsp
diff --git a/webapps/shopping-cart/src/main/webapp/category-main.jsp b/apps/shopping-cart/src/main/webapp/category-main.jsp
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/category-main.jsp
rename to apps/shopping-cart/src/main/webapp/category-main.jsp
diff --git a/webapps/shopping-cart/src/main/webapp/category.jsp b/apps/shopping-cart/src/main/webapp/category.jsp
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/category.jsp
rename to apps/shopping-cart/src/main/webapp/category.jsp
diff --git a/webapps/shopping-cart/src/main/webapp/categorySet.jsp b/apps/shopping-cart/src/main/webapp/categorySet.jsp
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/categorySet.jsp
rename to apps/shopping-cart/src/main/webapp/categorySet.jsp
diff --git a/webapps/shopping-cart/src/main/webapp/css/cart.css b/apps/shopping-cart/src/main/webapp/css/cart.css
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/css/cart.css
rename to apps/shopping-cart/src/main/webapp/css/cart.css
diff --git a/webapps/shopping-cart/src/main/webapp/css/dtree.css b/apps/shopping-cart/src/main/webapp/css/dtree.css
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/css/dtree.css
rename to apps/shopping-cart/src/main/webapp/css/dtree.css
diff --git a/webapps/shopping-cart/src/main/webapp/css/forms.css b/apps/shopping-cart/src/main/webapp/css/forms.css
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/css/forms.css
rename to apps/shopping-cart/src/main/webapp/css/forms.css
diff --git a/webapps/shopping-cart/src/main/webapp/css/layout-navtop-1col.css b/apps/shopping-cart/src/main/webapp/css/layout-navtop-1col.css
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/css/layout-navtop-1col.css
rename to apps/shopping-cart/src/main/webapp/css/layout-navtop-1col.css
diff --git a/webapps/shopping-cart/src/main/webapp/css/layout-navtop-localleft.css b/apps/shopping-cart/src/main/webapp/css/layout-navtop-localleft.css
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/css/layout-navtop-localleft.css
rename to apps/shopping-cart/src/main/webapp/css/layout-navtop-localleft.css
diff --git a/webapps/shopping-cart/src/main/webapp/css/layout.css b/apps/shopping-cart/src/main/webapp/css/layout.css
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/css/layout.css
rename to apps/shopping-cart/src/main/webapp/css/layout.css
diff --git a/webapps/shopping-cart/src/main/webapp/css/main.css b/apps/shopping-cart/src/main/webapp/css/main.css
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/css/main.css
rename to apps/shopping-cart/src/main/webapp/css/main.css
diff --git a/webapps/shopping-cart/src/main/webapp/css/nav-horizontal.css b/apps/shopping-cart/src/main/webapp/css/nav-horizontal.css
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/css/nav-horizontal.css
rename to apps/shopping-cart/src/main/webapp/css/nav-horizontal.css
diff --git a/webapps/shopping-cart/src/main/webapp/css/niftyCorners.css b/apps/shopping-cart/src/main/webapp/css/niftyCorners.css
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/css/niftyCorners.css
rename to apps/shopping-cart/src/main/webapp/css/niftyCorners.css
diff --git a/webapps/shopping-cart/src/main/webapp/css/niftyPrint.css b/apps/shopping-cart/src/main/webapp/css/niftyPrint.css
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/css/niftyPrint.css
rename to apps/shopping-cart/src/main/webapp/css/niftyPrint.css
diff --git a/webapps/shopping-cart/src/main/webapp/css/niftylayout.css b/apps/shopping-cart/src/main/webapp/css/niftylayout.css
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/css/niftylayout.css
rename to apps/shopping-cart/src/main/webapp/css/niftylayout.css
diff --git a/webapps/shopping-cart/src/main/webapp/css/tools.css b/apps/shopping-cart/src/main/webapp/css/tools.css
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/css/tools.css
rename to apps/shopping-cart/src/main/webapp/css/tools.css
diff --git a/webapps/shopping-cart/src/main/webapp/css/typo.css b/apps/shopping-cart/src/main/webapp/css/typo.css
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/css/typo.css
rename to apps/shopping-cart/src/main/webapp/css/typo.css
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/base.gif b/apps/shopping-cart/src/main/webapp/images/dtree/base.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/base.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/base.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/cd.gif b/apps/shopping-cart/src/main/webapp/images/dtree/cd.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/cd.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/cd.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/empty.gif b/apps/shopping-cart/src/main/webapp/images/dtree/empty.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/empty.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/empty.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/folder.gif b/apps/shopping-cart/src/main/webapp/images/dtree/folder.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/folder.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/folder.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/folderopen.gif b/apps/shopping-cart/src/main/webapp/images/dtree/folderopen.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/folderopen.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/folderopen.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/globe.gif b/apps/shopping-cart/src/main/webapp/images/dtree/globe.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/globe.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/globe.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/imgfolder.gif b/apps/shopping-cart/src/main/webapp/images/dtree/imgfolder.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/imgfolder.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/imgfolder.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/join.gif b/apps/shopping-cart/src/main/webapp/images/dtree/join.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/join.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/join.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/joinbottom.gif b/apps/shopping-cart/src/main/webapp/images/dtree/joinbottom.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/joinbottom.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/joinbottom.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/line.gif b/apps/shopping-cart/src/main/webapp/images/dtree/line.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/line.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/line.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/minus.gif b/apps/shopping-cart/src/main/webapp/images/dtree/minus.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/minus.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/minus.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/minusbottom.gif b/apps/shopping-cart/src/main/webapp/images/dtree/minusbottom.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/minusbottom.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/minusbottom.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/musicfolder.gif b/apps/shopping-cart/src/main/webapp/images/dtree/musicfolder.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/musicfolder.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/musicfolder.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/nolines_minus.gif b/apps/shopping-cart/src/main/webapp/images/dtree/nolines_minus.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/nolines_minus.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/nolines_minus.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/nolines_plus.gif b/apps/shopping-cart/src/main/webapp/images/dtree/nolines_plus.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/nolines_plus.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/nolines_plus.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/page.gif b/apps/shopping-cart/src/main/webapp/images/dtree/page.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/page.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/page.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/plus.gif b/apps/shopping-cart/src/main/webapp/images/dtree/plus.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/plus.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/plus.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/plusbottom.gif b/apps/shopping-cart/src/main/webapp/images/dtree/plusbottom.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/plusbottom.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/plusbottom.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/question.gif b/apps/shopping-cart/src/main/webapp/images/dtree/question.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/question.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/question.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/dtree/trash.gif b/apps/shopping-cart/src/main/webapp/images/dtree/trash.gif
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/dtree/trash.gif
rename to apps/shopping-cart/src/main/webapp/images/dtree/trash.gif
diff --git a/webapps/shopping-cart/src/main/webapp/images/logo-small.png b/apps/shopping-cart/src/main/webapp/images/logo-small.png
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/logo-small.png
rename to apps/shopping-cart/src/main/webapp/images/logo-small.png
diff --git a/webapps/shopping-cart/src/main/webapp/images/logo.png b/apps/shopping-cart/src/main/webapp/images/logo.png
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/images/logo.png
rename to apps/shopping-cart/src/main/webapp/images/logo.png
diff --git a/webapps/shopping-cart/src/main/webapp/index.jsp b/apps/shopping-cart/src/main/webapp/index.jsp
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/index.jsp
rename to apps/shopping-cart/src/main/webapp/index.jsp
diff --git a/webapps/shopping-cart/src/main/webapp/js/dtree.js b/apps/shopping-cart/src/main/webapp/js/dtree.js
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/js/dtree.js
rename to apps/shopping-cart/src/main/webapp/js/dtree.js
diff --git a/webapps/shopping-cart/src/main/webapp/js/nifty.js b/apps/shopping-cart/src/main/webapp/js/nifty.js
similarity index 100%
rename from webapps/shopping-cart/src/main/webapp/js/nifty.js
rename to apps/shopping-cart/src/main/webapp/js/nifty.js
diff --git a/webapps/showcase/pom.xml b/apps/showcase/pom.xml
similarity index 69%
rename from webapps/showcase/pom.xml
rename to apps/showcase/pom.xml
index 1a2a1e9d4..52ea7c376 100644
--- a/webapps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -41,7 +41,37 @@
             <artifactId>sitemesh</artifactId>
             <version>2.2.1</version>
         </dependency>
-        
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.9</version>
+        </dependency>
+        <!-- Spring -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>1.2.6</version>
+        </dependency>
+       
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>1.2.6</version>
+        </dependency>
+       
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>1.2.6</version>
+        </dependency>
+       
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>1.2.6</version>
+        </dependency>
+       
+
     </dependencies>
     
     <build>
diff --git a/webapps/showcase/quickstart.xml b/apps/showcase/quickstart.xml
similarity index 100%
rename from webapps/showcase/quickstart.xml
rename to apps/showcase/quickstart.xml
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.properties b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.properties
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.properties
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.properties
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/Guess.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/Guess.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/Guess.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/Guess.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/LotsOfOptiontransferselectAction.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/LotsOfOptiontransferselectAction.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/LotsOfOptiontransferselectAction.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/LotsOfOptiontransferselectAction.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/UITagExample-conversion.properties b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/UITagExample-conversion.properties
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/UITagExample-conversion.properties
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/UITagExample-conversion.properties
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/UITagExample.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/UITagExample.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/UITagExample.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/UITagExample.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/AbstractCRUDAction.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/AbstractCRUDAction.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/AbstractCRUDAction.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/AbstractCRUDAction.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction-conversion.properties b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction-conversion.properties
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction-conversion.properties
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction-conversion.properties
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction-validation.xml b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction-validation.xml
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction-validation.xml
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction-validation.xml
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction.properties b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction.properties
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction.properties
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction.properties
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction_de.properties b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction_de.properties
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction_de.properties
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction_de.properties
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction-validation.xml b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction-validation.xml
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction-validation.xml
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction-validation.xml
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction.properties b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction.properties
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction.properties
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction.properties
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction_de.properties b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction_de.properties
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction_de.properties
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction_de.properties
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/actionchaining/ActionChain1.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/actionchaining/ActionChain1.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/actionchaining/ActionChain1.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/actionchaining/ActionChain1.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/actionchaining/ActionChain2.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/actionchaining/ActionChain2.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/actionchaining/ActionChain2.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/actionchaining/ActionChain2.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/actionchaining/ActionChain3.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/actionchaining/ActionChain3.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/actionchaining/ActionChain3.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/actionchaining/ActionChain3.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/ajax/AjaxTestAction.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/ajax/AjaxTestAction.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/ajax/AjaxTestAction.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/ajax/AjaxTestAction.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/ajax/tree/Category.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/ajax/tree/Category.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/ajax/tree/Category.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/ajax/tree/Category.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/ajax/tree/GetCategory.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/ajax/tree/GetCategory.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/ajax/tree/GetCategory.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/ajax/tree/GetCategory.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/ajax/tree/Toggle.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/ajax/tree/Toggle.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/ajax/tree/Toggle.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/ajax/tree/Toggle.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/application/MemoryStorage.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/application/MemoryStorage.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/application/MemoryStorage.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/application/MemoryStorage.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/application/Storage.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/application/Storage.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/application/Storage.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/application/Storage.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/application/TestDataProvider.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/application/TestDataProvider.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/application/TestDataProvider.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/application/TestDataProvider.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/AbstractDao.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/AbstractDao.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/AbstractDao.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/AbstractDao.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/Dao.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/Dao.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/Dao.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/Dao.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/EmployeeDao.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/EmployeeDao.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/EmployeeDao.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/EmployeeDao.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/SkillDao.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/SkillDao.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/SkillDao.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/SkillDao.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/CreateException.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/CreateException.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/CreateException.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/CreateException.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/DeleteException.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/DeleteException.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/DeleteException.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/DeleteException.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/DuplicateKeyException.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/DuplicateKeyException.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/DuplicateKeyException.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/DuplicateKeyException.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/StorageException.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/StorageException.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/StorageException.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/StorageException.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/UpdateException.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/UpdateException.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/UpdateException.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/UpdateException.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/filedownload/FileDownloadAction.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/filedownload/FileDownloadAction.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/filedownload/FileDownloadAction.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/filedownload/FileDownloadAction.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/fileupload/FileUploadAction.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/fileupload/FileUploadAction.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/fileupload/FileUploadAction.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/fileupload/FileUploadAction.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/jasper/JasperAction.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/jasper/JasperAction.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/jasper/JasperAction.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/jasper/JasperAction.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/model/Employee.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/model/Employee.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/model/Employee.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/model/Employee.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/model/IdEntity.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/model/IdEntity.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/model/IdEntity.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/model/IdEntity.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/model/Skill.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/model/Skill.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/model/Skill.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/model/Skill.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/modelDriven/Gangster.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/modelDriven/Gangster.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/modelDriven/Gangster.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/modelDriven/Gangster.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/modelDriven/ModelDrivenAction.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/modelDriven/ModelDrivenAction.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/modelDriven/ModelDrivenAction.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/modelDriven/ModelDrivenAction.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/CreatePerson-validation.xml b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/person/CreatePerson-validation.xml
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/CreatePerson-validation.xml
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/person/CreatePerson-validation.xml
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/CreatePerson.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/person/CreatePerson.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/CreatePerson.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/person/CreatePerson.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/EditPerson-conversion.properties b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/person/EditPerson-conversion.properties
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/EditPerson-conversion.properties
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/person/EditPerson-conversion.properties
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/EditPerson.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/person/EditPerson.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/EditPerson.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/person/EditPerson.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/ListPeople.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/person/ListPeople.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/ListPeople.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/person/ListPeople.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/Person-validation.xml b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/person/Person-validation.xml
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/Person-validation.xml
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/person/Person-validation.xml
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/Person.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/person/Person.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/Person.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/person/Person.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/PersonManager.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/person/PersonManager.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/PersonManager.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/person/PersonManager.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/sitemesh/NoneDecoratorMapper.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/sitemesh/NoneDecoratorMapper.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/sitemesh/NoneDecoratorMapper.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/sitemesh/NoneDecoratorMapper.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/actiontag/ActionTagDemo.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/actiontag/ActionTagDemo.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/actiontag/ActionTagDemo.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/actiontag/ActionTagDemo.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/token/TokenAction.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/token/TokenAction.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/token/TokenAction.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/token/TokenAction.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/AbstractValidationActionSupport.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/AbstractValidationActionSupport.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/AbstractValidationActionSupport.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/AbstractValidationActionSupport.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-conversion.properties b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-conversion.properties
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-conversion.properties
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-conversion.properties
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.properties b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.properties
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.properties
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.properties
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/QuizAction-validation.xml b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/QuizAction-validation.xml
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/QuizAction-validation.xml
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/QuizAction-validation.xml
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/QuizAction.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/QuizAction.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/QuizAction.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/QuizAction.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/User-userContext-validation.xml b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/User-userContext-validation.xml
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/User-userContext-validation.xml
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/User-userContext-validation.xml
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/User.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/User.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/User.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/User.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction.java
diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/wait/LongProcessAction.java b/apps/showcase/src/main/java/org/apache/struts/action2/showcase/wait/LongProcessAction.java
similarity index 100%
rename from webapps/showcase/src/main/java/org/apache/struts/action2/showcase/wait/LongProcessAction.java
rename to apps/showcase/src/main/java/org/apache/struts/action2/showcase/wait/LongProcessAction.java
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/applicationContext.xml b/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/applicationContext.xml
rename to apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/globalMessages.properties b/apps/showcase/src/main/webapp/WEB-INF/classes/globalMessages.properties
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/classes/globalMessages.properties
rename to apps/showcase/src/main/webapp/WEB-INF/classes/globalMessages.properties
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/globalMessages_de.properties b/apps/showcase/src/main/webapp/WEB-INF/classes/globalMessages_de.properties
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/classes/globalMessages_de.properties
rename to apps/showcase/src/main/webapp/WEB-INF/classes/globalMessages_de.properties
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/log4j.properties b/apps/showcase/src/main/webapp/WEB-INF/classes/log4j.properties
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/classes/log4j.properties
rename to apps/showcase/src/main/webapp/WEB-INF/classes/log4j.properties
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/struts.properties b/apps/showcase/src/main/webapp/WEB-INF/classes/struts.properties
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/classes/struts.properties
rename to apps/showcase/src/main/webapp/WEB-INF/classes/struts.properties
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-actionchaining.xml b/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-actionchaining.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-actionchaining.xml
rename to apps/showcase/src/main/webapp/WEB-INF/classes/xwork-actionchaining.xml
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-ajax.xml b/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-ajax.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-ajax.xml
rename to apps/showcase/src/main/webapp/WEB-INF/classes/xwork-ajax.xml
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-continuations.xml b/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-continuations.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-continuations.xml
rename to apps/showcase/src/main/webapp/WEB-INF/classes/xwork-continuations.xml
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-filedownload.xml b/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-filedownload.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-filedownload.xml
rename to apps/showcase/src/main/webapp/WEB-INF/classes/xwork-filedownload.xml
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-fileupload.xml b/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-fileupload.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-fileupload.xml
rename to apps/showcase/src/main/webapp/WEB-INF/classes/xwork-fileupload.xml
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-model-driven.xml b/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-model-driven.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-model-driven.xml
rename to apps/showcase/src/main/webapp/WEB-INF/classes/xwork-model-driven.xml
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-person.xml b/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-person.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-person.xml
rename to apps/showcase/src/main/webapp/WEB-INF/classes/xwork-person.xml
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-non-ui.xml b/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-non-ui.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-non-ui.xml
rename to apps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-non-ui.xml
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-ui.xml b/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-ui.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-ui.xml
rename to apps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-ui.xml
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags.xml b/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags.xml
rename to apps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags.xml
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-token.xml b/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-token.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-token.xml
rename to apps/showcase/src/main/webapp/WEB-INF/classes/xwork-token.xml
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-validation.xml b/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-validation.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-validation.xml
rename to apps/showcase/src/main/webapp/WEB-INF/classes/xwork-validation.xml
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-wait.xml b/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-wait.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-wait.xml
rename to apps/showcase/src/main/webapp/WEB-INF/classes/xwork-wait.xml
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork.xml b/apps/showcase/src/main/webapp/WEB-INF/classes/xwork.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/classes/xwork.xml
rename to apps/showcase/src/main/webapp/WEB-INF/classes/xwork.xml
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/decorators.xml b/apps/showcase/src/main/webapp/WEB-INF/decorators.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/decorators.xml
rename to apps/showcase/src/main/webapp/WEB-INF/decorators.xml
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
rename to apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/dwr.xml b/apps/showcase/src/main/webapp/WEB-INF/dwr.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/dwr.xml
rename to apps/showcase/src/main/webapp/WEB-INF/dwr.xml
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/sitemesh-decorator.tld b/apps/showcase/src/main/webapp/WEB-INF/sitemesh-decorator.tld
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/sitemesh-decorator.tld
rename to apps/showcase/src/main/webapp/WEB-INF/sitemesh-decorator.tld
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/sitemesh-page.tld b/apps/showcase/src/main/webapp/WEB-INF/sitemesh-page.tld
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/sitemesh-page.tld
rename to apps/showcase/src/main/webapp/WEB-INF/sitemesh-page.tld
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/sitemesh.xml b/apps/showcase/src/main/webapp/WEB-INF/sitemesh.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/sitemesh.xml
rename to apps/showcase/src/main/webapp/WEB-INF/sitemesh.xml
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/web.xml b/apps/showcase/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from webapps/showcase/src/main/webapp/WEB-INF/web.xml
rename to apps/showcase/src/main/webapp/WEB-INF/web.xml
diff --git a/webapps/showcase/src/main/webapp/actionchaining/actionChainingResult.jsp b/apps/showcase/src/main/webapp/actionchaining/actionChainingResult.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/actionchaining/actionChainingResult.jsp
rename to apps/showcase/src/main/webapp/actionchaining/actionChainingResult.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/AjaxResult.jsp b/apps/showcase/src/main/webapp/ajax/AjaxResult.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/AjaxResult.jsp
rename to apps/showcase/src/main/webapp/ajax/AjaxResult.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/AjaxResult2.js b/apps/showcase/src/main/webapp/ajax/AjaxResult2.js
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/AjaxResult2.js
rename to apps/showcase/src/main/webapp/ajax/AjaxResult2.js
diff --git a/webapps/showcase/src/main/webapp/ajax/AjaxResult3.jsp b/apps/showcase/src/main/webapp/ajax/AjaxResult3.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/AjaxResult3.jsp
rename to apps/showcase/src/main/webapp/ajax/AjaxResult3.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/commonInclude.jsp b/apps/showcase/src/main/webapp/ajax/commonInclude.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/commonInclude.jsp
rename to apps/showcase/src/main/webapp/ajax/commonInclude.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/footer.jsp b/apps/showcase/src/main/webapp/ajax/footer.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/footer.jsp
rename to apps/showcase/src/main/webapp/ajax/footer.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/index.jsp b/apps/showcase/src/main/webapp/ajax/index.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/index.jsp
rename to apps/showcase/src/main/webapp/ajax/index.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/remotediv/example1.jsp b/apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
rename to apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/remotediv/example2.jsp b/apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
rename to apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/remotediv/example3.jsp b/apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
rename to apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/remotediv/example4.jsp b/apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
rename to apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/remotediv/example5.jsp b/apps/showcase/src/main/webapp/ajax/remotediv/example5.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/remotediv/example5.jsp
rename to apps/showcase/src/main/webapp/ajax/remotediv/example5.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/remotediv/example6.jsp b/apps/showcase/src/main/webapp/ajax/remotediv/example6.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/remotediv/example6.jsp
rename to apps/showcase/src/main/webapp/ajax/remotediv/example6.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/remotediv/example7.jsp b/apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
rename to apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/remotediv/index.jsp b/apps/showcase/src/main/webapp/ajax/remotediv/index.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/remotediv/index.jsp
rename to apps/showcase/src/main/webapp/ajax/remotediv/index.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/remoteforms/index.jsp b/apps/showcase/src/main/webapp/ajax/remoteforms/index.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/remoteforms/index.jsp
rename to apps/showcase/src/main/webapp/ajax/remoteforms/index.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/remoteforms/test1.jsp b/apps/showcase/src/main/webapp/ajax/remoteforms/test1.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/remoteforms/test1.jsp
rename to apps/showcase/src/main/webapp/ajax/remoteforms/test1.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/remoteforms/test2.jsp b/apps/showcase/src/main/webapp/ajax/remoteforms/test2.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/remoteforms/test2.jsp
rename to apps/showcase/src/main/webapp/ajax/remoteforms/test2.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/remoteforms/test3.jsp b/apps/showcase/src/main/webapp/ajax/remoteforms/test3.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/remoteforms/test3.jsp
rename to apps/showcase/src/main/webapp/ajax/remoteforms/test3.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/remotelink/index.jsp b/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/remotelink/index.jsp
rename to apps/showcase/src/main/webapp/ajax/remotelink/index.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp b/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
rename to apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp b/apps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp
rename to apps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp b/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
rename to apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp b/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp
rename to apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/testjs.jsp b/apps/showcase/src/main/webapp/ajax/testjs.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/testjs.jsp
rename to apps/showcase/src/main/webapp/ajax/testjs.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/tree/getCategory.jsp b/apps/showcase/src/main/webapp/ajax/tree/getCategory.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/tree/getCategory.jsp
rename to apps/showcase/src/main/webapp/ajax/tree/getCategory.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/tree/partialChunkHeader.jsp b/apps/showcase/src/main/webapp/ajax/tree/partialChunkHeader.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/tree/partialChunkHeader.jsp
rename to apps/showcase/src/main/webapp/ajax/tree/partialChunkHeader.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/tree/toggle.jsp b/apps/showcase/src/main/webapp/ajax/tree/toggle.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/tree/toggle.jsp
rename to apps/showcase/src/main/webapp/ajax/tree/toggle.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/tree/tree.jsp b/apps/showcase/src/main/webapp/ajax/tree/tree.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/tree/tree.jsp
rename to apps/showcase/src/main/webapp/ajax/tree/tree.jsp
diff --git a/webapps/showcase/src/main/webapp/ajax/widgets/index.jsp b/apps/showcase/src/main/webapp/ajax/widgets/index.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/ajax/widgets/index.jsp
rename to apps/showcase/src/main/webapp/ajax/widgets/index.jsp
diff --git a/webapps/showcase/src/main/webapp/continuations/guess.ftl b/apps/showcase/src/main/webapp/continuations/guess.ftl
similarity index 100%
rename from webapps/showcase/src/main/webapp/continuations/guess.ftl
rename to apps/showcase/src/main/webapp/continuations/guess.ftl
diff --git a/webapps/showcase/src/main/webapp/date.jsp b/apps/showcase/src/main/webapp/date.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/date.jsp
rename to apps/showcase/src/main/webapp/date.jsp
diff --git a/webapps/showcase/src/main/webapp/empmanager/editEmployee.jsp b/apps/showcase/src/main/webapp/empmanager/editEmployee.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/empmanager/editEmployee.jsp
rename to apps/showcase/src/main/webapp/empmanager/editEmployee.jsp
diff --git a/webapps/showcase/src/main/webapp/empmanager/editSkill.jsp b/apps/showcase/src/main/webapp/empmanager/editSkill.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/empmanager/editSkill.jsp
rename to apps/showcase/src/main/webapp/empmanager/editSkill.jsp
diff --git a/webapps/showcase/src/main/webapp/empmanager/index.jsp b/apps/showcase/src/main/webapp/empmanager/index.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/empmanager/index.jsp
rename to apps/showcase/src/main/webapp/empmanager/index.jsp
diff --git a/webapps/showcase/src/main/webapp/empmanager/listEmployees.jsp b/apps/showcase/src/main/webapp/empmanager/listEmployees.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/empmanager/listEmployees.jsp
rename to apps/showcase/src/main/webapp/empmanager/listEmployees.jsp
diff --git a/webapps/showcase/src/main/webapp/empmanager/listSkills.jsp b/apps/showcase/src/main/webapp/empmanager/listSkills.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/empmanager/listSkills.jsp
rename to apps/showcase/src/main/webapp/empmanager/listSkills.jsp
diff --git a/webapps/showcase/src/main/webapp/filedownload/index.jsp b/apps/showcase/src/main/webapp/filedownload/index.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/filedownload/index.jsp
rename to apps/showcase/src/main/webapp/filedownload/index.jsp
diff --git a/webapps/showcase/src/main/webapp/fileupload/upload-success.jsp b/apps/showcase/src/main/webapp/fileupload/upload-success.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/fileupload/upload-success.jsp
rename to apps/showcase/src/main/webapp/fileupload/upload-success.jsp
diff --git a/webapps/showcase/src/main/webapp/fileupload/upload.jsp b/apps/showcase/src/main/webapp/fileupload/upload.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/fileupload/upload.jsp
rename to apps/showcase/src/main/webapp/fileupload/upload.jsp
diff --git a/webapps/showcase/src/main/webapp/help.jsp b/apps/showcase/src/main/webapp/help.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/help.jsp
rename to apps/showcase/src/main/webapp/help.jsp
diff --git a/webapps/showcase/src/main/webapp/images/logo-small.png b/apps/showcase/src/main/webapp/images/logo-small.png
similarity index 100%
rename from webapps/showcase/src/main/webapp/images/logo-small.png
rename to apps/showcase/src/main/webapp/images/logo-small.png
diff --git a/webapps/showcase/src/main/webapp/images/logo.png b/apps/showcase/src/main/webapp/images/logo.png
similarity index 100%
rename from webapps/showcase/src/main/webapp/images/logo.png
rename to apps/showcase/src/main/webapp/images/logo.png
diff --git a/webapps/showcase/src/main/webapp/index.jsp b/apps/showcase/src/main/webapp/index.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/index.jsp
rename to apps/showcase/src/main/webapp/index.jsp
diff --git a/webapps/showcase/src/main/webapp/jasper/sample_report.jrxml b/apps/showcase/src/main/webapp/jasper/sample_report.jrxml
similarity index 100%
rename from webapps/showcase/src/main/webapp/jasper/sample_report.jrxml
rename to apps/showcase/src/main/webapp/jasper/sample_report.jrxml
diff --git a/webapps/showcase/src/main/webapp/modelDriven/modelDriven.jsp b/apps/showcase/src/main/webapp/modelDriven/modelDriven.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/modelDriven/modelDriven.jsp
rename to apps/showcase/src/main/webapp/modelDriven/modelDriven.jsp
diff --git a/webapps/showcase/src/main/webapp/modelDriven/modelDrivenResult.jsp b/apps/showcase/src/main/webapp/modelDriven/modelDrivenResult.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/modelDriven/modelDrivenResult.jsp
rename to apps/showcase/src/main/webapp/modelDriven/modelDrivenResult.jsp
diff --git a/webapps/showcase/src/main/webapp/person/editPeople.jsp b/apps/showcase/src/main/webapp/person/editPeople.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/person/editPeople.jsp
rename to apps/showcase/src/main/webapp/person/editPeople.jsp
diff --git a/webapps/showcase/src/main/webapp/person/index.jsp b/apps/showcase/src/main/webapp/person/index.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/person/index.jsp
rename to apps/showcase/src/main/webapp/person/index.jsp
diff --git a/webapps/showcase/src/main/webapp/person/listPeople.ftl b/apps/showcase/src/main/webapp/person/listPeople.ftl
similarity index 100%
rename from webapps/showcase/src/main/webapp/person/listPeople.ftl
rename to apps/showcase/src/main/webapp/person/listPeople.ftl
diff --git a/webapps/showcase/src/main/webapp/person/newPerson.ftl b/apps/showcase/src/main/webapp/person/newPerson.ftl
similarity index 100%
rename from webapps/showcase/src/main/webapp/person/newPerson.ftl
rename to apps/showcase/src/main/webapp/person/newPerson.ftl
diff --git a/webapps/showcase/src/main/webapp/showcase.jsp b/apps/showcase/src/main/webapp/showcase.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/showcase.jsp
rename to apps/showcase/src/main/webapp/showcase.jsp
diff --git a/webapps/showcase/src/main/webapp/styles/forms.css b/apps/showcase/src/main/webapp/styles/forms.css
similarity index 100%
rename from webapps/showcase/src/main/webapp/styles/forms.css
rename to apps/showcase/src/main/webapp/styles/forms.css
diff --git a/webapps/showcase/src/main/webapp/styles/layout-navtop-1col.css b/apps/showcase/src/main/webapp/styles/layout-navtop-1col.css
similarity index 100%
rename from webapps/showcase/src/main/webapp/styles/layout-navtop-1col.css
rename to apps/showcase/src/main/webapp/styles/layout-navtop-1col.css
diff --git a/webapps/showcase/src/main/webapp/styles/layout-navtop-localleft.css b/apps/showcase/src/main/webapp/styles/layout-navtop-localleft.css
similarity index 100%
rename from webapps/showcase/src/main/webapp/styles/layout-navtop-localleft.css
rename to apps/showcase/src/main/webapp/styles/layout-navtop-localleft.css
diff --git a/webapps/showcase/src/main/webapp/styles/layout.css b/apps/showcase/src/main/webapp/styles/layout.css
similarity index 100%
rename from webapps/showcase/src/main/webapp/styles/layout.css
rename to apps/showcase/src/main/webapp/styles/layout.css
diff --git a/webapps/showcase/src/main/webapp/styles/main.css b/apps/showcase/src/main/webapp/styles/main.css
similarity index 100%
rename from webapps/showcase/src/main/webapp/styles/main.css
rename to apps/showcase/src/main/webapp/styles/main.css
diff --git a/webapps/showcase/src/main/webapp/styles/nav-horizontal.css b/apps/showcase/src/main/webapp/styles/nav-horizontal.css
similarity index 100%
rename from webapps/showcase/src/main/webapp/styles/nav-horizontal.css
rename to apps/showcase/src/main/webapp/styles/nav-horizontal.css
diff --git a/webapps/showcase/src/main/webapp/styles/tools.css b/apps/showcase/src/main/webapp/styles/tools.css
similarity index 100%
rename from webapps/showcase/src/main/webapp/styles/tools.css
rename to apps/showcase/src/main/webapp/styles/tools.css
diff --git a/webapps/showcase/src/main/webapp/styles/typo.css b/apps/showcase/src/main/webapp/styles/typo.css
similarity index 100%
rename from webapps/showcase/src/main/webapp/styles/typo.css
rename to apps/showcase/src/main/webapp/styles/typo.css
diff --git a/webapps/showcase/src/main/webapp/tags/index.jsp b/apps/showcase/src/main/webapp/tags/index.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/index.jsp
rename to apps/showcase/src/main/webapp/tags/index.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage.jsp b/apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage.jsp
rename to apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage2.jsp b/apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage2.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage2.jsp
rename to apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage2.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage3.jsp b/apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage3.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage3.jsp
rename to apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage3.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp b/apps/showcase/src/main/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp
rename to apps/showcase/src/main/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/non-ui/date.jsp b/apps/showcase/src/main/webapp/tags/non-ui/date.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/non-ui/date.jsp
rename to apps/showcase/src/main/webapp/tags/non-ui/date.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/non-ui/index.jsp b/apps/showcase/src/main/webapp/tags/non-ui/index.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/non-ui/index.jsp
rename to apps/showcase/src/main/webapp/tags/non-ui/index.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp b/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
rename to apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp b/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
rename to apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp b/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
rename to apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp b/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp
rename to apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp b/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp
rename to apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp b/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp
rename to apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp b/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp
rename to apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp b/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
rename to apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/ui/example.jsp b/apps/showcase/src/main/webapp/tags/ui/example.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/ui/example.jsp
rename to apps/showcase/src/main/webapp/tags/ui/example.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/ui/example.vm b/apps/showcase/src/main/webapp/tags/ui/example.vm
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/ui/example.vm
rename to apps/showcase/src/main/webapp/tags/ui/example.vm
diff --git a/webapps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp b/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp
rename to apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm b/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm
rename to apps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm
diff --git a/webapps/showcase/src/main/webapp/tags/ui/images/backgroundImage.jpg b/apps/showcase/src/main/webapp/tags/ui/images/backgroundImage.jpg
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/ui/images/backgroundImage.jpg
rename to apps/showcase/src/main/webapp/tags/ui/images/backgroundImage.jpg
diff --git a/webapps/showcase/src/main/webapp/tags/ui/images/leopard.jpg b/apps/showcase/src/main/webapp/tags/ui/images/leopard.jpg
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/ui/images/leopard.jpg
rename to apps/showcase/src/main/webapp/tags/ui/images/leopard.jpg
diff --git a/webapps/showcase/src/main/webapp/tags/ui/index.jsp b/apps/showcase/src/main/webapp/tags/ui/index.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/ui/index.jsp
rename to apps/showcase/src/main/webapp/tags/ui/index.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp b/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp
rename to apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp b/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp
rename to apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditor.jsp b/apps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditor.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditor.jsp
rename to apps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditor.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditorSubmit.jsp b/apps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditorSubmit.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditorSubmit.jsp
rename to apps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditorSubmit.jsp
diff --git a/webapps/showcase/src/main/webapp/tags/ui/tooltipExample.jsp b/apps/showcase/src/main/webapp/tags/ui/tooltipExample.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/tags/ui/tooltipExample.jsp
rename to apps/showcase/src/main/webapp/tags/ui/tooltipExample.jsp
diff --git a/webapps/showcase/src/main/webapp/token/doublePost.jsp b/apps/showcase/src/main/webapp/token/doublePost.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/token/doublePost.jsp
rename to apps/showcase/src/main/webapp/token/doublePost.jsp
diff --git a/webapps/showcase/src/main/webapp/token/example1.jsp b/apps/showcase/src/main/webapp/token/example1.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/token/example1.jsp
rename to apps/showcase/src/main/webapp/token/example1.jsp
diff --git a/webapps/showcase/src/main/webapp/token/example2.jsp b/apps/showcase/src/main/webapp/token/example2.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/token/example2.jsp
rename to apps/showcase/src/main/webapp/token/example2.jsp
diff --git a/webapps/showcase/src/main/webapp/token/example3.jsp b/apps/showcase/src/main/webapp/token/example3.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/token/example3.jsp
rename to apps/showcase/src/main/webapp/token/example3.jsp
diff --git a/webapps/showcase/src/main/webapp/token/example4.ftl b/apps/showcase/src/main/webapp/token/example4.ftl
similarity index 100%
rename from webapps/showcase/src/main/webapp/token/example4.ftl
rename to apps/showcase/src/main/webapp/token/example4.ftl
diff --git a/webapps/showcase/src/main/webapp/token/index.jsp b/apps/showcase/src/main/webapp/token/index.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/token/index.jsp
rename to apps/showcase/src/main/webapp/token/index.jsp
diff --git a/webapps/showcase/src/main/webapp/token/transferDone.jsp b/apps/showcase/src/main/webapp/token/transferDone.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/token/transferDone.jsp
rename to apps/showcase/src/main/webapp/token/transferDone.jsp
diff --git a/webapps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp b/apps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp
rename to apps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp
diff --git a/webapps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp
rename to apps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp
diff --git a/webapps/showcase/src/main/webapp/validation/footer.jsp b/apps/showcase/src/main/webapp/validation/footer.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/validation/footer.jsp
rename to apps/showcase/src/main/webapp/validation/footer.jsp
diff --git a/webapps/showcase/src/main/webapp/validation/index.jsp b/apps/showcase/src/main/webapp/validation/index.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/validation/index.jsp
rename to apps/showcase/src/main/webapp/validation/index.jsp
diff --git a/webapps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp
rename to apps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp
diff --git a/webapps/showcase/src/main/webapp/validation/quiz-ajax.jsp b/apps/showcase/src/main/webapp/validation/quiz-ajax.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/validation/quiz-ajax.jsp
rename to apps/showcase/src/main/webapp/validation/quiz-ajax.jsp
diff --git a/webapps/showcase/src/main/webapp/validation/quiz-basic.jsp b/apps/showcase/src/main/webapp/validation/quiz-basic.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/validation/quiz-basic.jsp
rename to apps/showcase/src/main/webapp/validation/quiz-basic.jsp
diff --git a/webapps/showcase/src/main/webapp/validation/quiz-client-css.jsp b/apps/showcase/src/main/webapp/validation/quiz-client-css.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/validation/quiz-client-css.jsp
rename to apps/showcase/src/main/webapp/validation/quiz-client-css.jsp
diff --git a/webapps/showcase/src/main/webapp/validation/quiz-client.jsp b/apps/showcase/src/main/webapp/validation/quiz-client.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/validation/quiz-client.jsp
rename to apps/showcase/src/main/webapp/validation/quiz-client.jsp
diff --git a/webapps/showcase/src/main/webapp/validation/quiz-success.jsp b/apps/showcase/src/main/webapp/validation/quiz-success.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/validation/quiz-success.jsp
rename to apps/showcase/src/main/webapp/validation/quiz-success.jsp
diff --git a/webapps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp b/apps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp
rename to apps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp
diff --git a/webapps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp
rename to apps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp
diff --git a/webapps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp
rename to apps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp
diff --git a/webapps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp b/apps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp
rename to apps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp
diff --git a/webapps/showcase/src/main/webapp/validation/validationExamplesStyles.css b/apps/showcase/src/main/webapp/validation/validationExamplesStyles.css
similarity index 100%
rename from webapps/showcase/src/main/webapp/validation/validationExamplesStyles.css
rename to apps/showcase/src/main/webapp/validation/validationExamplesStyles.css
diff --git a/webapps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp b/apps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp
rename to apps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp
diff --git a/webapps/showcase/src/main/webapp/wait/complete.jsp b/apps/showcase/src/main/webapp/wait/complete.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/wait/complete.jsp
rename to apps/showcase/src/main/webapp/wait/complete.jsp
diff --git a/webapps/showcase/src/main/webapp/wait/example1.jsp b/apps/showcase/src/main/webapp/wait/example1.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/wait/example1.jsp
rename to apps/showcase/src/main/webapp/wait/example1.jsp
diff --git a/webapps/showcase/src/main/webapp/wait/example2.jsp b/apps/showcase/src/main/webapp/wait/example2.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/wait/example2.jsp
rename to apps/showcase/src/main/webapp/wait/example2.jsp
diff --git a/webapps/showcase/src/main/webapp/wait/example3.jsp b/apps/showcase/src/main/webapp/wait/example3.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/wait/example3.jsp
rename to apps/showcase/src/main/webapp/wait/example3.jsp
diff --git a/webapps/showcase/src/main/webapp/wait/index.jsp b/apps/showcase/src/main/webapp/wait/index.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/wait/index.jsp
rename to apps/showcase/src/main/webapp/wait/index.jsp
diff --git a/webapps/showcase/src/main/webapp/wait/wait.jsp b/apps/showcase/src/main/webapp/wait/wait.jsp
similarity index 100%
rename from webapps/showcase/src/main/webapp/wait/wait.jsp
rename to apps/showcase/src/main/webapp/wait/wait.jsp
diff --git a/webapps/starter/pom.xml b/apps/starter/pom.xml
similarity index 100%
rename from webapps/starter/pom.xml
rename to apps/starter/pom.xml
diff --git a/webapps/starter/src/main/java/com/foo/example/CounterBean.java b/apps/starter/src/main/java/com/foo/example/CounterBean.java
similarity index 100%
rename from webapps/starter/src/main/java/com/foo/example/CounterBean.java
rename to apps/starter/src/main/java/com/foo/example/CounterBean.java
diff --git a/webapps/starter/src/main/java/com/foo/example/HelloMatrixAction-helloMatrixSubmit-validation.xml b/apps/starter/src/main/java/com/foo/example/HelloMatrixAction-helloMatrixSubmit-validation.xml
similarity index 100%
rename from webapps/starter/src/main/java/com/foo/example/HelloMatrixAction-helloMatrixSubmit-validation.xml
rename to apps/starter/src/main/java/com/foo/example/HelloMatrixAction-helloMatrixSubmit-validation.xml
diff --git a/webapps/starter/src/main/java/com/foo/example/HelloMatrixAction.java b/apps/starter/src/main/java/com/foo/example/HelloMatrixAction.java
similarity index 100%
rename from webapps/starter/src/main/java/com/foo/example/HelloMatrixAction.java
rename to apps/starter/src/main/java/com/foo/example/HelloMatrixAction.java
diff --git a/webapps/starter/src/main/java/com/foo/example/HomeAction.java b/apps/starter/src/main/java/com/foo/example/HomeAction.java
similarity index 100%
rename from webapps/starter/src/main/java/com/foo/example/HomeAction.java
rename to apps/starter/src/main/java/com/foo/example/HomeAction.java
diff --git a/webapps/starter/src/main/webapp/WEB-INF/applicationContext.xml b/apps/starter/src/main/webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from webapps/starter/src/main/webapp/WEB-INF/applicationContext.xml
rename to apps/starter/src/main/webapp/WEB-INF/applicationContext.xml
diff --git a/webapps/starter/src/main/webapp/WEB-INF/classes/struts.properties b/apps/starter/src/main/webapp/WEB-INF/classes/struts.properties
similarity index 100%
rename from webapps/starter/src/main/webapp/WEB-INF/classes/struts.properties
rename to apps/starter/src/main/webapp/WEB-INF/classes/struts.properties
diff --git a/webapps/starter/src/main/webapp/WEB-INF/classes/xwork.xml b/apps/starter/src/main/webapp/WEB-INF/classes/xwork.xml
similarity index 100%
rename from webapps/starter/src/main/webapp/WEB-INF/classes/xwork.xml
rename to apps/starter/src/main/webapp/WEB-INF/classes/xwork.xml
diff --git a/webapps/starter/src/main/webapp/WEB-INF/pages/hellomatrix-success.ftl b/apps/starter/src/main/webapp/WEB-INF/pages/hellomatrix-success.ftl
similarity index 100%
rename from webapps/starter/src/main/webapp/WEB-INF/pages/hellomatrix-success.ftl
rename to apps/starter/src/main/webapp/WEB-INF/pages/hellomatrix-success.ftl
diff --git a/webapps/starter/src/main/webapp/WEB-INF/pages/hellomatrix.jsp b/apps/starter/src/main/webapp/WEB-INF/pages/hellomatrix.jsp
similarity index 100%
rename from webapps/starter/src/main/webapp/WEB-INF/pages/hellomatrix.jsp
rename to apps/starter/src/main/webapp/WEB-INF/pages/hellomatrix.jsp
diff --git a/webapps/starter/src/main/webapp/WEB-INF/pages/home.jsp b/apps/starter/src/main/webapp/WEB-INF/pages/home.jsp
similarity index 100%
rename from webapps/starter/src/main/webapp/WEB-INF/pages/home.jsp
rename to apps/starter/src/main/webapp/WEB-INF/pages/home.jsp
diff --git a/webapps/starter/src/main/webapp/WEB-INF/web.xml b/apps/starter/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from webapps/starter/src/main/webapp/WEB-INF/web.xml
rename to apps/starter/src/main/webapp/WEB-INF/web.xml
diff --git a/webapps/starter/src/main/webapp/index.jsp b/apps/starter/src/main/webapp/index.jsp
similarity index 100%
rename from webapps/starter/src/main/webapp/index.jsp
rename to apps/starter/src/main/webapp/index.jsp
diff --git a/build.xml b/build.xml
index 9b05783d6..2ece0e24a 100644
--- a/build.xml
+++ b/build.xml
@@ -71,9 +71,9 @@
     <macrodef name="webapp">
         <attribute name="name"/>
         <sequential>
-            <mkdir dir="${dist}/webapps/@{name}/src"/>
-            <copy todir="${dist}/webapps/@{name}/src">
-                <fileset dir="webapps/@{name}/src" includes="**/**"/>
+            <mkdir dir="${dist}/apps/@{name}/src"/>
+            <copy todir="${dist}/apps/@{name}/src">
+                <fileset dir="apps/@{name}/src" includes="**/**"/>
             </copy>
         </sequential>
     </macrodef>
@@ -88,8 +88,8 @@
         
         <!-- prepare the template project -->
         <webapp name="blank"/>
-        <copy todir="${dist}/webapps/blank">
-            <fileset dir="webapps/blank/" includes="*.iml" />
+        <copy todir="${dist}/apps/blank">
+            <fileset dir="apps/blank/" includes="*.iml" />
         </copy>
 
         <!-- prepare each tutorial/example -->
@@ -99,7 +99,7 @@
         <webapp name="portlet"/>
 
         <!-- copy over elements required to build the final wars -->
-        <copy file="webapps/build.xml" todir="${dist}/webapps"/>
+        <copy file="apps/build.xml" todir="${dist}/apps"/>
     </target>
 
     <target name="xdoclet-taglib" depends="init">
@@ -214,15 +214,15 @@
     </target>
 
     <target name="clean" depends="common.clean">
-        <delete dir="webapps/base/build"/>
-        <delete dir="webapps/blank/build"/>
-        <delete dir="webapps/showcase/build"/>
-        <delete dir="webapps/starter/build"/>
-        <delete dir="webapps/ajax/build"/>
-        <delete dir="webapps/shopping-cart/build"/>
-        <delete dir="webapps/portlet/build"/>
+        <delete dir="apps/base/build"/>
+        <delete dir="apps/blank/build"/>
+        <delete dir="apps/showcase/build"/>
+        <delete dir="apps/starter/build"/>
+        <delete dir="apps/ajax/build"/>
+        <delete dir="apps/shopping-cart/build"/>
+        <delete dir="apps/portlet/build"/>
 <!--
-        <delete dir="webapps/wwia/build"/>
+        <delete dir="apps/wwia/build"/>
 -->
     </target>
 
diff --git a/core/src/main/java/org/apache/struts/action2/Main.java b/core/src/main/java/org/apache/struts/action2/Main.java
index 3fefa2dce..f79efe9d3 100644
--- a/core/src/main/java/org/apache/struts/action2/Main.java
+++ b/core/src/main/java/org/apache/struts/action2/Main.java
@@ -54,7 +54,7 @@ public class Main {
             System.out.println("");
             System.out.println("Execute the commands for additional usage instructions.");
             System.out.println("Note: the *:xxx commands are just shortcuts for ");
-            System.out.println("      running the command on a webapp in the webapps dir.");
+            System.out.println("      running the command on a webapp in the apps dir.");
             System.out.println("      For example, 'quickstart:sandbox' will start QuickStart");
             System.out.println("      automatically for the webapp 'sandbox'.");
             return;
@@ -131,8 +131,8 @@ public class Main {
             command = "quickstart";
             String name = checkWebAppArgs(args);
             programArgs = new String[]{"/" + name,
-                    "webapps/" + name + "/src/main/webapp",
-                    "webapps/" + name + "/src/main/java"};
+                    "apps/" + name + "/src/main/webapp",
+                    "apps/" + name + "/src/main/java"};
         }
 
         if ("quickstart".equals(command)) {
@@ -151,8 +151,8 @@ public class Main {
         if (command.startsWith("sitegraph:")) {
             command = "sitegraph";
             String name = checkWebAppArgs(args);
-            programArgs = new String[]{"-config", "webapps/" + name + "/src/webapp/WEB-INF/classes",
-                    "-views", "webapps/" + name + "/src/webapp",
+            programArgs = new String[]{"-config", "apps/" + name + "/src/webapp/WEB-INF/classes",
+                    "-views", "apps/" + name + "/src/webapp",
                     "-output", "."};
         }
 
@@ -172,7 +172,7 @@ public class Main {
         if (name == null || name.equals("")) {
             System.out.println("Error: you must specify the webapp you wish");
             System.out.println("       to deploy. The webapp name must be the");
-            System.out.println("       name of the directory found in webapps/.");
+            System.out.println("       name of the directory found in apps/.");
             System.out.println("");
             System.out.println("Example: java -jar struts.jar quickstart:sandbox");
             System.exit(1);
diff --git a/osbuild.xml b/osbuild.xml
index 52316947f..89db11c21 100644
--- a/osbuild.xml
+++ b/osbuild.xml
@@ -359,7 +359,7 @@
                       **/*.xsl,
                       **/*.xslt,
                       **/*.html" />
-        <fixcrlf eol="lf" srcdir="${basedir}/webapps"
+        <fixcrlf eol="lf" srcdir="${basedir}/apps"
                  includes="**/*.sh,
                       **/*.properties,
                       **/*.sql,
diff --git a/pom.xml b/pom.xml
index b2d07b749..d5abb0850 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
     <modules>
         <module>core</module>
         <module>thirdparty</module>
-        <module>webapps</module>
+        <module>apps</module>
     </modules>
     <repositories>
      	<repository>