diff --git a/build.properties b/build.properties
index 02076721b..2d0b57083 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-name = struts-action
+name = struts-core
 fullname = Struts Action 2
 version = 2.0-dev
 status = integration
diff --git a/action/pom.xml b/core/pom.xml
similarity index 85%
rename from action/pom.xml
rename to core/pom.xml
index 6891c25a0..dfbab7659 100644
--- a/action/pom.xml
+++ b/core/pom.xml
@@ -8,9 +8,17 @@
         <version>2.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.struts.action2</groupId>
-    <artifactId>action</artifactId>
+    <artifactId>struts-core</artifactId>
     <packaging>jar</packaging>
-    <name>Struts Action Framework 2.0</name>
+    <name>Struts Action 2 - Core</name>
+    
+    <distributionManagement>
+        <site>
+            <id>apache-site</id>
+            <url>scp://people.apache.org/www/struts.apache.org/struts-action2/core</url>
+        </site>
+    </distributionManagement>
+    
     <dependencies>
         <!-- unreferenced dependencies:
              * clover, mockobjects, xdoclet : only needed for build
@@ -25,38 +33,39 @@
         <dependency>
             <groupId>opensymphony</groupId>
             <artifactId>xwork</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.struts.action2</groupId>
-            <artifactId>action-api</artifactId>
+            <version>1.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>freemarker</groupId>
             <artifactId>freemarker</artifactId>
+            <version>2.3.4</version>
         </dependency>
 
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jsp-api</artifactId>
+            <version>2.0</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
+            <version>1.0.4</version>
         </dependency>
 
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
+            <version>2.0</version>
             <optional>true</optional>
         </dependency>
 
@@ -64,6 +73,7 @@
         <dependency>
             <groupId>uk.ltd.getahead</groupId>
             <artifactId>dwr</artifactId>
+            <version>1.1-beta-3</version>
             <optional>true</optional>
         </dependency>
 
@@ -71,12 +81,14 @@
         <dependency>
             <groupId>velocity</groupId>
             <artifactId>velocity</artifactId>
+            <version>1.4</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>velocity-tools</groupId>
             <artifactId>velocity-tools</artifactId>
+            <version>1.1</version>
             <optional>true</optional>
         </dependency>
 
@@ -84,19 +96,7 @@
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>servlets.com</groupId>
-            <artifactId>cos</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>opensymphony</groupId>
-            <artifactId>pell-multipart</artifactId>
-            <!-- webwork's ivy dependency reports mentions v1.19 ? -->
+            <version>1.1</version>
             <optional>true</optional>
         </dependency>
 
@@ -104,6 +104,7 @@
         <dependency>
             <groupId>opensymphony</groupId>
             <artifactId>sitemesh</artifactId>
+            <version>2.2.1</version>
             <optional>true</optional>
         </dependency>
 
@@ -111,12 +112,14 @@
         <dependency>
             <groupId>jetty</groupId>
             <artifactId>org.mortbay.jetty</artifactId>
+            <version>5.1.4</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>eclipse</groupId>
             <artifactId>jdtcore</artifactId>
+            <version>3.1.0</version>
             <optional>true</optional>
         </dependency>
 
@@ -176,13 +179,6 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>2.1.1</version>
-            <optional>true</optional>
-        </dependency>
-
         <!-- used by PrettyPrintWriter (debugging interceptor) and QuickStart -->
         <dependency>
             <groupId>xstream</groupId>
@@ -190,35 +186,17 @@
             <version>1.1.2</version>
         </dependency>
 
-        <!-- Jasper -->
-        <dependency>
-            <groupId>jasperreports</groupId>
-            <artifactId>jasperreports</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- JFree -->
-        <dependency>
-            <groupId>jfree</groupId>
-            <artifactId>jfreechart</artifactId>
-            <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>gnujaxp</groupId>
-                    <artifactId>gnujaxp</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <!-- Tiles -->
         <dependency>
             <groupId>org.apache.struts.tiles</groupId>
             <artifactId>tiles-core</artifactId>
+            <version>0.2-SNAPSHOT</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>commons-digester</groupId>
             <artifactId>commons-digester</artifactId>
+            <version>1.7</version>
             <optional>true</optional>
         </dependency>
 
@@ -226,12 +204,14 @@
         <dependency>
             <groupId>portlet-api</groupId>
             <artifactId>portlet-api</artifactId>
+            <version>1.0</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto</artifactId>
+            <version>1.0.1-rc4</version>
             <optional>true</optional>
         </dependency>
 
@@ -239,6 +219,7 @@
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-container-default</artifactId>
+            <version>1.0-alpha-10-SNAPSHOT</version>
             <optional>true</optional>
         </dependency>
 
@@ -246,30 +227,35 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
+            <version>1.2.6</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
+            <version>1.2.6</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
+            <version>1.2.6</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
+            <version>1.2.6</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
+            <version>1.2.6</version>
             <scope>test</scope>
         </dependency>
 
@@ -278,6 +264,7 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>compile</scope>
+            <version>3.8.1</version>
             <!-- has to be compile for WebWorkTestCase, which is part of the base package so others can write unit tests -->
             <optional>true</optional>
         </dependency>
@@ -285,58 +272,68 @@
         <dependency>
             <groupId>jmock</groupId>
             <artifactId>jmock</artifactId>
+            <version>1.0.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>easymock</groupId>
             <artifactId>easymock</artifactId>
+            <version>2.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>easymock</groupId>
             <artifactId>easymockclassextension</artifactId>
+            <version>1.1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>jmock</groupId>
             <artifactId>jmock-cglib</artifactId>
+            <version>1.0.1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-core</artifactId>
+            <version>0.09</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-jdk1.3</artifactId>
+            <version>0.09</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-alt-jdk1.3</artifactId>
+            <version>0.09</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-alt-jdk1.3-j2ee1.3</artifactId>
+            <version>0.09</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-jdk1.3-j2ee1.3</artifactId>
+            <version>0.09</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
+            <version>1.2.9</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/action/src/main/etc/README.txt b/core/src/main/etc/README.txt
similarity index 100%
rename from action/src/main/etc/README.txt
rename to core/src/main/etc/README.txt
diff --git a/action/src/main/etc/taglib-settings.xml b/core/src/main/etc/taglib-settings.xml
similarity index 100%
rename from action/src/main/etc/taglib-settings.xml
rename to core/src/main/etc/taglib-settings.xml
diff --git a/action/src/main/java/org/apache/struts/action2/Main.java b/core/src/main/java/org/apache/struts/action2/Main.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/Main.java
rename to core/src/main/java/org/apache/struts/action2/Main.java
diff --git a/action/src/main/java/org/apache/struts/action2/RequestUtils.java b/core/src/main/java/org/apache/struts/action2/RequestUtils.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/RequestUtils.java
rename to core/src/main/java/org/apache/struts/action2/RequestUtils.java
diff --git a/action/src/main/java/org/apache/struts/action2/ServletActionContext.java b/core/src/main/java/org/apache/struts/action2/ServletActionContext.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/ServletActionContext.java
rename to core/src/main/java/org/apache/struts/action2/ServletActionContext.java
diff --git a/action/src/main/java/org/apache/struts/action2/StrutsConstants.java b/core/src/main/java/org/apache/struts/action2/StrutsConstants.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/StrutsConstants.java
rename to core/src/main/java/org/apache/struts/action2/StrutsConstants.java
diff --git a/action/src/main/java/org/apache/struts/action2/StrutsStatics.java b/core/src/main/java/org/apache/struts/action2/StrutsStatics.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/StrutsStatics.java
rename to core/src/main/java/org/apache/struts/action2/StrutsStatics.java
diff --git a/action/src/main/java/org/apache/struts/action2/StrutsTestCase.java b/core/src/main/java/org/apache/struts/action2/StrutsTestCase.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/StrutsTestCase.java
rename to core/src/main/java/org/apache/struts/action2/StrutsTestCase.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/AbstractRichtexteditorConnector.java b/core/src/main/java/org/apache/struts/action2/components/AbstractRichtexteditorConnector.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/AbstractRichtexteditorConnector.java
rename to core/src/main/java/org/apache/struts/action2/components/AbstractRichtexteditorConnector.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/ActionComponent.java b/core/src/main/java/org/apache/struts/action2/components/ActionComponent.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/ActionComponent.java
rename to core/src/main/java/org/apache/struts/action2/components/ActionComponent.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/ActionError.java b/core/src/main/java/org/apache/struts/action2/components/ActionError.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/ActionError.java
rename to core/src/main/java/org/apache/struts/action2/components/ActionError.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/ActionMessage.java b/core/src/main/java/org/apache/struts/action2/components/ActionMessage.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/ActionMessage.java
rename to core/src/main/java/org/apache/struts/action2/components/ActionMessage.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Anchor.java b/core/src/main/java/org/apache/struts/action2/components/Anchor.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Anchor.java
rename to core/src/main/java/org/apache/struts/action2/components/Anchor.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/AppendIterator.java b/core/src/main/java/org/apache/struts/action2/components/AppendIterator.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/AppendIterator.java
rename to core/src/main/java/org/apache/struts/action2/components/AppendIterator.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Bean.java b/core/src/main/java/org/apache/struts/action2/components/Bean.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Bean.java
rename to core/src/main/java/org/apache/struts/action2/components/Bean.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Checkbox.java b/core/src/main/java/org/apache/struts/action2/components/Checkbox.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Checkbox.java
rename to core/src/main/java/org/apache/struts/action2/components/Checkbox.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/CheckboxList.java b/core/src/main/java/org/apache/struts/action2/components/CheckboxList.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/CheckboxList.java
rename to core/src/main/java/org/apache/struts/action2/components/CheckboxList.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/ClosingUIBean.java b/core/src/main/java/org/apache/struts/action2/components/ClosingUIBean.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/ClosingUIBean.java
rename to core/src/main/java/org/apache/struts/action2/components/ClosingUIBean.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/ComboBox.java b/core/src/main/java/org/apache/struts/action2/components/ComboBox.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/ComboBox.java
rename to core/src/main/java/org/apache/struts/action2/components/ComboBox.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Component.java b/core/src/main/java/org/apache/struts/action2/components/Component.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Component.java
rename to core/src/main/java/org/apache/struts/action2/components/Component.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Date.java b/core/src/main/java/org/apache/struts/action2/components/Date.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Date.java
rename to core/src/main/java/org/apache/struts/action2/components/Date.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/DatePicker.java b/core/src/main/java/org/apache/struts/action2/components/DatePicker.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/DatePicker.java
rename to core/src/main/java/org/apache/struts/action2/components/DatePicker.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Debug.java b/core/src/main/java/org/apache/struts/action2/components/Debug.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Debug.java
rename to core/src/main/java/org/apache/struts/action2/components/Debug.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java b/core/src/main/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java
rename to core/src/main/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Div.java b/core/src/main/java/org/apache/struts/action2/components/Div.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Div.java
rename to core/src/main/java/org/apache/struts/action2/components/Div.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/DoubleListUIBean.java b/core/src/main/java/org/apache/struts/action2/components/DoubleListUIBean.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/DoubleListUIBean.java
rename to core/src/main/java/org/apache/struts/action2/components/DoubleListUIBean.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/DoubleSelect.java b/core/src/main/java/org/apache/struts/action2/components/DoubleSelect.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/DoubleSelect.java
rename to core/src/main/java/org/apache/struts/action2/components/DoubleSelect.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Else.java b/core/src/main/java/org/apache/struts/action2/components/Else.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Else.java
rename to core/src/main/java/org/apache/struts/action2/components/Else.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/ElseIf.java b/core/src/main/java/org/apache/struts/action2/components/ElseIf.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/ElseIf.java
rename to core/src/main/java/org/apache/struts/action2/components/ElseIf.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/FieldError.java b/core/src/main/java/org/apache/struts/action2/components/FieldError.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/FieldError.java
rename to core/src/main/java/org/apache/struts/action2/components/FieldError.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/File.java b/core/src/main/java/org/apache/struts/action2/components/File.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/File.java
rename to core/src/main/java/org/apache/struts/action2/components/File.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Form.java b/core/src/main/java/org/apache/struts/action2/components/Form.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Form.java
rename to core/src/main/java/org/apache/struts/action2/components/Form.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/FormButton.java b/core/src/main/java/org/apache/struts/action2/components/FormButton.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/FormButton.java
rename to core/src/main/java/org/apache/struts/action2/components/FormButton.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/GenericUIBean.java b/core/src/main/java/org/apache/struts/action2/components/GenericUIBean.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/GenericUIBean.java
rename to core/src/main/java/org/apache/struts/action2/components/GenericUIBean.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Head.java b/core/src/main/java/org/apache/struts/action2/components/Head.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Head.java
rename to core/src/main/java/org/apache/struts/action2/components/Head.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Hidden.java b/core/src/main/java/org/apache/struts/action2/components/Hidden.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Hidden.java
rename to core/src/main/java/org/apache/struts/action2/components/Hidden.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/I18n.java b/core/src/main/java/org/apache/struts/action2/components/I18n.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/I18n.java
rename to core/src/main/java/org/apache/struts/action2/components/I18n.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/If.java b/core/src/main/java/org/apache/struts/action2/components/If.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/If.java
rename to core/src/main/java/org/apache/struts/action2/components/If.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Include.java b/core/src/main/java/org/apache/struts/action2/components/Include.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Include.java
rename to core/src/main/java/org/apache/struts/action2/components/Include.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/IteratorComponent.java b/core/src/main/java/org/apache/struts/action2/components/IteratorComponent.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/IteratorComponent.java
rename to core/src/main/java/org/apache/struts/action2/components/IteratorComponent.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Label.java b/core/src/main/java/org/apache/struts/action2/components/Label.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Label.java
rename to core/src/main/java/org/apache/struts/action2/components/Label.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/ListUIBean.java b/core/src/main/java/org/apache/struts/action2/components/ListUIBean.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/ListUIBean.java
rename to core/src/main/java/org/apache/struts/action2/components/ListUIBean.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/MergeIterator.java b/core/src/main/java/org/apache/struts/action2/components/MergeIterator.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/MergeIterator.java
rename to core/src/main/java/org/apache/struts/action2/components/MergeIterator.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/OptionTransferSelect.java b/core/src/main/java/org/apache/struts/action2/components/OptionTransferSelect.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/OptionTransferSelect.java
rename to core/src/main/java/org/apache/struts/action2/components/OptionTransferSelect.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Panel.java b/core/src/main/java/org/apache/struts/action2/components/Panel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Panel.java
rename to core/src/main/java/org/apache/struts/action2/components/Panel.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Param.java b/core/src/main/java/org/apache/struts/action2/components/Param.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Param.java
rename to core/src/main/java/org/apache/struts/action2/components/Param.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Password.java b/core/src/main/java/org/apache/struts/action2/components/Password.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Password.java
rename to core/src/main/java/org/apache/struts/action2/components/Password.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Property.java b/core/src/main/java/org/apache/struts/action2/components/Property.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Property.java
rename to core/src/main/java/org/apache/struts/action2/components/Property.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Push.java b/core/src/main/java/org/apache/struts/action2/components/Push.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Push.java
rename to core/src/main/java/org/apache/struts/action2/components/Push.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Radio.java b/core/src/main/java/org/apache/struts/action2/components/Radio.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Radio.java
rename to core/src/main/java/org/apache/struts/action2/components/Radio.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/RemoteCallUIBean.java b/core/src/main/java/org/apache/struts/action2/components/RemoteCallUIBean.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/RemoteCallUIBean.java
rename to core/src/main/java/org/apache/struts/action2/components/RemoteCallUIBean.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Reset.java b/core/src/main/java/org/apache/struts/action2/components/Reset.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Reset.java
rename to core/src/main/java/org/apache/struts/action2/components/Reset.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/RichTextEditor.java b/core/src/main/java/org/apache/struts/action2/components/RichTextEditor.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/RichTextEditor.java
rename to core/src/main/java/org/apache/struts/action2/components/RichTextEditor.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Select.java b/core/src/main/java/org/apache/struts/action2/components/Select.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Select.java
rename to core/src/main/java/org/apache/struts/action2/components/Select.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Set.java b/core/src/main/java/org/apache/struts/action2/components/Set.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Set.java
rename to core/src/main/java/org/apache/struts/action2/components/Set.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Submit.java b/core/src/main/java/org/apache/struts/action2/components/Submit.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Submit.java
rename to core/src/main/java/org/apache/struts/action2/components/Submit.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/TabbedPanel.java b/core/src/main/java/org/apache/struts/action2/components/TabbedPanel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/TabbedPanel.java
rename to core/src/main/java/org/apache/struts/action2/components/TabbedPanel.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Text.java b/core/src/main/java/org/apache/struts/action2/components/Text.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Text.java
rename to core/src/main/java/org/apache/struts/action2/components/Text.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/TextArea.java b/core/src/main/java/org/apache/struts/action2/components/TextArea.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/TextArea.java
rename to core/src/main/java/org/apache/struts/action2/components/TextArea.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/TextField.java b/core/src/main/java/org/apache/struts/action2/components/TextField.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/TextField.java
rename to core/src/main/java/org/apache/struts/action2/components/TextField.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Token.java b/core/src/main/java/org/apache/struts/action2/components/Token.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Token.java
rename to core/src/main/java/org/apache/struts/action2/components/Token.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/Tree.java b/core/src/main/java/org/apache/struts/action2/components/Tree.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/Tree.java
rename to core/src/main/java/org/apache/struts/action2/components/Tree.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/TreeNode.java b/core/src/main/java/org/apache/struts/action2/components/TreeNode.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/TreeNode.java
rename to core/src/main/java/org/apache/struts/action2/components/TreeNode.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/UIBean.java b/core/src/main/java/org/apache/struts/action2/components/UIBean.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/UIBean.java
rename to core/src/main/java/org/apache/struts/action2/components/UIBean.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/URL.java b/core/src/main/java/org/apache/struts/action2/components/URL.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/URL.java
rename to core/src/main/java/org/apache/struts/action2/components/URL.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/UpDownSelect.java b/core/src/main/java/org/apache/struts/action2/components/UpDownSelect.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/UpDownSelect.java
rename to core/src/main/java/org/apache/struts/action2/components/UpDownSelect.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/table/AbstractFilterModel.java b/core/src/main/java/org/apache/struts/action2/components/table/AbstractFilterModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/table/AbstractFilterModel.java
rename to core/src/main/java/org/apache/struts/action2/components/table/AbstractFilterModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/table/RenderFilterModel.java b/core/src/main/java/org/apache/struts/action2/components/table/RenderFilterModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/table/RenderFilterModel.java
rename to core/src/main/java/org/apache/struts/action2/components/table/RenderFilterModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/table/SortFilterModel.java b/core/src/main/java/org/apache/struts/action2/components/table/SortFilterModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/table/SortFilterModel.java
rename to core/src/main/java/org/apache/struts/action2/components/table/SortFilterModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/table/SortableTableModel.java b/core/src/main/java/org/apache/struts/action2/components/table/SortableTableModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/table/SortableTableModel.java
rename to core/src/main/java/org/apache/struts/action2/components/table/SortableTableModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/table/WebTable.java b/core/src/main/java/org/apache/struts/action2/components/table/WebTable.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/table/WebTable.java
rename to core/src/main/java/org/apache/struts/action2/components/table/WebTable.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/table/WebTableColumn.java b/core/src/main/java/org/apache/struts/action2/components/table/WebTableColumn.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/table/WebTableColumn.java
rename to core/src/main/java/org/apache/struts/action2/components/table/WebTableColumn.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/table/renderer/AbstractCellRenderer.java b/core/src/main/java/org/apache/struts/action2/components/table/renderer/AbstractCellRenderer.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/table/renderer/AbstractCellRenderer.java
rename to core/src/main/java/org/apache/struts/action2/components/table/renderer/AbstractCellRenderer.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/table/renderer/BooleanCellRenderer.java b/core/src/main/java/org/apache/struts/action2/components/table/renderer/BooleanCellRenderer.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/table/renderer/BooleanCellRenderer.java
rename to core/src/main/java/org/apache/struts/action2/components/table/renderer/BooleanCellRenderer.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/table/renderer/CellRenderer.java b/core/src/main/java/org/apache/struts/action2/components/table/renderer/CellRenderer.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/table/renderer/CellRenderer.java
rename to core/src/main/java/org/apache/struts/action2/components/table/renderer/CellRenderer.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/table/renderer/DateCellRenderer.java b/core/src/main/java/org/apache/struts/action2/components/table/renderer/DateCellRenderer.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/table/renderer/DateCellRenderer.java
rename to core/src/main/java/org/apache/struts/action2/components/table/renderer/DateCellRenderer.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/table/renderer/DefaultCellRenderer.java b/core/src/main/java/org/apache/struts/action2/components/table/renderer/DefaultCellRenderer.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/table/renderer/DefaultCellRenderer.java
rename to core/src/main/java/org/apache/struts/action2/components/table/renderer/DefaultCellRenderer.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/table/renderer/FixedTextCellRenderer.java b/core/src/main/java/org/apache/struts/action2/components/table/renderer/FixedTextCellRenderer.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/table/renderer/FixedTextCellRenderer.java
rename to core/src/main/java/org/apache/struts/action2/components/table/renderer/FixedTextCellRenderer.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/table/renderer/LinkCellRenderer.java b/core/src/main/java/org/apache/struts/action2/components/table/renderer/LinkCellRenderer.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/table/renderer/LinkCellRenderer.java
rename to core/src/main/java/org/apache/struts/action2/components/table/renderer/LinkCellRenderer.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/table/renderer/NumericCellRenderer.java b/core/src/main/java/org/apache/struts/action2/components/table/renderer/NumericCellRenderer.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/table/renderer/NumericCellRenderer.java
rename to core/src/main/java/org/apache/struts/action2/components/table/renderer/NumericCellRenderer.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/table/renderer/package.html b/core/src/main/java/org/apache/struts/action2/components/table/renderer/package.html
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/table/renderer/package.html
rename to core/src/main/java/org/apache/struts/action2/components/table/renderer/package.html
diff --git a/action/src/main/java/org/apache/struts/action2/components/template/BaseTemplateEngine.java b/core/src/main/java/org/apache/struts/action2/components/template/BaseTemplateEngine.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/template/BaseTemplateEngine.java
rename to core/src/main/java/org/apache/struts/action2/components/template/BaseTemplateEngine.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java b/core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java
rename to core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/template/JspTemplateEngine.java b/core/src/main/java/org/apache/struts/action2/components/template/JspTemplateEngine.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/template/JspTemplateEngine.java
rename to core/src/main/java/org/apache/struts/action2/components/template/JspTemplateEngine.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/template/Template.java b/core/src/main/java/org/apache/struts/action2/components/template/Template.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/template/Template.java
rename to core/src/main/java/org/apache/struts/action2/components/template/Template.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/template/TemplateEngine.java b/core/src/main/java/org/apache/struts/action2/components/template/TemplateEngine.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/template/TemplateEngine.java
rename to core/src/main/java/org/apache/struts/action2/components/template/TemplateEngine.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/template/TemplateEngineManager.java b/core/src/main/java/org/apache/struts/action2/components/template/TemplateEngineManager.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/template/TemplateEngineManager.java
rename to core/src/main/java/org/apache/struts/action2/components/template/TemplateEngineManager.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/template/TemplateRenderingContext.java b/core/src/main/java/org/apache/struts/action2/components/template/TemplateRenderingContext.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/template/TemplateRenderingContext.java
rename to core/src/main/java/org/apache/struts/action2/components/template/TemplateRenderingContext.java
diff --git a/action/src/main/java/org/apache/struts/action2/components/template/VelocityTemplateEngine.java b/core/src/main/java/org/apache/struts/action2/components/template/VelocityTemplateEngine.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/components/template/VelocityTemplateEngine.java
rename to core/src/main/java/org/apache/struts/action2/components/template/VelocityTemplateEngine.java
diff --git a/action/src/main/java/org/apache/struts/action2/config/Configuration.java b/core/src/main/java/org/apache/struts/action2/config/Configuration.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/config/Configuration.java
rename to core/src/main/java/org/apache/struts/action2/config/Configuration.java
diff --git a/action/src/main/java/org/apache/struts/action2/config/DefaultConfiguration.java b/core/src/main/java/org/apache/struts/action2/config/DefaultConfiguration.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/config/DefaultConfiguration.java
rename to core/src/main/java/org/apache/struts/action2/config/DefaultConfiguration.java
diff --git a/action/src/main/java/org/apache/struts/action2/config/DelegatingConfiguration.java b/core/src/main/java/org/apache/struts/action2/config/DelegatingConfiguration.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/config/DelegatingConfiguration.java
rename to core/src/main/java/org/apache/struts/action2/config/DelegatingConfiguration.java
diff --git a/action/src/main/java/org/apache/struts/action2/config/PropertiesConfiguration.java b/core/src/main/java/org/apache/struts/action2/config/PropertiesConfiguration.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/config/PropertiesConfiguration.java
rename to core/src/main/java/org/apache/struts/action2/config/PropertiesConfiguration.java
diff --git a/action/src/main/java/org/apache/struts/action2/config/ServletContextSingleton.java b/core/src/main/java/org/apache/struts/action2/config/ServletContextSingleton.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/config/ServletContextSingleton.java
rename to core/src/main/java/org/apache/struts/action2/config/ServletContextSingleton.java
diff --git a/action/src/main/java/org/apache/struts/action2/config/package.html b/core/src/main/java/org/apache/struts/action2/config/package.html
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/config/package.html
rename to core/src/main/java/org/apache/struts/action2/config/package.html
diff --git a/action/src/main/java/org/apache/struts/action2/config_browser/ActionNamesAction.java b/core/src/main/java/org/apache/struts/action2/config_browser/ActionNamesAction.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/config_browser/ActionNamesAction.java
rename to core/src/main/java/org/apache/struts/action2/config_browser/ActionNamesAction.java
diff --git a/action/src/main/java/org/apache/struts/action2/config_browser/ConfigurationHelper.java b/core/src/main/java/org/apache/struts/action2/config_browser/ConfigurationHelper.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/config_browser/ConfigurationHelper.java
rename to core/src/main/java/org/apache/struts/action2/config_browser/ConfigurationHelper.java
diff --git a/action/src/main/java/org/apache/struts/action2/config_browser/ListValidatorsAction.java b/core/src/main/java/org/apache/struts/action2/config_browser/ListValidatorsAction.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/config_browser/ListValidatorsAction.java
rename to core/src/main/java/org/apache/struts/action2/config_browser/ListValidatorsAction.java
diff --git a/action/src/main/java/org/apache/struts/action2/config_browser/ShowConfigAction.java b/core/src/main/java/org/apache/struts/action2/config_browser/ShowConfigAction.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/config_browser/ShowConfigAction.java
rename to core/src/main/java/org/apache/struts/action2/config_browser/ShowConfigAction.java
diff --git a/action/src/main/java/org/apache/struts/action2/config_browser/ShowValidatorAction.java b/core/src/main/java/org/apache/struts/action2/config_browser/ShowValidatorAction.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/config_browser/ShowValidatorAction.java
rename to core/src/main/java/org/apache/struts/action2/config_browser/ShowValidatorAction.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/ActionContextCleanUp.java b/core/src/main/java/org/apache/struts/action2/dispatcher/ActionContextCleanUp.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/ActionContextCleanUp.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/ActionContextCleanUp.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/ApplicationMap.java b/core/src/main/java/org/apache/struts/action2/dispatcher/ApplicationMap.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/ApplicationMap.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/ApplicationMap.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/DefaultActionSupport.java b/core/src/main/java/org/apache/struts/action2/dispatcher/DefaultActionSupport.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/DefaultActionSupport.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/DefaultActionSupport.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java b/core/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java b/core/src/main/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/FilterDispatcherCompatWeblogic61.java b/core/src/main/java/org/apache/struts/action2/dispatcher/FilterDispatcherCompatWeblogic61.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/FilterDispatcherCompatWeblogic61.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/FilterDispatcherCompatWeblogic61.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/HttpHeaderResult.java b/core/src/main/java/org/apache/struts/action2/dispatcher/HttpHeaderResult.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/HttpHeaderResult.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/HttpHeaderResult.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/PlainTextResult.java b/core/src/main/java/org/apache/struts/action2/dispatcher/PlainTextResult.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/PlainTextResult.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/PlainTextResult.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/RequestMap.java b/core/src/main/java/org/apache/struts/action2/dispatcher/RequestMap.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/RequestMap.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/RequestMap.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/ServletActionRedirectResult.java b/core/src/main/java/org/apache/struts/action2/dispatcher/ServletActionRedirectResult.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/ServletActionRedirectResult.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/ServletActionRedirectResult.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/ServletDispatcher.java b/core/src/main/java/org/apache/struts/action2/dispatcher/ServletDispatcher.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/ServletDispatcher.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/ServletDispatcher.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/ServletDispatcherResult.java b/core/src/main/java/org/apache/struts/action2/dispatcher/ServletDispatcherResult.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/ServletDispatcherResult.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/ServletDispatcherResult.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/ServletRedirectResult.java b/core/src/main/java/org/apache/struts/action2/dispatcher/ServletRedirectResult.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/ServletRedirectResult.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/ServletRedirectResult.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/SessionMap.java b/core/src/main/java/org/apache/struts/action2/dispatcher/SessionMap.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/SessionMap.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/SessionMap.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/StreamResult.java b/core/src/main/java/org/apache/struts/action2/dispatcher/StreamResult.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/StreamResult.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/StreamResult.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/StrutsRequestWrapper.java b/core/src/main/java/org/apache/struts/action2/dispatcher/StrutsRequestWrapper.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/StrutsRequestWrapper.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/StrutsRequestWrapper.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/StrutsResultSupport.java b/core/src/main/java/org/apache/struts/action2/dispatcher/StrutsResultSupport.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/StrutsResultSupport.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/StrutsResultSupport.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/VelocityResult.java b/core/src/main/java/org/apache/struts/action2/dispatcher/VelocityResult.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/VelocityResult.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/VelocityResult.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/mapper/ActionMapper.java b/core/src/main/java/org/apache/struts/action2/dispatcher/mapper/ActionMapper.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/mapper/ActionMapper.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/mapper/ActionMapper.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/mapper/ActionMapperFactory.java b/core/src/main/java/org/apache/struts/action2/dispatcher/mapper/ActionMapperFactory.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/mapper/ActionMapperFactory.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/mapper/ActionMapperFactory.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/mapper/ActionMapping.java b/core/src/main/java/org/apache/struts/action2/dispatcher/mapper/ActionMapping.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/mapper/ActionMapping.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/mapper/ActionMapping.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java b/core/src/main/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapper.java b/core/src/main/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapper.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapper.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapper.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java b/core/src/main/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequest.java b/core/src/main/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequest.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequest.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequest.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequestWrapper.java b/core/src/main/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequestWrapper.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequestWrapper.java
rename to core/src/main/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequestWrapper.java
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/multipart/package.html b/core/src/main/java/org/apache/struts/action2/dispatcher/multipart/package.html
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/multipart/package.html
rename to core/src/main/java/org/apache/struts/action2/dispatcher/multipart/package.html
diff --git a/action/src/main/java/org/apache/struts/action2/dispatcher/package.html b/core/src/main/java/org/apache/struts/action2/dispatcher/package.html
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/dispatcher/package.html
rename to core/src/main/java/org/apache/struts/action2/dispatcher/package.html
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/ApplicationAware.java b/core/src/main/java/org/apache/struts/action2/interceptor/ApplicationAware.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/ApplicationAware.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/ApplicationAware.java
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/BackgroundProcess.java b/core/src/main/java/org/apache/struts/action2/interceptor/BackgroundProcess.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/BackgroundProcess.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/BackgroundProcess.java
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/CreateSessionInterceptor.java b/core/src/main/java/org/apache/struts/action2/interceptor/CreateSessionInterceptor.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/CreateSessionInterceptor.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/CreateSessionInterceptor.java
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java b/core/src/main/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/FileUploadInterceptor.java b/core/src/main/java/org/apache/struts/action2/interceptor/FileUploadInterceptor.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/FileUploadInterceptor.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/FileUploadInterceptor.java
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/NoParameters.java b/core/src/main/java/org/apache/struts/action2/interceptor/NoParameters.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/NoParameters.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/NoParameters.java
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/ParameterAware.java b/core/src/main/java/org/apache/struts/action2/interceptor/ParameterAware.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/ParameterAware.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/ParameterAware.java
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/PrincipalAware.java b/core/src/main/java/org/apache/struts/action2/interceptor/PrincipalAware.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/PrincipalAware.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/PrincipalAware.java
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/PrincipalProxy.java b/core/src/main/java/org/apache/struts/action2/interceptor/PrincipalProxy.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/PrincipalProxy.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/PrincipalProxy.java
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/ScopeInterceptor.java b/core/src/main/java/org/apache/struts/action2/interceptor/ScopeInterceptor.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/ScopeInterceptor.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/ScopeInterceptor.java
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java b/core/src/main/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/ServletRequestAware.java b/core/src/main/java/org/apache/struts/action2/interceptor/ServletRequestAware.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/ServletRequestAware.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/ServletRequestAware.java
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/ServletResponseAware.java b/core/src/main/java/org/apache/struts/action2/interceptor/ServletResponseAware.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/ServletResponseAware.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/ServletResponseAware.java
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/SessionAware.java b/core/src/main/java/org/apache/struts/action2/interceptor/SessionAware.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/SessionAware.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/SessionAware.java
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptor.java b/core/src/main/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptor.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptor.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptor.java
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/TokenInterceptor.java b/core/src/main/java/org/apache/struts/action2/interceptor/TokenInterceptor.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/TokenInterceptor.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/TokenInterceptor.java
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptor.java b/core/src/main/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptor.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptor.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptor.java
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/debugging/DebuggingInterceptor.java b/core/src/main/java/org/apache/struts/action2/interceptor/debugging/DebuggingInterceptor.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/debugging/DebuggingInterceptor.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/debugging/DebuggingInterceptor.java
diff --git a/action/src/main/java/org/apache/struts/action2/interceptor/debugging/PrettyPrintWriter.java b/core/src/main/java/org/apache/struts/action2/interceptor/debugging/PrettyPrintWriter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/interceptor/debugging/PrettyPrintWriter.java
rename to core/src/main/java/org/apache/struts/action2/interceptor/debugging/PrettyPrintWriter.java
diff --git a/action/src/main/java/org/apache/struts/action2/lifecycle/ApplicationLifecycleListener.java b/core/src/main/java/org/apache/struts/action2/lifecycle/ApplicationLifecycleListener.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/lifecycle/ApplicationLifecycleListener.java
rename to core/src/main/java/org/apache/struts/action2/lifecycle/ApplicationLifecycleListener.java
diff --git a/action/src/main/java/org/apache/struts/action2/lifecycle/LifecycleListener.java b/core/src/main/java/org/apache/struts/action2/lifecycle/LifecycleListener.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/lifecycle/LifecycleListener.java
rename to core/src/main/java/org/apache/struts/action2/lifecycle/LifecycleListener.java
diff --git a/action/src/main/java/org/apache/struts/action2/lifecycle/SessionLifecycleListener.java b/core/src/main/java/org/apache/struts/action2/lifecycle/SessionLifecycleListener.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/lifecycle/SessionLifecycleListener.java
rename to core/src/main/java/org/apache/struts/action2/lifecycle/SessionLifecycleListener.java
diff --git a/action/src/main/java/org/apache/struts/action2/lifecycle/SessionLifecycleListenerCompatWeblogic61.java b/core/src/main/java/org/apache/struts/action2/lifecycle/SessionLifecycleListenerCompatWeblogic61.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/lifecycle/SessionLifecycleListenerCompatWeblogic61.java
rename to core/src/main/java/org/apache/struts/action2/lifecycle/SessionLifecycleListenerCompatWeblogic61.java
diff --git a/action/src/main/java/org/apache/struts/action2/plexus/PlexusFilter.java b/core/src/main/java/org/apache/struts/action2/plexus/PlexusFilter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/plexus/PlexusFilter.java
rename to core/src/main/java/org/apache/struts/action2/plexus/PlexusFilter.java
diff --git a/action/src/main/java/org/apache/struts/action2/plexus/PlexusLifecycleListener.java b/core/src/main/java/org/apache/struts/action2/plexus/PlexusLifecycleListener.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/plexus/PlexusLifecycleListener.java
rename to core/src/main/java/org/apache/struts/action2/plexus/PlexusLifecycleListener.java
diff --git a/action/src/main/java/org/apache/struts/action2/plexus/PlexusObjectFactory.java b/core/src/main/java/org/apache/struts/action2/plexus/PlexusObjectFactory.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/plexus/PlexusObjectFactory.java
rename to core/src/main/java/org/apache/struts/action2/plexus/PlexusObjectFactory.java
diff --git a/action/src/main/java/org/apache/struts/action2/plexus/PlexusThreadLocal.java b/core/src/main/java/org/apache/struts/action2/plexus/PlexusThreadLocal.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/plexus/PlexusThreadLocal.java
rename to core/src/main/java/org/apache/struts/action2/plexus/PlexusThreadLocal.java
diff --git a/action/src/main/java/org/apache/struts/action2/plexus/PlexusUtils.java b/core/src/main/java/org/apache/struts/action2/plexus/PlexusUtils.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/plexus/PlexusUtils.java
rename to core/src/main/java/org/apache/struts/action2/plexus/PlexusUtils.java
diff --git a/action/src/main/java/org/apache/struts/action2/portlet/PortletActionConstants.java b/core/src/main/java/org/apache/struts/action2/portlet/PortletActionConstants.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/portlet/PortletActionConstants.java
rename to core/src/main/java/org/apache/struts/action2/portlet/PortletActionConstants.java
diff --git a/action/src/main/java/org/apache/struts/action2/portlet/PortletApplicationMap.java b/core/src/main/java/org/apache/struts/action2/portlet/PortletApplicationMap.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/portlet/PortletApplicationMap.java
rename to core/src/main/java/org/apache/struts/action2/portlet/PortletApplicationMap.java
diff --git a/action/src/main/java/org/apache/struts/action2/portlet/PortletRequestMap.java b/core/src/main/java/org/apache/struts/action2/portlet/PortletRequestMap.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/portlet/PortletRequestMap.java
rename to core/src/main/java/org/apache/struts/action2/portlet/PortletRequestMap.java
diff --git a/action/src/main/java/org/apache/struts/action2/portlet/PortletSessionMap.java b/core/src/main/java/org/apache/struts/action2/portlet/PortletSessionMap.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/portlet/PortletSessionMap.java
rename to core/src/main/java/org/apache/struts/action2/portlet/PortletSessionMap.java
diff --git a/action/src/main/java/org/apache/struts/action2/portlet/context/PortletActionContext.java b/core/src/main/java/org/apache/struts/action2/portlet/context/PortletActionContext.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/portlet/context/PortletActionContext.java
rename to core/src/main/java/org/apache/struts/action2/portlet/context/PortletActionContext.java
diff --git a/action/src/main/java/org/apache/struts/action2/portlet/context/PreparatorServlet.java b/core/src/main/java/org/apache/struts/action2/portlet/context/PreparatorServlet.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/portlet/context/PreparatorServlet.java
rename to core/src/main/java/org/apache/struts/action2/portlet/context/PreparatorServlet.java
diff --git a/action/src/main/java/org/apache/struts/action2/portlet/context/ServletContextHolderListener.java b/core/src/main/java/org/apache/struts/action2/portlet/context/ServletContextHolderListener.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/portlet/context/ServletContextHolderListener.java
rename to core/src/main/java/org/apache/struts/action2/portlet/context/ServletContextHolderListener.java
diff --git a/action/src/main/java/org/apache/struts/action2/portlet/dispatcher/DirectRenderFromEventAction.java b/core/src/main/java/org/apache/struts/action2/portlet/dispatcher/DirectRenderFromEventAction.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/portlet/dispatcher/DirectRenderFromEventAction.java
rename to core/src/main/java/org/apache/struts/action2/portlet/dispatcher/DirectRenderFromEventAction.java
diff --git a/action/src/main/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java b/core/src/main/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java
rename to core/src/main/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java
diff --git a/action/src/main/java/org/apache/struts/action2/portlet/result/PortletResult.java b/core/src/main/java/org/apache/struts/action2/portlet/result/PortletResult.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/portlet/result/PortletResult.java
rename to core/src/main/java/org/apache/struts/action2/portlet/result/PortletResult.java
diff --git a/action/src/main/java/org/apache/struts/action2/portlet/result/PortletVelocityResult.java b/core/src/main/java/org/apache/struts/action2/portlet/result/PortletVelocityResult.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/portlet/result/PortletVelocityResult.java
rename to core/src/main/java/org/apache/struts/action2/portlet/result/PortletVelocityResult.java
diff --git a/action/src/main/java/org/apache/struts/action2/portlet/util/PortletUrlHelper.java b/core/src/main/java/org/apache/struts/action2/portlet/util/PortletUrlHelper.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/portlet/util/PortletUrlHelper.java
rename to core/src/main/java/org/apache/struts/action2/portlet/util/PortletUrlHelper.java
diff --git a/action/src/main/java/org/apache/struts/action2/quickstart/Configuration.java b/core/src/main/java/org/apache/struts/action2/quickstart/Configuration.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/quickstart/Configuration.java
rename to core/src/main/java/org/apache/struts/action2/quickstart/Configuration.java
diff --git a/action/src/main/java/org/apache/struts/action2/quickstart/JettyServer.java b/core/src/main/java/org/apache/struts/action2/quickstart/JettyServer.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/quickstart/JettyServer.java
rename to core/src/main/java/org/apache/struts/action2/quickstart/JettyServer.java
diff --git a/action/src/main/java/org/apache/struts/action2/quickstart/Mapping.java b/core/src/main/java/org/apache/struts/action2/quickstart/Mapping.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/quickstart/Mapping.java
rename to core/src/main/java/org/apache/struts/action2/quickstart/Mapping.java
diff --git a/action/src/main/java/org/apache/struts/action2/quickstart/MultiDirClassLoader.java b/core/src/main/java/org/apache/struts/action2/quickstart/MultiDirClassLoader.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/quickstart/MultiDirClassLoader.java
rename to core/src/main/java/org/apache/struts/action2/quickstart/MultiDirClassLoader.java
diff --git a/action/src/main/java/org/apache/struts/action2/quickstart/MultiDirResource.java b/core/src/main/java/org/apache/struts/action2/quickstart/MultiDirResource.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/quickstart/MultiDirResource.java
rename to core/src/main/java/org/apache/struts/action2/quickstart/MultiDirResource.java
diff --git a/action/src/main/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java b/core/src/main/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java
rename to core/src/main/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java
diff --git a/action/src/main/java/org/apache/struts/action2/quickstart/QuickStart.java b/core/src/main/java/org/apache/struts/action2/quickstart/QuickStart.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/quickstart/QuickStart.java
rename to core/src/main/java/org/apache/struts/action2/quickstart/QuickStart.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitegraph/SiteGraph.java b/core/src/main/java/org/apache/struts/action2/sitegraph/SiteGraph.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitegraph/SiteGraph.java
rename to core/src/main/java/org/apache/struts/action2/sitegraph/SiteGraph.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitegraph/XWorkConfigRetriever.java b/core/src/main/java/org/apache/struts/action2/sitegraph/XWorkConfigRetriever.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitegraph/XWorkConfigRetriever.java
rename to core/src/main/java/org/apache/struts/action2/sitegraph/XWorkConfigRetriever.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java b/core/src/main/java/org/apache/struts/action2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java
rename to core/src/main/java/org/apache/struts/action2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitegraph/entities/FileBasedView.java b/core/src/main/java/org/apache/struts/action2/sitegraph/entities/FileBasedView.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitegraph/entities/FileBasedView.java
rename to core/src/main/java/org/apache/struts/action2/sitegraph/entities/FileBasedView.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitegraph/entities/FreeMarkerView.java b/core/src/main/java/org/apache/struts/action2/sitegraph/entities/FreeMarkerView.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitegraph/entities/FreeMarkerView.java
rename to core/src/main/java/org/apache/struts/action2/sitegraph/entities/FreeMarkerView.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitegraph/entities/JspView.java b/core/src/main/java/org/apache/struts/action2/sitegraph/entities/JspView.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitegraph/entities/JspView.java
rename to core/src/main/java/org/apache/struts/action2/sitegraph/entities/JspView.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitegraph/entities/Target.java b/core/src/main/java/org/apache/struts/action2/sitegraph/entities/Target.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitegraph/entities/Target.java
rename to core/src/main/java/org/apache/struts/action2/sitegraph/entities/Target.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitegraph/entities/VelocityView.java b/core/src/main/java/org/apache/struts/action2/sitegraph/entities/VelocityView.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitegraph/entities/VelocityView.java
rename to core/src/main/java/org/apache/struts/action2/sitegraph/entities/VelocityView.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitegraph/entities/View.java b/core/src/main/java/org/apache/struts/action2/sitegraph/entities/View.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitegraph/entities/View.java
rename to core/src/main/java/org/apache/struts/action2/sitegraph/entities/View.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitegraph/model/ActionNode.java b/core/src/main/java/org/apache/struts/action2/sitegraph/model/ActionNode.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitegraph/model/ActionNode.java
rename to core/src/main/java/org/apache/struts/action2/sitegraph/model/ActionNode.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitegraph/model/Graph.java b/core/src/main/java/org/apache/struts/action2/sitegraph/model/Graph.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitegraph/model/Graph.java
rename to core/src/main/java/org/apache/struts/action2/sitegraph/model/Graph.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitegraph/model/IndentWriter.java b/core/src/main/java/org/apache/struts/action2/sitegraph/model/IndentWriter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitegraph/model/IndentWriter.java
rename to core/src/main/java/org/apache/struts/action2/sitegraph/model/IndentWriter.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitegraph/model/Link.java b/core/src/main/java/org/apache/struts/action2/sitegraph/model/Link.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitegraph/model/Link.java
rename to core/src/main/java/org/apache/struts/action2/sitegraph/model/Link.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitegraph/model/Render.java b/core/src/main/java/org/apache/struts/action2/sitegraph/model/Render.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitegraph/model/Render.java
rename to core/src/main/java/org/apache/struts/action2/sitegraph/model/Render.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitegraph/model/SiteGraphNode.java b/core/src/main/java/org/apache/struts/action2/sitegraph/model/SiteGraphNode.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitegraph/model/SiteGraphNode.java
rename to core/src/main/java/org/apache/struts/action2/sitegraph/model/SiteGraphNode.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitegraph/model/SubGraph.java b/core/src/main/java/org/apache/struts/action2/sitegraph/model/SubGraph.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitegraph/model/SubGraph.java
rename to core/src/main/java/org/apache/struts/action2/sitegraph/model/SubGraph.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitegraph/model/ViewNode.java b/core/src/main/java/org/apache/struts/action2/sitegraph/model/ViewNode.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitegraph/model/ViewNode.java
rename to core/src/main/java/org/apache/struts/action2/sitegraph/model/ViewNode.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitegraph/renderers/DOTRenderer.java b/core/src/main/java/org/apache/struts/action2/sitegraph/renderers/DOTRenderer.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitegraph/renderers/DOTRenderer.java
rename to core/src/main/java/org/apache/struts/action2/sitegraph/renderers/DOTRenderer.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitemesh/FreeMarkerPageFilter.java b/core/src/main/java/org/apache/struts/action2/sitemesh/FreeMarkerPageFilter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitemesh/FreeMarkerPageFilter.java
rename to core/src/main/java/org/apache/struts/action2/sitemesh/FreeMarkerPageFilter.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitemesh/TemplatePageFilter.java b/core/src/main/java/org/apache/struts/action2/sitemesh/TemplatePageFilter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitemesh/TemplatePageFilter.java
rename to core/src/main/java/org/apache/struts/action2/sitemesh/TemplatePageFilter.java
diff --git a/action/src/main/java/org/apache/struts/action2/sitemesh/VelocityPageFilter.java b/core/src/main/java/org/apache/struts/action2/sitemesh/VelocityPageFilter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/sitemesh/VelocityPageFilter.java
rename to core/src/main/java/org/apache/struts/action2/sitemesh/VelocityPageFilter.java
diff --git a/action/src/main/java/org/apache/struts/action2/spring/StrutsSpringObjectFactory.java b/core/src/main/java/org/apache/struts/action2/spring/StrutsSpringObjectFactory.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/spring/StrutsSpringObjectFactory.java
rename to core/src/main/java/org/apache/struts/action2/spring/StrutsSpringObjectFactory.java
diff --git a/action/src/main/java/org/apache/struts/action2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java b/core/src/main/java/org/apache/struts/action2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java
rename to core/src/main/java/org/apache/struts/action2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/AppendIteratorFilter.java b/core/src/main/java/org/apache/struts/action2/util/AppendIteratorFilter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/AppendIteratorFilter.java
rename to core/src/main/java/org/apache/struts/action2/util/AppendIteratorFilter.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/AttributeMap.java b/core/src/main/java/org/apache/struts/action2/util/AttributeMap.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/AttributeMap.java
rename to core/src/main/java/org/apache/struts/action2/util/AttributeMap.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/ClassLoaderUtils.java b/core/src/main/java/org/apache/struts/action2/util/ClassLoaderUtils.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/ClassLoaderUtils.java
rename to core/src/main/java/org/apache/struts/action2/util/ClassLoaderUtils.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/ContainUtil.java b/core/src/main/java/org/apache/struts/action2/util/ContainUtil.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/ContainUtil.java
rename to core/src/main/java/org/apache/struts/action2/util/ContainUtil.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/Counter.java b/core/src/main/java/org/apache/struts/action2/util/Counter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/Counter.java
rename to core/src/main/java/org/apache/struts/action2/util/Counter.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/DateFormatter.java b/core/src/main/java/org/apache/struts/action2/util/DateFormatter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/DateFormatter.java
rename to core/src/main/java/org/apache/struts/action2/util/DateFormatter.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/FastByteArrayOutputStream.java b/core/src/main/java/org/apache/struts/action2/util/FastByteArrayOutputStream.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/FastByteArrayOutputStream.java
rename to core/src/main/java/org/apache/struts/action2/util/FastByteArrayOutputStream.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/InvocationSessionStore.java b/core/src/main/java/org/apache/struts/action2/util/InvocationSessionStore.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/InvocationSessionStore.java
rename to core/src/main/java/org/apache/struts/action2/util/InvocationSessionStore.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/IteratorFilterSupport.java b/core/src/main/java/org/apache/struts/action2/util/IteratorFilterSupport.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/IteratorFilterSupport.java
rename to core/src/main/java/org/apache/struts/action2/util/IteratorFilterSupport.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/IteratorGenerator.java b/core/src/main/java/org/apache/struts/action2/util/IteratorGenerator.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/IteratorGenerator.java
rename to core/src/main/java/org/apache/struts/action2/util/IteratorGenerator.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/ListEntry.java b/core/src/main/java/org/apache/struts/action2/util/ListEntry.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/ListEntry.java
rename to core/src/main/java/org/apache/struts/action2/util/ListEntry.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/MakeIterator.java b/core/src/main/java/org/apache/struts/action2/util/MakeIterator.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/MakeIterator.java
rename to core/src/main/java/org/apache/struts/action2/util/MakeIterator.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/MergeIteratorFilter.java b/core/src/main/java/org/apache/struts/action2/util/MergeIteratorFilter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/MergeIteratorFilter.java
rename to core/src/main/java/org/apache/struts/action2/util/MergeIteratorFilter.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/ObjectFactoryDestroyable.java b/core/src/main/java/org/apache/struts/action2/util/ObjectFactoryDestroyable.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/ObjectFactoryDestroyable.java
rename to core/src/main/java/org/apache/struts/action2/util/ObjectFactoryDestroyable.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/ObjectFactoryInitializable.java b/core/src/main/java/org/apache/struts/action2/util/ObjectFactoryInitializable.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/ObjectFactoryInitializable.java
rename to core/src/main/java/org/apache/struts/action2/util/ObjectFactoryInitializable.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/ObjectFactoryLifecycle.java b/core/src/main/java/org/apache/struts/action2/util/ObjectFactoryLifecycle.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/ObjectFactoryLifecycle.java
rename to core/src/main/java/org/apache/struts/action2/util/ObjectFactoryLifecycle.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/PrefixTrie.java b/core/src/main/java/org/apache/struts/action2/util/PrefixTrie.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/PrefixTrie.java
rename to core/src/main/java/org/apache/struts/action2/util/PrefixTrie.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/ResolverSetupServletContextListener.java b/core/src/main/java/org/apache/struts/action2/util/ResolverSetupServletContextListener.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/ResolverSetupServletContextListener.java
rename to core/src/main/java/org/apache/struts/action2/util/ResolverSetupServletContextListener.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/ServletContextAware.java b/core/src/main/java/org/apache/struts/action2/util/ServletContextAware.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/ServletContextAware.java
rename to core/src/main/java/org/apache/struts/action2/util/ServletContextAware.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/SortIteratorFilter.java b/core/src/main/java/org/apache/struts/action2/util/SortIteratorFilter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/SortIteratorFilter.java
rename to core/src/main/java/org/apache/struts/action2/util/SortIteratorFilter.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/Sorter.java b/core/src/main/java/org/apache/struts/action2/util/Sorter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/Sorter.java
rename to core/src/main/java/org/apache/struts/action2/util/Sorter.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/StrutsTypeConverter.java b/core/src/main/java/org/apache/struts/action2/util/StrutsTypeConverter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/StrutsTypeConverter.java
rename to core/src/main/java/org/apache/struts/action2/util/StrutsTypeConverter.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/StrutsUtil.java b/core/src/main/java/org/apache/struts/action2/util/StrutsUtil.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/StrutsUtil.java
rename to core/src/main/java/org/apache/struts/action2/util/StrutsUtil.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/SubsetIteratorFilter.java b/core/src/main/java/org/apache/struts/action2/util/SubsetIteratorFilter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/SubsetIteratorFilter.java
rename to core/src/main/java/org/apache/struts/action2/util/SubsetIteratorFilter.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/TabbedPane.java b/core/src/main/java/org/apache/struts/action2/util/TabbedPane.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/TabbedPane.java
rename to core/src/main/java/org/apache/struts/action2/util/TabbedPane.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/Timer.java b/core/src/main/java/org/apache/struts/action2/util/Timer.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/Timer.java
rename to core/src/main/java/org/apache/struts/action2/util/Timer.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/TokenHelper.java b/core/src/main/java/org/apache/struts/action2/util/TokenHelper.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/TokenHelper.java
rename to core/src/main/java/org/apache/struts/action2/util/TokenHelper.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/URLBean.java b/core/src/main/java/org/apache/struts/action2/util/URLBean.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/URLBean.java
rename to core/src/main/java/org/apache/struts/action2/util/URLBean.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/VelocityStrutsUtil.java b/core/src/main/java/org/apache/struts/action2/util/VelocityStrutsUtil.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/VelocityStrutsUtil.java
rename to core/src/main/java/org/apache/struts/action2/util/VelocityStrutsUtil.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/CompilingClassLoader.java b/core/src/main/java/org/apache/struts/action2/util/classloader/CompilingClassLoader.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/CompilingClassLoader.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/CompilingClassLoader.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/ReloadingClassLoader.java b/core/src/main/java/org/apache/struts/action2/util/classloader/ReloadingClassLoader.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/ReloadingClassLoader.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/ReloadingClassLoader.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/ReloadingClassLoaderListener.java b/core/src/main/java/org/apache/struts/action2/util/classloader/ReloadingClassLoaderListener.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/ReloadingClassLoaderListener.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/ReloadingClassLoaderListener.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/compilers/JavaCompiler.java b/core/src/main/java/org/apache/struts/action2/util/classloader/compilers/JavaCompiler.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/compilers/JavaCompiler.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/compilers/JavaCompiler.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerFactory.java b/core/src/main/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerFactory.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerFactory.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerFactory.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerSettings.java b/core/src/main/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerSettings.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerSettings.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerSettings.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseCompilationProblem.java b/core/src/main/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseCompilationProblem.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseCompilationProblem.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseCompilationProblem.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java b/core/src/main/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java b/core/src/main/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/listeners/CompilingListener.java b/core/src/main/java/org/apache/struts/action2/util/classloader/listeners/CompilingListener.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/listeners/CompilingListener.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/listeners/CompilingListener.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/listeners/ReloadingListener.java b/core/src/main/java/org/apache/struts/action2/util/classloader/listeners/ReloadingListener.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/listeners/ReloadingListener.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/listeners/ReloadingListener.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationListener.java b/core/src/main/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationListener.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationListener.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationListener.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationMonitor.java b/core/src/main/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationMonitor.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationMonitor.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationMonitor.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/problems/CompilationProblem.java b/core/src/main/java/org/apache/struts/action2/util/classloader/problems/CompilationProblem.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/problems/CompilationProblem.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/problems/CompilationProblem.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/problems/CompilationProblemHandler.java b/core/src/main/java/org/apache/struts/action2/util/classloader/problems/CompilationProblemHandler.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/problems/CompilationProblemHandler.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/problems/CompilationProblemHandler.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/problems/ConsoleCompilationProblemHandler.java b/core/src/main/java/org/apache/struts/action2/util/classloader/problems/ConsoleCompilationProblemHandler.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/problems/ConsoleCompilationProblemHandler.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/problems/ConsoleCompilationProblemHandler.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/problems/DefaultCompilationProblemHandler.java b/core/src/main/java/org/apache/struts/action2/util/classloader/problems/DefaultCompilationProblemHandler.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/problems/DefaultCompilationProblemHandler.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/problems/DefaultCompilationProblemHandler.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/problems/LogCompilationProblemHandler.java b/core/src/main/java/org/apache/struts/action2/util/classloader/problems/LogCompilationProblemHandler.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/problems/LogCompilationProblemHandler.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/problems/LogCompilationProblemHandler.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/readers/FileResourceReader.java b/core/src/main/java/org/apache/struts/action2/util/classloader/readers/FileResourceReader.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/readers/FileResourceReader.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/readers/FileResourceReader.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/readers/ResourceReader.java b/core/src/main/java/org/apache/struts/action2/util/classloader/readers/ResourceReader.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/readers/ResourceReader.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/readers/ResourceReader.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/stores/FileResourceStore.java b/core/src/main/java/org/apache/struts/action2/util/classloader/stores/FileResourceStore.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/stores/FileResourceStore.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/stores/FileResourceStore.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/stores/MemoryResourceStore.java b/core/src/main/java/org/apache/struts/action2/util/classloader/stores/MemoryResourceStore.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/stores/MemoryResourceStore.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/stores/MemoryResourceStore.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/stores/ResourceStore.java b/core/src/main/java/org/apache/struts/action2/util/classloader/stores/ResourceStore.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/stores/ResourceStore.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/stores/ResourceStore.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/stores/ResourceStoreClassLoader.java b/core/src/main/java/org/apache/struts/action2/util/classloader/stores/ResourceStoreClassLoader.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/stores/ResourceStoreClassLoader.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/stores/ResourceStoreClassLoader.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/stores/TransactionalResourceStore.java b/core/src/main/java/org/apache/struts/action2/util/classloader/stores/TransactionalResourceStore.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/stores/TransactionalResourceStore.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/stores/TransactionalResourceStore.java
diff --git a/action/src/main/java/org/apache/struts/action2/util/classloader/utils/ThreadUtils.java b/core/src/main/java/org/apache/struts/action2/util/classloader/utils/ThreadUtils.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/util/classloader/utils/ThreadUtils.java
rename to core/src/main/java/org/apache/struts/action2/util/classloader/utils/ThreadUtils.java
diff --git a/action/src/main/java/org/apache/struts/action2/validators/DWRValidator.java b/core/src/main/java/org/apache/struts/action2/validators/DWRValidator.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/validators/DWRValidator.java
rename to core/src/main/java/org/apache/struts/action2/validators/DWRValidator.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/JspSupportServlet.java b/core/src/main/java/org/apache/struts/action2/views/JspSupportServlet.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/JspSupportServlet.java
rename to core/src/main/java/org/apache/struts/action2/views/JspSupportServlet.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerServlet.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerServlet.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerServlet.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerServlet.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/PortletFreemarkerResult.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/PortletFreemarkerResult.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/PortletFreemarkerResult.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/PortletFreemarkerResult.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/ScopesHashModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/ScopesHashModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/ScopesHashModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/ScopesHashModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/StrutsBeanWrapper.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/StrutsBeanWrapper.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/StrutsBeanWrapper.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/StrutsBeanWrapper.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/StrutsClassTemplateLoader.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/StrutsClassTemplateLoader.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/StrutsClassTemplateLoader.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/StrutsClassTemplateLoader.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ActionErrorModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/ActionErrorModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ActionErrorModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/ActionErrorModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ActionMessageModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/ActionMessageModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ActionMessageModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/ActionMessageModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ActionModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/ActionModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ActionModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/ActionModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/AnchorModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/AnchorModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/AnchorModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/AnchorModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/BeanModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/BeanModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/BeanModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/BeanModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/CallbackWriter.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/CallbackWriter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/CallbackWriter.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/CallbackWriter.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/CheckboxListModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/CheckboxListModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/CheckboxListModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/CheckboxListModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/CheckboxModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/CheckboxModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/CheckboxModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/CheckboxModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ComboBoxModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/ComboBoxModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ComboBoxModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/ComboBoxModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ComponentModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/ComponentModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ComponentModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/ComponentModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DateModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/DateModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DateModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/DateModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DatePickerModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/DatePickerModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DatePickerModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/DatePickerModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DebugModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/DebugModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DebugModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/DebugModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DivModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/DivModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DivModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/DivModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DoubleSelectModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/DoubleSelectModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DoubleSelectModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/DoubleSelectModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/FieldErrorModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/FieldErrorModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/FieldErrorModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/FieldErrorModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/FileModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/FileModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/FileModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/FileModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/FormModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/FormModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/FormModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/FormModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/HeadModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/HeadModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/HeadModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/HeadModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/HiddenModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/HiddenModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/HiddenModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/HiddenModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/I18nModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/I18nModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/I18nModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/I18nModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/IncludeModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/IncludeModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/IncludeModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/IncludeModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/IteratorModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/IteratorModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/IteratorModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/IteratorModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/LabelModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/LabelModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/LabelModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/LabelModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/OptionTransferSelectModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/OptionTransferSelectModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/OptionTransferSelectModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/OptionTransferSelectModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/PanelModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/PanelModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/PanelModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/PanelModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ParamModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/ParamModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ParamModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/ParamModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/PasswordModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/PasswordModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/PasswordModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/PasswordModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/PropertyModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/PropertyModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/PropertyModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/PropertyModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/PushModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/PushModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/PushModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/PushModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/RadioModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/RadioModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/RadioModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/RadioModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ResetModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/ResetModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ResetModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/ResetModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/RichTextEditorModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/RichTextEditorModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/RichTextEditorModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/RichTextEditorModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/SelectModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/SelectModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/SelectModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/SelectModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/SetModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/SetModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/SetModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/SetModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/StrutsModels.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/StrutsModels.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/StrutsModels.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/StrutsModels.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/SubmitModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/SubmitModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/SubmitModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/SubmitModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TabbedPanelModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/TabbedPanelModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TabbedPanelModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/TabbedPanelModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TagModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/TagModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TagModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/TagModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TextAreaModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/TextAreaModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TextAreaModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/TextAreaModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TextFieldModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/TextFieldModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TextFieldModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/TextFieldModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TextModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/TextModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TextModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/TextModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TokenModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/TokenModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TokenModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/TokenModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TreeModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/TreeModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TreeModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/TreeModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TreeNodeModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/TreeNodeModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TreeNodeModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/TreeNodeModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/URLModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/URLModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/URLModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/URLModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/UpDownSelectModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/UpDownSelectModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/UpDownSelectModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/UpDownSelectModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/WebTableModel.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/tags/WebTableModel.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/freemarker/tags/WebTableModel.java
rename to core/src/main/java/org/apache/struts/action2/views/freemarker/tags/WebTableModel.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ActionTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ActionTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ActionTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ActionTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/BeanTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/BeanTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/BeanTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/BeanTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ComponentTagSupport.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ComponentTagSupport.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ComponentTagSupport.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ComponentTagSupport.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/DateTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/DateTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/DateTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/DateTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ElseIfTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ElseIfTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ElseIfTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ElseIfTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ElseTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ElseTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ElseTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ElseTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/I18nTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/I18nTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/I18nTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/I18nTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/IfTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/IfTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/IfTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/IfTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/IncludeTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/IncludeTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/IncludeTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/IncludeTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/IteratorStatus.java b/core/src/main/java/org/apache/struts/action2/views/jsp/IteratorStatus.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/IteratorStatus.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/IteratorStatus.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/IteratorTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/IteratorTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/IteratorTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/IteratorTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ParamTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ParamTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ParamTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ParamTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/PropertyTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/PropertyTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/PropertyTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/PropertyTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/PushTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/PushTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/PushTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/PushTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/SetTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/SetTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/SetTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/SetTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/StrutsBodyTagSupport.java b/core/src/main/java/org/apache/struts/action2/views/jsp/StrutsBodyTagSupport.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/StrutsBodyTagSupport.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/StrutsBodyTagSupport.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/TagUtils.java b/core/src/main/java/org/apache/struts/action2/views/jsp/TagUtils.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/TagUtils.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/TagUtils.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/TextTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/TextTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/TextTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/TextTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/URLTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/URLTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/URLTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/URLTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/iterator/AppendIteratorTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/iterator/AppendIteratorTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/iterator/AppendIteratorTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/iterator/AppendIteratorTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/iterator/IteratorGeneratorTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/iterator/IteratorGeneratorTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/iterator/IteratorGeneratorTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/iterator/IteratorGeneratorTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/iterator/MergeIteratorTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/iterator/MergeIteratorTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/iterator/MergeIteratorTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/iterator/MergeIteratorTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/iterator/SortIteratorTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/iterator/SortIteratorTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/iterator/SortIteratorTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/iterator/SortIteratorTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/iterator/SubsetIteratorTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/iterator/SubsetIteratorTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/iterator/SubsetIteratorTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/iterator/SubsetIteratorTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/package.html b/core/src/main/java/org/apache/struts/action2/views/jsp/package.html
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/package.html
rename to core/src/main/java/org/apache/struts/action2/views/jsp/package.html
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractClosingTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractClosingTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractClosingTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractClosingTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractDoubleListTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractDoubleListTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractDoubleListTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractDoubleListTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractListTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractListTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractListTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractListTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractRequiredListTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractRequiredListTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractRequiredListTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractRequiredListTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorResult.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorResult.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorResult.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorResult.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractUITag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractUITag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractUITag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractUITag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/AnchorTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/AnchorTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/AnchorTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/AnchorTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/CheckboxTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/CheckboxTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/CheckboxTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/CheckboxTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/ComponentTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/ComponentTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/ComponentTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/ComponentTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/DatePickerTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/DatePickerTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/DatePickerTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/DatePickerTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/DebugTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/DebugTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/DebugTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/DebugTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/DivTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/DivTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/DivTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/DivTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/FileTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/FileTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/FileTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/FileTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/FormTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/FormTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/FormTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/FormTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/HeadTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/HeadTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/HeadTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/HeadTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/HiddenTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/HiddenTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/HiddenTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/HiddenTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/LabelTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/LabelTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/LabelTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/LabelTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/OgnlTool.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/OgnlTool.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/OgnlTool.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/OgnlTool.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/PanelTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/PanelTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/PanelTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/PanelTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/PasswordTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/PasswordTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/PasswordTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/PasswordTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/RadioTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/RadioTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/RadioTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/RadioTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/ResetTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/ResetTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/ResetTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/ResetTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResult.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResult.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResult.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResult.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResult.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResult.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResult.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResult.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResult.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResult.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResult.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResult.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResult.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResult.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResult.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResult.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/SelectTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/SelectTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/SelectTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/SelectTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/SubmitTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/SubmitTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/SubmitTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/SubmitTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/TabbedPanelTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/TabbedPanelTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/TabbedPanelTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/TabbedPanelTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/TextFieldTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/TextFieldTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/TextFieldTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/TextFieldTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/TextareaTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/TextareaTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/TextareaTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/TextareaTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/TokenTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/TokenTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/TokenTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/TokenTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/TreeNodeTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/TreeNodeTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/TreeNodeTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/TreeNodeTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/TreeTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/TreeTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/TreeTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/TreeTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/jsp/ui/table/WebTableTag.java b/core/src/main/java/org/apache/struts/action2/views/jsp/ui/table/WebTableTag.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/jsp/ui/table/WebTableTag.java
rename to core/src/main/java/org/apache/struts/action2/views/jsp/ui/table/WebTableTag.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/tiles/TilesResult.java b/core/src/main/java/org/apache/struts/action2/views/tiles/TilesResult.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/tiles/TilesResult.java
rename to core/src/main/java/org/apache/struts/action2/views/tiles/TilesResult.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/util/ContextUtil.java b/core/src/main/java/org/apache/struts/action2/views/util/ContextUtil.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/util/ContextUtil.java
rename to core/src/main/java/org/apache/struts/action2/views/util/ContextUtil.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/util/ResourceUtil.java b/core/src/main/java/org/apache/struts/action2/views/util/ResourceUtil.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/util/ResourceUtil.java
rename to core/src/main/java/org/apache/struts/action2/views/util/ResourceUtil.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/util/TextUtil.java b/core/src/main/java/org/apache/struts/action2/views/util/TextUtil.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/util/TextUtil.java
rename to core/src/main/java/org/apache/struts/action2/views/util/TextUtil.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/util/UrlHelper.java b/core/src/main/java/org/apache/struts/action2/views/util/UrlHelper.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/util/UrlHelper.java
rename to core/src/main/java/org/apache/struts/action2/views/util/UrlHelper.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/util/package.html b/core/src/main/java/org/apache/struts/action2/views/util/package.html
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/util/package.html
rename to core/src/main/java/org/apache/struts/action2/views/util/package.html
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/StrutsResourceLoader.java b/core/src/main/java/org/apache/struts/action2/views/velocity/StrutsResourceLoader.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/StrutsResourceLoader.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/StrutsResourceLoader.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/StrutsVelocityContext.java b/core/src/main/java/org/apache/struts/action2/views/velocity/StrutsVelocityContext.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/StrutsVelocityContext.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/StrutsVelocityContext.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/StrutsVelocityServlet.java b/core/src/main/java/org/apache/struts/action2/views/velocity/StrutsVelocityServlet.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/StrutsVelocityServlet.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/StrutsVelocityServlet.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/VelocityManager.java b/core/src/main/java/org/apache/struts/action2/views/velocity/VelocityManager.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/VelocityManager.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/VelocityManager.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/DateDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/DateDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/DateDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/DateDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/DebugDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/DebugDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/DebugDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/DebugDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/DivDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/DivDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/DivDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/DivDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/FileDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/FileDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/FileDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/FileDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/FormDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/FormDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/FormDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/FormDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/OptionTransferSelectDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/OptionTransferSelectDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/OptionTransferSelectDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/OptionTransferSelectDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/PanelDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/PanelDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/PanelDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/PanelDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/ParamDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/ParamDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/ParamDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/ParamDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/PropertyDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/PropertyDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/PropertyDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/PropertyDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/PushDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/PushDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/PushDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/PushDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/ResetDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/ResetDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/ResetDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/ResetDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/SelectDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/SelectDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/SelectDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/SelectDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/SetDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/SetDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/SetDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/SetDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/TabbedPanelDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/TabbedPanelDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/TabbedPanelDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/TabbedPanelDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/TextAreaDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/TextAreaDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/TextAreaDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/TextAreaDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/TextDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/TextDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/TextDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/TextDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/TokenDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/TokenDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/TokenDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/TokenDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/TreeDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/TreeDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/TreeDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/TreeDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/TreeNodeDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/TreeNodeDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/TreeNodeDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/TreeNodeDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/URLDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/URLDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/URLDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/URLDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/components/WebTableDirective.java b/core/src/main/java/org/apache/struts/action2/views/velocity/components/WebTableDirective.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/components/WebTableDirective.java
rename to core/src/main/java/org/apache/struts/action2/views/velocity/components/WebTableDirective.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/velocity/package.html b/core/src/main/java/org/apache/struts/action2/views/velocity/package.html
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/velocity/package.html
rename to core/src/main/java/org/apache/struts/action2/views/velocity/package.html
diff --git a/action/src/main/java/org/apache/struts/action2/views/xslt/AdapterNode.java b/core/src/main/java/org/apache/struts/action2/views/xslt/AdapterNode.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/xslt/AdapterNode.java
rename to core/src/main/java/org/apache/struts/action2/views/xslt/AdapterNode.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/xslt/ArrayAdapter.java b/core/src/main/java/org/apache/struts/action2/views/xslt/ArrayAdapter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/xslt/ArrayAdapter.java
rename to core/src/main/java/org/apache/struts/action2/views/xslt/ArrayAdapter.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/xslt/BeanAdapter.java b/core/src/main/java/org/apache/struts/action2/views/xslt/BeanAdapter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/xslt/BeanAdapter.java
rename to core/src/main/java/org/apache/struts/action2/views/xslt/BeanAdapter.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/xslt/CollectionAdapter.java b/core/src/main/java/org/apache/struts/action2/views/xslt/CollectionAdapter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/xslt/CollectionAdapter.java
rename to core/src/main/java/org/apache/struts/action2/views/xslt/CollectionAdapter.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/xslt/CollectionNodeList.java b/core/src/main/java/org/apache/struts/action2/views/xslt/CollectionNodeList.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/xslt/CollectionNodeList.java
rename to core/src/main/java/org/apache/struts/action2/views/xslt/CollectionNodeList.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/xslt/DOMAdapter.java b/core/src/main/java/org/apache/struts/action2/views/xslt/DOMAdapter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/xslt/DOMAdapter.java
rename to core/src/main/java/org/apache/struts/action2/views/xslt/DOMAdapter.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.java b/core/src/main/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.java
rename to core/src/main/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.java b/core/src/main/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.java
rename to core/src/main/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/xslt/DocumentAdapter.java b/core/src/main/java/org/apache/struts/action2/views/xslt/DocumentAdapter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/xslt/DocumentAdapter.java
rename to core/src/main/java/org/apache/struts/action2/views/xslt/DocumentAdapter.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java b/core/src/main/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java
rename to core/src/main/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java b/core/src/main/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java
rename to core/src/main/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java b/core/src/main/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java
rename to core/src/main/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/xslt/XSLTResult.java b/core/src/main/java/org/apache/struts/action2/views/xslt/XSLTResult.java
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/xslt/XSLTResult.java
rename to core/src/main/java/org/apache/struts/action2/views/xslt/XSLTResult.java
diff --git a/action/src/main/java/org/apache/struts/action2/views/xslt/package.html b/core/src/main/java/org/apache/struts/action2/views/xslt/package.html
similarity index 100%
rename from action/src/main/java/org/apache/struts/action2/views/xslt/package.html
rename to core/src/main/java/org/apache/struts/action2/views/xslt/package.html
diff --git a/action/src/main/resources/META-INF/taglib.tld b/core/src/main/resources/META-INF/taglib.tld
similarity index 100%
rename from action/src/main/resources/META-INF/taglib.tld
rename to core/src/main/resources/META-INF/taglib.tld
diff --git a/action/src/main/resources/config-browser.xml b/core/src/main/resources/config-browser.xml
similarity index 100%
rename from action/src/main/resources/config-browser.xml
rename to core/src/main/resources/config-browser.xml
diff --git a/action/src/main/resources/config-browser/actionNames.ftl b/core/src/main/resources/config-browser/actionNames.ftl
similarity index 100%
rename from action/src/main/resources/config-browser/actionNames.ftl
rename to core/src/main/resources/config-browser/actionNames.ftl
diff --git a/action/src/main/resources/config-browser/config-styles.css b/core/src/main/resources/config-browser/config-styles.css
similarity index 100%
rename from action/src/main/resources/config-browser/config-styles.css
rename to core/src/main/resources/config-browser/config-styles.css
diff --git a/action/src/main/resources/config-browser/error.ftl b/core/src/main/resources/config-browser/error.ftl
similarity index 100%
rename from action/src/main/resources/config-browser/error.ftl
rename to core/src/main/resources/config-browser/error.ftl
diff --git a/action/src/main/resources/config-browser/page-footer.ftl b/core/src/main/resources/config-browser/page-footer.ftl
similarity index 100%
rename from action/src/main/resources/config-browser/page-footer.ftl
rename to core/src/main/resources/config-browser/page-footer.ftl
diff --git a/action/src/main/resources/config-browser/page-header.ftl b/core/src/main/resources/config-browser/page-header.ftl
similarity index 100%
rename from action/src/main/resources/config-browser/page-header.ftl
rename to core/src/main/resources/config-browser/page-header.ftl
diff --git a/action/src/main/resources/config-browser/showConfig.ftl b/core/src/main/resources/config-browser/showConfig.ftl
similarity index 100%
rename from action/src/main/resources/config-browser/showConfig.ftl
rename to core/src/main/resources/config-browser/showConfig.ftl
diff --git a/action/src/main/resources/config-browser/showValidators.ftl b/core/src/main/resources/config-browser/showValidators.ftl
similarity index 100%
rename from action/src/main/resources/config-browser/showValidators.ftl
rename to core/src/main/resources/config-browser/showValidators.ftl
diff --git a/action/src/main/resources/config-browser/simple-error.ftl b/core/src/main/resources/config-browser/simple-error.ftl
similarity index 100%
rename from action/src/main/resources/config-browser/simple-error.ftl
rename to core/src/main/resources/config-browser/simple-error.ftl
diff --git a/action/src/main/resources/config-browser/tigris-macros.ftl b/core/src/main/resources/config-browser/tigris-macros.ftl
similarity index 100%
rename from action/src/main/resources/config-browser/tigris-macros.ftl
rename to core/src/main/resources/config-browser/tigris-macros.ftl
diff --git a/action/src/main/resources/config-browser/validatorDetails.ftl b/core/src/main/resources/config-browser/validatorDetails.ftl
similarity index 100%
rename from action/src/main/resources/config-browser/validatorDetails.ftl
rename to core/src/main/resources/config-browser/validatorDetails.ftl
diff --git a/action/src/main/resources/org/apache/struts/action2/default.properties b/core/src/main/resources/org/apache/struts/action2/default.properties
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/default.properties
rename to core/src/main/resources/org/apache/struts/action2/default.properties
diff --git a/action/src/main/resources/org/apache/struts/action2/dispatcher/error.ftl b/core/src/main/resources/org/apache/struts/action2/dispatcher/error.ftl
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/dispatcher/error.ftl
rename to core/src/main/resources/org/apache/struts/action2/dispatcher/error.ftl
diff --git a/action/src/main/resources/org/apache/struts/action2/interceptor/debugging/console.ftl b/core/src/main/resources/org/apache/struts/action2/interceptor/debugging/console.ftl
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/interceptor/debugging/console.ftl
rename to core/src/main/resources/org/apache/struts/action2/interceptor/debugging/console.ftl
diff --git a/action/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.css b/core/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.css
rename to core/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.css
diff --git a/action/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.html b/core/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.html
rename to core/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.html
diff --git a/action/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.js b/core/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.js
rename to core/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.js
diff --git a/action/src/main/resources/org/apache/struts/action2/interceptor/package.html b/core/src/main/resources/org/apache/struts/action2/interceptor/package.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/interceptor/package.html
rename to core/src/main/resources/org/apache/struts/action2/interceptor/package.html
diff --git a/action/src/main/resources/org/apache/struts/action2/interceptor/wait.ftl b/core/src/main/resources/org/apache/struts/action2/interceptor/wait.ftl
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/interceptor/wait.ftl
rename to core/src/main/resources/org/apache/struts/action2/interceptor/wait.ftl
diff --git a/action/src/main/resources/org/apache/struts/action2/lifecycle/package.html b/core/src/main/resources/org/apache/struts/action2/lifecycle/package.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/lifecycle/package.html
rename to core/src/main/resources/org/apache/struts/action2/lifecycle/package.html
diff --git a/action/src/main/resources/org/apache/struts/action2/package.html b/core/src/main/resources/org/apache/struts/action2/package.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/package.html
rename to core/src/main/resources/org/apache/struts/action2/package.html
diff --git a/action/src/main/resources/org/apache/struts/action2/sitegraph/sitegraph-usage.txt b/core/src/main/resources/org/apache/struts/action2/sitegraph/sitegraph-usage.txt
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/sitegraph/sitegraph-usage.txt
rename to core/src/main/resources/org/apache/struts/action2/sitegraph/sitegraph-usage.txt
diff --git a/action/src/main/resources/org/apache/struts/action2/static/CommonFunctions.js b/core/src/main/resources/org/apache/struts/action2/static/CommonFunctions.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/CommonFunctions.js
rename to core/src/main/resources/org/apache/struts/action2/static/CommonFunctions.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/LICENSE b/core/src/main/resources/org/apache/struts/action2/static/dojo/LICENSE
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/LICENSE
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/LICENSE
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/README b/core/src/main/resources/org/apache/struts/action2/static/dojo/README
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/README
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/README
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/build.txt b/core/src/main/resources/org/apache/struts/action2/static/dojo/build.txt
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/build.txt
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/build.txt
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/dojo.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/dojo.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/dojo.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/dojo.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/dojo.js.uncompressed.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/dojo.js.uncompressed.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/dojo.js.uncompressed.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/dojo.js.uncompressed.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/alg/Alg.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/alg/Alg.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/alg/Alg.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/alg/Alg.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/alg/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/alg/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/alg/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/alg/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/Animation.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/Animation.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/Animation.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/Animation.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/Timer.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/Timer.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/Timer.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/Timer.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/bootstrap1.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/bootstrap1.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/bootstrap1.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/bootstrap1.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/bootstrap2.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/bootstrap2.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/bootstrap2.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/bootstrap2.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/browser_debug.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/browser_debug.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/browser_debug.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/browser_debug.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/ArrayList.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/ArrayList.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/ArrayList.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/ArrayList.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/BinaryTree.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/BinaryTree.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/BinaryTree.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/BinaryTree.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/ByteArray.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/ByteArray.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/ByteArray.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/ByteArray.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Collections.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Collections.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Collections.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Collections.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Dictionary.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Dictionary.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Dictionary.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Dictionary.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Graph.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Graph.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Graph.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Graph.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/List.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/List.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/List.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/List.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Queue.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Queue.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Queue.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Queue.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Set.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Set.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Set.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Set.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/SkipList.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/SkipList.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/SkipList.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/SkipList.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/SortedList.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/SortedList.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/SortedList.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/SortedList.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Stack.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Stack.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Stack.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Stack.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/Blowfish.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/Blowfish.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/Blowfish.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/Blowfish.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/LICENSE b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/LICENSE
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/LICENSE
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/LICENSE
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/MD5.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/MD5.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/MD5.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/MD5.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/Rijndael.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/Rijndael.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/Rijndael.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/Rijndael.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA1.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA1.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA1.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA1.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA256.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA256.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA256.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA256.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/data.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/data.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/data.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/data.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/data/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/data/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/data/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/data/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/date.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/date.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/date.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/date.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/DragAndDrop.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/DragAndDrop.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/DragAndDrop.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/DragAndDrop.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragAndDrop.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragAndDrop.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragAndDrop.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragAndDrop.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragManager.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragManager.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragManager.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragManager.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragMove.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragMove.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragMove.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragMove.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/Sortable.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/Sortable.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/Sortable.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/Sortable.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/TreeDragAndDrop.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/TreeDragAndDrop.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/TreeDragAndDrop.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/TreeDragAndDrop.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/dom.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/dom.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/dom.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/dom.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/event.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/event.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/event.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/event.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/event/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/event/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/event/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/event/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/event/browser.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/event/browser.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/event/browser.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/event/browser.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/event/topic.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/event/topic.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/event/topic.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/event/topic.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/flash.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/flash.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/flash.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/flash.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/flash/flash6/DojoExternalInterface.as b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/flash/flash6/DojoExternalInterface.as
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/flash/flash6/DojoExternalInterface.as
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/flash/flash6/DojoExternalInterface.as
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/flash/flash8/DojoExternalInterface.as b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/flash/flash8/DojoExternalInterface.as
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/flash/flash8/DojoExternalInterface.as
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/flash/flash8/DojoExternalInterface.as
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/html.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/html.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/html.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/html.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/svg.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/svg.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/svg.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/svg.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/Colorspace.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/Colorspace.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/Colorspace.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/Colorspace.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/color.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/color.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/color.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/color.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/htmlEffects.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/htmlEffects.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/htmlEffects.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/htmlEffects.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_adobesvg.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_adobesvg.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_adobesvg.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_adobesvg.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_browser.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_browser.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_browser.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_browser.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_jsc.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_jsc.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_jsc.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_jsc.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_rhino.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_rhino.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_rhino.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_rhino.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_spidermonkey.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_spidermonkey.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_spidermonkey.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_spidermonkey.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_svg.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_svg.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_svg.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_svg.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_wsh.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_wsh.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_wsh.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_wsh.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/html.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/html.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/html.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/html.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/iCalendar.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/iCalendar.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/iCalendar.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/iCalendar.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/io.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/io.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/io.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/io.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/BrowserIO.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/BrowserIO.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/BrowserIO.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/BrowserIO.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/IframeIO.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/IframeIO.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/IframeIO.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/IframeIO.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/RepubsubIO.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/RepubsubIO.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/RepubsubIO.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/RepubsubIO.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/RhinoIO.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/RhinoIO.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/RhinoIO.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/RhinoIO.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/cookie.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/cookie.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/cookie.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/cookie.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/cookies.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/cookies.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/cookies.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/cookies.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/json.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/json.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/json.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/json.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/lang.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/lang.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/lang.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/lang.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/lang/Lang.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/lang/Lang.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/lang/Lang.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/lang/Lang.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/lang/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/lang/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/lang/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/lang/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/logging/Logger.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/logging/Logger.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/logging/Logger.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/logging/Logger.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/logging/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/logging/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/logging/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/logging/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/math.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/math.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/math.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/math.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/Math.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/Math.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/Math.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/Math.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/curves.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/curves.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/curves.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/curves.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/matrix.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/matrix.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/matrix.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/matrix.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/points.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/points.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/points.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/points.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/profile.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/profile.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/profile.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/profile.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/reflect/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/reflect/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/reflect/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/reflect/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/reflect/reflection.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/reflect/reflection.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/reflect/reflection.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/reflect/reflection.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/regexp.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/regexp.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/regexp.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/regexp.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/Deferred.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/Deferred.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/Deferred.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/Deferred.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/JotService.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/JotService.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/JotService.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/JotService.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/JsonService.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/JsonService.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/JsonService.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/JsonService.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/RpcService.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/RpcService.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/RpcService.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/RpcService.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/selection.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/selection.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/selection.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/selection.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.as b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.as
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.as
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.as
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.swf b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.swf
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.swf
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.swf
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/browser.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/browser.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/browser.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/browser.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/storage.sh b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/storage.sh
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/storage.sh
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/storage.sh
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/string.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/string.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/string.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/string.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/string/Builder.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/string/Builder.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/string/Builder.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/string/Builder.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/string/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/string/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/string/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/string/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/style.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/style.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/style.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/style.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/svg.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/svg.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/svg.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/svg.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Builder.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Builder.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Builder.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Builder.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/String.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/String.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/String.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/String.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Text.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Text.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Text.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Text.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/textDirectory.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/textDirectory.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/textDirectory.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/textDirectory.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/undo/Manager.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/undo/Manager.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/undo/Manager.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/undo/Manager.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/Uri.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/Uri.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/Uri.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/Uri.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/validate.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/validate.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/validate.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/validate.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/DomWidget.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/DomWidget.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/DomWidget.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/DomWidget.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/HtmlWidget.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/HtmlWidget.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/HtmlWidget.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/HtmlWidget.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/SvgWidget.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/SvgWidget.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/SvgWidget.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/SvgWidget.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/Widget.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/Widget.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/Widget.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/Widget.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/WidgetManager.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/WidgetManager.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/WidgetManager.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/WidgetManager.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Button.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Button.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Button.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Button.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/ComboBox.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/ComboBox.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/ComboBox.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/ComboBox.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/ContextMenu.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/ContextMenu.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/ContextMenu.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/ContextMenu.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/DropdownButtons.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/DropdownButtons.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/DropdownButtons.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/DropdownButtons.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLButton.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLButton.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLButton.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLButton.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLComboBox.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLComboBox.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLComboBox.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLComboBox.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLContextMenu.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLContextMenu.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLContextMenu.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLContextMenu.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenu.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenu.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenu.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenu.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenuItem.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenuItem.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenuItem.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenuItem.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLResizableTextarea.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLResizableTextarea.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLResizableTextarea.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLResizableTextarea.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/InlineEditBox.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/InlineEditBox.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/InlineEditBox.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/InlineEditBox.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Menu.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Menu.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Menu.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Menu.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/MenuItem.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/MenuItem.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/MenuItem.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/MenuItem.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Parse.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Parse.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Parse.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Parse.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/SVGButton.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/SVGButton.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/SVGButton.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/SVGButton.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/SlideShow.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/SlideShow.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/SlideShow.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/SlideShow.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Tabs.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Tabs.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Tabs.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Tabs.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Accordion.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Accordion.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Accordion.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Accordion.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Button.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Button.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Button.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Button.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Button2.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Button2.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Button2.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Button2.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Chart.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Chart.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Chart.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Chart.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Checkbox.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Checkbox.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Checkbox.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Checkbox.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/CiviCrmDatePicker.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/CiviCrmDatePicker.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/CiviCrmDatePicker.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/CiviCrmDatePicker.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ColorPalette.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ColorPalette.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ColorPalette.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ColorPalette.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ComboBox.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ComboBox.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ComboBox.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ComboBox.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Container.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Container.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Container.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Container.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ContentPane.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ContentPane.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ContentPane.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ContentPane.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ContextMenu.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ContextMenu.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ContextMenu.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ContextMenu.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DatePicker.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DatePicker.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DatePicker.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DatePicker.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DebugConsole.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DebugConsole.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DebugConsole.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DebugConsole.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Dialog.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Dialog.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Dialog.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Dialog.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DomWidget.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DomWidget.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DomWidget.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DomWidget.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DropdownButton.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DropdownButton.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DropdownButton.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DropdownButton.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Editor.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Editor.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Editor.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Editor.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTree.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTree.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTree.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTree.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeContextMenu.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeContextMenu.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeContextMenu.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeContextMenu.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeController.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeController.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeController.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeController.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeNode.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeNode.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeNode.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeNode.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeSelector.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeSelector.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeSelector.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeSelector.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/FisheyeList.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/FisheyeList.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/FisheyeList.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/FisheyeList.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/FloatingPane.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/FloatingPane.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/FloatingPane.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/FloatingPane.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HslColorPicker.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HslColorPicker.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HslColorPicker.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HslColorPicker.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlWidget.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlWidget.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlWidget.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlWidget.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/InlineEditBox.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/InlineEditBox.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/InlineEditBox.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/InlineEditBox.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/LayoutPane.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/LayoutPane.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/LayoutPane.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/LayoutPane.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/LinkPane.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/LinkPane.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/LinkPane.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/LinkPane.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Manager.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Manager.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Manager.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Manager.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Menu.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Menu.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Menu.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Menu.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Menu2.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Menu2.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Menu2.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Menu2.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/MenuItem.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/MenuItem.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/MenuItem.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/MenuItem.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Parse.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Parse.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Parse.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Parse.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/PopUpButton.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/PopUpButton.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/PopUpButton.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/PopUpButton.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ResizableTextarea.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ResizableTextarea.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ResizableTextarea.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ResizableTextarea.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ResizeHandle.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ResizeHandle.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ResizeHandle.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ResizeHandle.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/RichText.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/RichText.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/RichText.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/RichText.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SimpleDropdownButtons.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SimpleDropdownButtons.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SimpleDropdownButtons.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SimpleDropdownButtons.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SlideShow.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SlideShow.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SlideShow.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SlideShow.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SplitPane.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SplitPane.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SplitPane.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SplitPane.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SvgButton.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SvgButton.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SvgButton.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SvgButton.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SvgWidget.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SvgWidget.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SvgWidget.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SvgWidget.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TabPane.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TabPane.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TabPane.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TabPane.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tabs.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tabs.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tabs.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tabs.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TaskBar.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TaskBar.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TaskBar.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TaskBar.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TemplatedContainer.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TemplatedContainer.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TemplatedContainer.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TemplatedContainer.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TimePicker.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TimePicker.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TimePicker.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TimePicker.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Toggler.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Toggler.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Toggler.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Toggler.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Toolbar.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Toolbar.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Toolbar.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Toolbar.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tooltip.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tooltip.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tooltip.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tooltip.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tree.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tree.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tree.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tree.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Widget.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Widget.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Widget.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Widget.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Wizard.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Wizard.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Wizard.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Wizard.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Button.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Button.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Button.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Button.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Button2.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Button2.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Button2.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Button2.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Checkbox.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Checkbox.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Checkbox.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Checkbox.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ComboBox.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ComboBox.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ComboBox.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ComboBox.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Container.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Container.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Container.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Container.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ContentPane.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ContentPane.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ContentPane.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ContentPane.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ContextMenu.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ContextMenu.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ContextMenu.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ContextMenu.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DatePicker.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DatePicker.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DatePicker.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DatePicker.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DebugConsole.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DebugConsole.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DebugConsole.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DebugConsole.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DropdownButton.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DropdownButton.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DropdownButton.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DropdownButton.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/LayoutPane.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/LayoutPane.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/LayoutPane.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/LayoutPane.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/LinkPane.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/LinkPane.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/LinkPane.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/LinkPane.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Menu.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Menu.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Menu.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Menu.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/MenuItem.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/MenuItem.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/MenuItem.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/MenuItem.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/TaskBar.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/TaskBar.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/TaskBar.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/TaskBar.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/TimePicker.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/TimePicker.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/TimePicker.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/TimePicker.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Tooltip.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Tooltip.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Tooltip.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Tooltip.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/stabile.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/stabile.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/stabile.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/stabile.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/svg/Chart.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/svg/Chart.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/svg/Chart.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/svg/Chart.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/svg/HslColorPicker.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/svg/HslColorPicker.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/svg/HslColorPicker.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/svg/HslColorPicker.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HslColorPicker.svg b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HslColorPicker.svg
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HslColorPicker.svg
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HslColorPicker.svg
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlCiviCrmDatePicker.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlCiviCrmDatePicker.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlCiviCrmDatePicker.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlCiviCrmDatePicker.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboButton2Template.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboButton2Template.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboButton2Template.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboButton2Template.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlContextMenuTemplate.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlContextMenuTemplate.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlContextMenuTemplate.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlContextMenuTemplate.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDialog.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDialog.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDialog.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDialog.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDropDownButtonTemplate.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDropDownButtonTemplate.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDropDownButtonTemplate.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDropDownButtonTemplate.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFisheyeList.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFisheyeList.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFisheyeList.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFisheyeList.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFloatingPane.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFloatingPane.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFloatingPane.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFloatingPane.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlLayoutPane.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlLayoutPane.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlLayoutPane.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlLayoutPane.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenu2.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenu2.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenu2.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenu2.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenuItemTemplate.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenuItemTemplate.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenuItemTemplate.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenuItemTemplate.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizeHandle.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizeHandle.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizeHandle.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizeHandle.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSimpleDropdownButtons.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSimpleDropdownButtons.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSimpleDropdownButtons.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSimpleDropdownButtons.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSplitPane.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSplitPane.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSplitPane.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSplitPane.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabPane.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabPane.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabPane.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabPane.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabs.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabs.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabs.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabs.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBar.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBar.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBar.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBar.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBarItemTemplate.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBarItemTemplate.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBarItemTemplate.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBarItemTemplate.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlToolbar.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlToolbar.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlToolbar.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlToolbar.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Menu.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Menu.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Menu.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Menu.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/PopUpButton.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/PopUpButton.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/PopUpButton.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/PopUpButton.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Tree.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Tree.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Tree.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Tree.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/-.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/-.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/-.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/-.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/backcolor.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/backcolor.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/backcolor.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/backcolor.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/bold.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/bold.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/bold.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/bold.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cancel.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cancel.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cancel.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cancel.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/copy.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/copy.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/copy.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/copy.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/createlink.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/createlink.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/createlink.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/createlink.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cut.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cut.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cut.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cut.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/delete.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/delete.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/delete.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/delete.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/forecolor.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/forecolor.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/forecolor.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/forecolor.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/hilitecolor.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/hilitecolor.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/hilitecolor.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/hilitecolor.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/indent.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/indent.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/indent.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/indent.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserthorizontalrule.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserthorizontalrule.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserthorizontalrule.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserthorizontalrule.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertimage.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertimage.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertimage.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertimage.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertorderedlist.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertorderedlist.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertorderedlist.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertorderedlist.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserttable.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserttable.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserttable.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserttable.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertunorderedlist.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertunorderedlist.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertunorderedlist.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertunorderedlist.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/italic.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/italic.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/italic.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/italic.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifycenter.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifycenter.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifycenter.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifycenter.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyfull.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyfull.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyfull.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyfull.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyleft.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyleft.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyleft.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyleft.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyright.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyright.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyright.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyright.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/left_to_right.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/left_to_right.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/left_to_right.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/left_to_right.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_indent.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_indent.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_indent.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_indent.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_outdent.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_outdent.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_outdent.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_outdent.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_indent.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_indent.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_indent.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_indent.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_outdent.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_outdent.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_outdent.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_outdent.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/outdent.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/outdent.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/outdent.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/outdent.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/paste.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/paste.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/paste.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/paste.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/redo.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/redo.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/redo.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/redo.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/removeformat.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/removeformat.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/removeformat.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/removeformat.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/right_to_left.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/right_to_left.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/right_to_left.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/right_to_left.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/save.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/save.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/save.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/save.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/space.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/space.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/space.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/space.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/strikethrough.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/strikethrough.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/strikethrough.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/strikethrough.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/subscript.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/subscript.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/subscript.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/subscript.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/superscript.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/superscript.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/superscript.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/superscript.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/underline.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/underline.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/underline.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/underline.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/undo.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/undo.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/undo.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/undo.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/wikiword.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/wikiword.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/wikiword.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/wikiword.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/check_off.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/check_off.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/check_off.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/check_off.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/check_on.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/check_on.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/check_on.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/check_on.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/decrementMonth.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/decrementMonth.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/decrementMonth.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/decrementMonth.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/decrementWeek.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/decrementWeek.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/decrementWeek.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/decrementWeek.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/grabCorner.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/grabCorner.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/grabCorner.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/grabCorner.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/EditorTree.css b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/EditorTree.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/EditorTree.css
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/EditorTree.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/blank.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/blank.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/blank.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/blank.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/closed.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/closed.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/closed.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/closed.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/document.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/document.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/document.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/document.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/minus.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/minus.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/minus.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/minus.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/open.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/open.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/open.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/open.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/plus.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/plus.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/plus.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/plus.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_blank.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_blank.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_blank.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_blank.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_child.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_child.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_child.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_child.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_expand_minus.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_expand_minus.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_expand_minus.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_expand_minus.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_expand_plus.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_expand_plus.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_expand_plus.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_expand_plus.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_c.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_c.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_c.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_c.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_l.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_l.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_l.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_l.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_p.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_p.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_p.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_p.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_t.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_t.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_t.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_t.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_v.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_v.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_v.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_v.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_x.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_x.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_x.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_x.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_y.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_y.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_y.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_y.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_z.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_z.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_z.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_z.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_loading.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_loading.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_loading.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_loading.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/blank.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/blank.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/blank.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/blank.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/combo_box_arrow.png b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/combo_box_arrow.png
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/combo_box_arrow.png
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/combo_box_arrow.png
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow-disabled.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow-disabled.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow-disabled.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow-disabled.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneClose.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneClose.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneClose.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneClose.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneMaximize.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneMaximize.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneMaximize.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneMaximize.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneMinimize.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneMinimize.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneMinimize.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneMinimize.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneRestore.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneRestore.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneRestore.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneRestore.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/hue.png b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/hue.png
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/hue.png
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/hue.png
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.svg b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.svg
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.svg
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.svg
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-c.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-c.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-c.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-c.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-l.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-l.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-l.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-l.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-r.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-r.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-r.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-r.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji_p_01.svg b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji_p_01.svg
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji_p_01.svg
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji_p_01.svg
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-c.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-c.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-c.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-c.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-l.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-l.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-l.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-l.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-r.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-r.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-r.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-r.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji.svg b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji.svg
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji.svg
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji.svg
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-c.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-c.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-c.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-c.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-l.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-l.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-l.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-l.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-r.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-r.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-r.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-r.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji_01.svg b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji_01.svg
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji_01.svg
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji_01.svg
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_ben_01.svg b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_ben_01.svg
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_ben_01.svg
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_ben_01.svg
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-c.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-c.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-c.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-c.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-l.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-l.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-l.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-l.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-r.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-r.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-r.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-r.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowB.png b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowB.png
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowB.png
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowB.png
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowBL.png b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowBL.png
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowBL.png
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowBL.png
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowBR.png b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowBR.png
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowBR.png
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowBR.png
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowL.png b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowL.png
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowL.png
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowL.png
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowR.png b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowR.png
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowR.png
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowR.png
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowTR..png b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowTR..png
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowTR..png
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowTR..png
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowUL.png b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowUL.png
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowUL.png
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowUL.png
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowUR.png b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowUR.png
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowUR.png
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowUR.png
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_off.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_off.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_off.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_off.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_on.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_on.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_on.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_on.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r_curr.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r_curr.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r_curr.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r_curr.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r_curr.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r_curr.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r_curr.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r_curr.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/titlebar-bg.jpg b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/titlebar-bg.jpg
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/titlebar-bg.jpg
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/titlebar-bg.jpg
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/toolbar-bg.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/toolbar-bg.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/toolbar-bg.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/toolbar-bg.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/transparent.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/transparent.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/transparent.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/transparent.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_blank.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_blank.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_blank.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_blank.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_minus.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_minus.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_minus.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_minus.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_plus.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_plus.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_plus.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_plus.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_c.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_c.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_c.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_c.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_l.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_l.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_l.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_l.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_p.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_p.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_p.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_p.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_t.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_t.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_t.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_t.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_v.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_v.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_v.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_v.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_x.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_x.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_x.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_x.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_y.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_y.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_y.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_y.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_z.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_z.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_z.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_z.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_node.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_node.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_node.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_node.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/verticalbar.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/verticalbar.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/verticalbar.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/verticalbar.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/whiteDownArrow.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/whiteDownArrow.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/whiteDownArrow.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/whiteDownArrow.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/incrementMonth.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/incrementMonth.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/incrementMonth.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/incrementMonth.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/incrementWeek.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/incrementWeek.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/incrementWeek.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/incrementWeek.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/Parse.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/Parse.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/Parse.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/Parse.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/domUtil.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/domUtil.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/domUtil.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/domUtil.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/htmlUtil.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/htmlUtil.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/htmlUtil.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/htmlUtil.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/svgUtil.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/svgUtil.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/svgUtil.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/svgUtil.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/Util.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/Util.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/struts/Util.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/struts/Util.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/tooltip.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/tooltip.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/struts/tooltip.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/struts/tooltip.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/Bind.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/Bind.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/Bind.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/Bind.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/Bind.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/Bind.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/Bind.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/Bind.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DropdownContainer.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DropdownContainer.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DropdownContainer.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DropdownContainer.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.html b/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.html
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.html
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/ToggleBindDiv.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/ToggleBindDiv.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/ToggleBindDiv.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/ToggleBindDiv.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/__package__.js b/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/__package__.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/__package__.js
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/__package__.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/dateIcon.gif b/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/dateIcon.gif
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/dateIcon.gif
rename to core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/dateIcon.gif
diff --git a/action/src/main/resources/org/apache/struts/action2/static/niftycorners/layout.js b/core/src/main/resources/org/apache/struts/action2/static/niftycorners/layout.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/niftycorners/layout.js
rename to core/src/main/resources/org/apache/struts/action2/static/niftycorners/layout.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/niftycorners/nifty.js b/core/src/main/resources/org/apache/struts/action2/static/niftycorners/nifty.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/niftycorners/nifty.js
rename to core/src/main/resources/org/apache/struts/action2/static/niftycorners/nifty.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/niftycorners/niftyCorners.css b/core/src/main/resources/org/apache/struts/action2/static/niftycorners/niftyCorners.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/niftycorners/niftyCorners.css
rename to core/src/main/resources/org/apache/struts/action2/static/niftycorners/niftyCorners.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/niftycorners/niftyPrint.css b/core/src/main/resources/org/apache/struts/action2/static/niftycorners/niftyPrint.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/niftycorners/niftyPrint.css
rename to core/src/main/resources/org/apache/struts/action2/static/niftycorners/niftyPrint.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/niftycorners/niftylayout.css b/core/src/main/resources/org/apache/struts/action2/static/niftycorners/niftylayout.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/niftycorners/niftylayout.css
rename to core/src/main/resources/org/apache/struts/action2/static/niftycorners/niftylayout.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/optiontransferselect.js b/core/src/main/resources/org/apache/struts/action2/static/optiontransferselect.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/optiontransferselect.js
rename to core/src/main/resources/org/apache/struts/action2/static/optiontransferselect.js
diff --git a/action/src/main/resources/org/apache/struts/action2/static/tabs.css b/core/src/main/resources/org/apache/struts/action2/static/tabs.css
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/tabs.css
rename to core/src/main/resources/org/apache/struts/action2/static/tabs.css
diff --git a/action/src/main/resources/org/apache/struts/action2/static/validationClient.js b/core/src/main/resources/org/apache/struts/action2/static/validationClient.js
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/static/validationClient.js
rename to core/src/main/resources/org/apache/struts/action2/static/validationClient.js
diff --git a/action/src/main/resources/org/apache/struts/action2/struts-messages.properties b/core/src/main/resources/org/apache/struts/action2/struts-messages.properties
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/struts-messages.properties
rename to core/src/main/resources/org/apache/struts/action2/struts-messages.properties
diff --git a/action/src/main/resources/org/apache/struts/action2/struts-messages_da.properties b/core/src/main/resources/org/apache/struts/action2/struts-messages_da.properties
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/struts-messages_da.properties
rename to core/src/main/resources/org/apache/struts/action2/struts-messages_da.properties
diff --git a/action/src/main/resources/org/apache/struts/action2/struts-messages_de.properties b/core/src/main/resources/org/apache/struts/action2/struts-messages_de.properties
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/struts-messages_de.properties
rename to core/src/main/resources/org/apache/struts/action2/struts-messages_de.properties
diff --git a/action/src/main/resources/org/apache/struts/action2/util/package.html b/core/src/main/resources/org/apache/struts/action2/util/package.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/util/package.html
rename to core/src/main/resources/org/apache/struts/action2/util/package.html
diff --git a/action/src/main/resources/org/apache/struts/action2/views/freemarker/package.html b/core/src/main/resources/org/apache/struts/action2/views/freemarker/package.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/views/freemarker/package.html
rename to core/src/main/resources/org/apache/struts/action2/views/freemarker/package.html
diff --git a/action/src/main/resources/org/apache/struts/action2/views/jasperreports/package.html b/core/src/main/resources/org/apache/struts/action2/views/jasperreports/package.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/views/jasperreports/package.html
rename to core/src/main/resources/org/apache/struts/action2/views/jasperreports/package.html
diff --git a/action/src/main/resources/org/apache/struts/action2/views/jsp/iterator/package.html b/core/src/main/resources/org/apache/struts/action2/views/jsp/iterator/package.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/views/jsp/iterator/package.html
rename to core/src/main/resources/org/apache/struts/action2/views/jsp/iterator/package.html
diff --git a/action/src/main/resources/org/apache/struts/action2/views/jsp/ui/package.html b/core/src/main/resources/org/apache/struts/action2/views/jsp/ui/package.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/views/jsp/ui/package.html
rename to core/src/main/resources/org/apache/struts/action2/views/jsp/ui/package.html
diff --git a/action/src/main/resources/org/apache/struts/action2/views/jsp/ui/table/package.html b/core/src/main/resources/org/apache/struts/action2/views/jsp/ui/table/package.html
similarity index 100%
rename from action/src/main/resources/org/apache/struts/action2/views/jsp/ui/table/package.html
rename to core/src/main/resources/org/apache/struts/action2/views/jsp/ui/table/package.html
diff --git a/action/src/main/resources/overview.html b/core/src/main/resources/overview.html
similarity index 100%
rename from action/src/main/resources/overview.html
rename to core/src/main/resources/overview.html
diff --git a/action/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
similarity index 100%
rename from action/src/main/resources/struts-default.xml
rename to core/src/main/resources/struts-default.xml
diff --git a/action/src/main/resources/struts-portlet-default.xml b/core/src/main/resources/struts-portlet-default.xml
similarity index 100%
rename from action/src/main/resources/struts-portlet-default.xml
rename to core/src/main/resources/struts-portlet-default.xml
diff --git a/action/src/main/resources/struts.vm b/core/src/main/resources/struts.vm
similarity index 100%
rename from action/src/main/resources/struts.vm
rename to core/src/main/resources/struts.vm
diff --git a/action/src/main/resources/template/ajax/a.ftl b/core/src/main/resources/template/ajax/a.ftl
similarity index 100%
rename from action/src/main/resources/template/ajax/a.ftl
rename to core/src/main/resources/template/ajax/a.ftl
diff --git a/action/src/main/resources/template/ajax/controlheader.ftl b/core/src/main/resources/template/ajax/controlheader.ftl
similarity index 100%
rename from action/src/main/resources/template/ajax/controlheader.ftl
rename to core/src/main/resources/template/ajax/controlheader.ftl
diff --git a/action/src/main/resources/template/ajax/div.ftl b/core/src/main/resources/template/ajax/div.ftl
similarity index 100%
rename from action/src/main/resources/template/ajax/div.ftl
rename to core/src/main/resources/template/ajax/div.ftl
diff --git a/action/src/main/resources/template/ajax/dojoRequire.js b/core/src/main/resources/template/ajax/dojoRequire.js
similarity index 100%
rename from action/src/main/resources/template/ajax/dojoRequire.js
rename to core/src/main/resources/template/ajax/dojoRequire.js
diff --git a/action/src/main/resources/template/ajax/form-close.ftl b/core/src/main/resources/template/ajax/form-close.ftl
similarity index 100%
rename from action/src/main/resources/template/ajax/form-close.ftl
rename to core/src/main/resources/template/ajax/form-close.ftl
diff --git a/action/src/main/resources/template/ajax/form.ftl b/core/src/main/resources/template/ajax/form.ftl
similarity index 100%
rename from action/src/main/resources/template/ajax/form.ftl
rename to core/src/main/resources/template/ajax/form.ftl
diff --git a/action/src/main/resources/template/ajax/head.ftl b/core/src/main/resources/template/ajax/head.ftl
similarity index 100%
rename from action/src/main/resources/template/ajax/head.ftl
rename to core/src/main/resources/template/ajax/head.ftl
diff --git a/action/src/main/resources/template/ajax/submit-ajax.ftl b/core/src/main/resources/template/ajax/submit-ajax.ftl
similarity index 100%
rename from action/src/main/resources/template/ajax/submit-ajax.ftl
rename to core/src/main/resources/template/ajax/submit-ajax.ftl
diff --git a/action/src/main/resources/template/ajax/submit.ftl b/core/src/main/resources/template/ajax/submit.ftl
similarity index 100%
rename from action/src/main/resources/template/ajax/submit.ftl
rename to core/src/main/resources/template/ajax/submit.ftl
diff --git a/action/src/main/resources/template/ajax/tab-close.ftl b/core/src/main/resources/template/ajax/tab-close.ftl
similarity index 100%
rename from action/src/main/resources/template/ajax/tab-close.ftl
rename to core/src/main/resources/template/ajax/tab-close.ftl
diff --git a/action/src/main/resources/template/ajax/tab.ftl b/core/src/main/resources/template/ajax/tab.ftl
similarity index 100%
rename from action/src/main/resources/template/ajax/tab.ftl
rename to core/src/main/resources/template/ajax/tab.ftl
diff --git a/action/src/main/resources/template/ajax/textarea.ftl b/core/src/main/resources/template/ajax/textarea.ftl
similarity index 100%
rename from action/src/main/resources/template/ajax/textarea.ftl
rename to core/src/main/resources/template/ajax/textarea.ftl
diff --git a/action/src/main/resources/template/ajax/theme.properties b/core/src/main/resources/template/ajax/theme.properties
similarity index 100%
rename from action/src/main/resources/template/ajax/theme.properties
rename to core/src/main/resources/template/ajax/theme.properties
diff --git a/action/src/main/resources/template/ajax/tree-close.ftl b/core/src/main/resources/template/ajax/tree-close.ftl
similarity index 100%
rename from action/src/main/resources/template/ajax/tree-close.ftl
rename to core/src/main/resources/template/ajax/tree-close.ftl
diff --git a/action/src/main/resources/template/ajax/tree.ftl b/core/src/main/resources/template/ajax/tree.ftl
similarity index 100%
rename from action/src/main/resources/template/ajax/tree.ftl
rename to core/src/main/resources/template/ajax/tree.ftl
diff --git a/action/src/main/resources/template/ajax/treenode-close.ftl b/core/src/main/resources/template/ajax/treenode-close.ftl
similarity index 100%
rename from action/src/main/resources/template/ajax/treenode-close.ftl
rename to core/src/main/resources/template/ajax/treenode-close.ftl
diff --git a/action/src/main/resources/template/ajax/treenode-include.ftl b/core/src/main/resources/template/ajax/treenode-include.ftl
similarity index 100%
rename from action/src/main/resources/template/ajax/treenode-include.ftl
rename to core/src/main/resources/template/ajax/treenode-include.ftl
diff --git a/action/src/main/resources/template/ajax/treenode.ftl b/core/src/main/resources/template/ajax/treenode.ftl
similarity index 100%
rename from action/src/main/resources/template/ajax/treenode.ftl
rename to core/src/main/resources/template/ajax/treenode.ftl
diff --git a/action/src/main/resources/template/ajax/validation.js b/core/src/main/resources/template/ajax/validation.js
similarity index 100%
rename from action/src/main/resources/template/ajax/validation.js
rename to core/src/main/resources/template/ajax/validation.js
diff --git a/action/src/main/resources/template/archive/ajax/a-close.vm b/core/src/main/resources/template/archive/ajax/a-close.vm
similarity index 100%
rename from action/src/main/resources/template/archive/ajax/a-close.vm
rename to core/src/main/resources/template/archive/ajax/a-close.vm
diff --git a/action/src/main/resources/template/archive/ajax/a.vm b/core/src/main/resources/template/archive/ajax/a.vm
similarity index 100%
rename from action/src/main/resources/template/archive/ajax/a.vm
rename to core/src/main/resources/template/archive/ajax/a.vm
diff --git a/action/src/main/resources/template/archive/ajax/div-close.vm b/core/src/main/resources/template/archive/ajax/div-close.vm
similarity index 100%
rename from action/src/main/resources/template/archive/ajax/div-close.vm
rename to core/src/main/resources/template/archive/ajax/div-close.vm
diff --git a/action/src/main/resources/template/archive/ajax/div.vm b/core/src/main/resources/template/archive/ajax/div.vm
similarity index 100%
rename from action/src/main/resources/template/archive/ajax/div.vm
rename to core/src/main/resources/template/archive/ajax/div.vm
diff --git a/action/src/main/resources/template/archive/ajax/form-close.vm b/core/src/main/resources/template/archive/ajax/form-close.vm
similarity index 100%
rename from action/src/main/resources/template/archive/ajax/form-close.vm
rename to core/src/main/resources/template/archive/ajax/form-close.vm
diff --git a/action/src/main/resources/template/archive/ajax/form.vm b/core/src/main/resources/template/archive/ajax/form.vm
similarity index 100%
rename from action/src/main/resources/template/archive/ajax/form.vm
rename to core/src/main/resources/template/archive/ajax/form.vm
diff --git a/action/src/main/resources/template/archive/ajax/submit.vm b/core/src/main/resources/template/archive/ajax/submit.vm
similarity index 100%
rename from action/src/main/resources/template/archive/ajax/submit.vm
rename to core/src/main/resources/template/archive/ajax/submit.vm
diff --git a/action/src/main/resources/template/archive/ajax/tab-close.vm b/core/src/main/resources/template/archive/ajax/tab-close.vm
similarity index 100%
rename from action/src/main/resources/template/archive/ajax/tab-close.vm
rename to core/src/main/resources/template/archive/ajax/tab-close.vm
diff --git a/action/src/main/resources/template/archive/ajax/tab.vm b/core/src/main/resources/template/archive/ajax/tab.vm
similarity index 100%
rename from action/src/main/resources/template/archive/ajax/tab.vm
rename to core/src/main/resources/template/archive/ajax/tab.vm
diff --git a/action/src/main/resources/template/archive/simple/checkbox.vm b/core/src/main/resources/template/archive/simple/checkbox.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/checkbox.vm
rename to core/src/main/resources/template/archive/simple/checkbox.vm
diff --git a/action/src/main/resources/template/archive/simple/checkboxlist.vm b/core/src/main/resources/template/archive/simple/checkboxlist.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/checkboxlist.vm
rename to core/src/main/resources/template/archive/simple/checkboxlist.vm
diff --git a/action/src/main/resources/template/archive/simple/combobox.vm b/core/src/main/resources/template/archive/simple/combobox.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/combobox.vm
rename to core/src/main/resources/template/archive/simple/combobox.vm
diff --git a/action/src/main/resources/template/archive/simple/debug.vm b/core/src/main/resources/template/archive/simple/debug.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/debug.vm
rename to core/src/main/resources/template/archive/simple/debug.vm
diff --git a/action/src/main/resources/template/archive/simple/doubleselect.vm b/core/src/main/resources/template/archive/simple/doubleselect.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/doubleselect.vm
rename to core/src/main/resources/template/archive/simple/doubleselect.vm
diff --git a/action/src/main/resources/template/archive/simple/empty.vm b/core/src/main/resources/template/archive/simple/empty.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/empty.vm
rename to core/src/main/resources/template/archive/simple/empty.vm
diff --git a/action/src/main/resources/template/archive/simple/file.vm b/core/src/main/resources/template/archive/simple/file.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/file.vm
rename to core/src/main/resources/template/archive/simple/file.vm
diff --git a/action/src/main/resources/template/archive/simple/form-close.vm b/core/src/main/resources/template/archive/simple/form-close.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/form-close.vm
rename to core/src/main/resources/template/archive/simple/form-close.vm
diff --git a/action/src/main/resources/template/archive/simple/form.vm b/core/src/main/resources/template/archive/simple/form.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/form.vm
rename to core/src/main/resources/template/archive/simple/form.vm
diff --git a/action/src/main/resources/template/archive/simple/hidden.vm b/core/src/main/resources/template/archive/simple/hidden.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/hidden.vm
rename to core/src/main/resources/template/archive/simple/hidden.vm
diff --git a/action/src/main/resources/template/archive/simple/label.vm b/core/src/main/resources/template/archive/simple/label.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/label.vm
rename to core/src/main/resources/template/archive/simple/label.vm
diff --git a/action/src/main/resources/template/archive/simple/password.vm b/core/src/main/resources/template/archive/simple/password.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/password.vm
rename to core/src/main/resources/template/archive/simple/password.vm
diff --git a/action/src/main/resources/template/archive/simple/radiomap.vm b/core/src/main/resources/template/archive/simple/radiomap.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/radiomap.vm
rename to core/src/main/resources/template/archive/simple/radiomap.vm
diff --git a/action/src/main/resources/template/archive/simple/scripting-events.vm b/core/src/main/resources/template/archive/simple/scripting-events.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/scripting-events.vm
rename to core/src/main/resources/template/archive/simple/scripting-events.vm
diff --git a/action/src/main/resources/template/archive/simple/select.vm b/core/src/main/resources/template/archive/simple/select.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/select.vm
rename to core/src/main/resources/template/archive/simple/select.vm
diff --git a/action/src/main/resources/template/archive/simple/submit.vm b/core/src/main/resources/template/archive/simple/submit.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/submit.vm
rename to core/src/main/resources/template/archive/simple/submit.vm
diff --git a/action/src/main/resources/template/archive/simple/table.vm b/core/src/main/resources/template/archive/simple/table.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/table.vm
rename to core/src/main/resources/template/archive/simple/table.vm
diff --git a/action/src/main/resources/template/archive/simple/text.vm b/core/src/main/resources/template/archive/simple/text.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/text.vm
rename to core/src/main/resources/template/archive/simple/text.vm
diff --git a/action/src/main/resources/template/archive/simple/textarea.vm b/core/src/main/resources/template/archive/simple/textarea.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/textarea.vm
rename to core/src/main/resources/template/archive/simple/textarea.vm
diff --git a/action/src/main/resources/template/archive/simple/token.vm b/core/src/main/resources/template/archive/simple/token.vm
similarity index 100%
rename from action/src/main/resources/template/archive/simple/token.vm
rename to core/src/main/resources/template/archive/simple/token.vm
diff --git a/action/src/main/resources/template/archive/xhtml/checkbox.vm b/core/src/main/resources/template/archive/xhtml/checkbox.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/checkbox.vm
rename to core/src/main/resources/template/archive/xhtml/checkbox.vm
diff --git a/action/src/main/resources/template/archive/xhtml/checkboxlist.vm b/core/src/main/resources/template/archive/xhtml/checkboxlist.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/checkboxlist.vm
rename to core/src/main/resources/template/archive/xhtml/checkboxlist.vm
diff --git a/action/src/main/resources/template/archive/xhtml/combobox.vm b/core/src/main/resources/template/archive/xhtml/combobox.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/combobox.vm
rename to core/src/main/resources/template/archive/xhtml/combobox.vm
diff --git a/action/src/main/resources/template/archive/xhtml/controlfooter.vm b/core/src/main/resources/template/archive/xhtml/controlfooter.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/controlfooter.vm
rename to core/src/main/resources/template/archive/xhtml/controlfooter.vm
diff --git a/action/src/main/resources/template/archive/xhtml/controlheader.vm b/core/src/main/resources/template/archive/xhtml/controlheader.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/controlheader.vm
rename to core/src/main/resources/template/archive/xhtml/controlheader.vm
diff --git a/action/src/main/resources/template/archive/xhtml/debug.vm b/core/src/main/resources/template/archive/xhtml/debug.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/debug.vm
rename to core/src/main/resources/template/archive/xhtml/debug.vm
diff --git a/action/src/main/resources/template/archive/xhtml/doubleselect.vm b/core/src/main/resources/template/archive/xhtml/doubleselect.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/doubleselect.vm
rename to core/src/main/resources/template/archive/xhtml/doubleselect.vm
diff --git a/action/src/main/resources/template/archive/xhtml/empty.vm b/core/src/main/resources/template/archive/xhtml/empty.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/empty.vm
rename to core/src/main/resources/template/archive/xhtml/empty.vm
diff --git a/action/src/main/resources/template/archive/xhtml/file.vm b/core/src/main/resources/template/archive/xhtml/file.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/file.vm
rename to core/src/main/resources/template/archive/xhtml/file.vm
diff --git a/action/src/main/resources/template/archive/xhtml/form-close.vm b/core/src/main/resources/template/archive/xhtml/form-close.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/form-close.vm
rename to core/src/main/resources/template/archive/xhtml/form-close.vm
diff --git a/action/src/main/resources/template/archive/xhtml/form.vm b/core/src/main/resources/template/archive/xhtml/form.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/form.vm
rename to core/src/main/resources/template/archive/xhtml/form.vm
diff --git a/action/src/main/resources/template/archive/xhtml/hidden.vm b/core/src/main/resources/template/archive/xhtml/hidden.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/hidden.vm
rename to core/src/main/resources/template/archive/xhtml/hidden.vm
diff --git a/action/src/main/resources/template/archive/xhtml/label.vm b/core/src/main/resources/template/archive/xhtml/label.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/label.vm
rename to core/src/main/resources/template/archive/xhtml/label.vm
diff --git a/action/src/main/resources/template/archive/xhtml/password.vm b/core/src/main/resources/template/archive/xhtml/password.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/password.vm
rename to core/src/main/resources/template/archive/xhtml/password.vm
diff --git a/action/src/main/resources/template/archive/xhtml/radiomap.vm b/core/src/main/resources/template/archive/xhtml/radiomap.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/radiomap.vm
rename to core/src/main/resources/template/archive/xhtml/radiomap.vm
diff --git a/action/src/main/resources/template/archive/xhtml/select.vm b/core/src/main/resources/template/archive/xhtml/select.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/select.vm
rename to core/src/main/resources/template/archive/xhtml/select.vm
diff --git a/action/src/main/resources/template/archive/xhtml/submit.vm b/core/src/main/resources/template/archive/xhtml/submit.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/submit.vm
rename to core/src/main/resources/template/archive/xhtml/submit.vm
diff --git a/action/src/main/resources/template/archive/xhtml/table.vm b/core/src/main/resources/template/archive/xhtml/table.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/table.vm
rename to core/src/main/resources/template/archive/xhtml/table.vm
diff --git a/action/src/main/resources/template/archive/xhtml/text.vm b/core/src/main/resources/template/archive/xhtml/text.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/text.vm
rename to core/src/main/resources/template/archive/xhtml/text.vm
diff --git a/action/src/main/resources/template/archive/xhtml/textarea.vm b/core/src/main/resources/template/archive/xhtml/textarea.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/textarea.vm
rename to core/src/main/resources/template/archive/xhtml/textarea.vm
diff --git a/action/src/main/resources/template/archive/xhtml/token.vm b/core/src/main/resources/template/archive/xhtml/token.vm
similarity index 100%
rename from action/src/main/resources/template/archive/xhtml/token.vm
rename to core/src/main/resources/template/archive/xhtml/token.vm
diff --git a/action/src/main/resources/template/css_xhtml/checkbox.ftl b/core/src/main/resources/template/css_xhtml/checkbox.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/checkbox.ftl
rename to core/src/main/resources/template/css_xhtml/checkbox.ftl
diff --git a/action/src/main/resources/template/css_xhtml/checkboxlist.ftl b/core/src/main/resources/template/css_xhtml/checkboxlist.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/checkboxlist.ftl
rename to core/src/main/resources/template/css_xhtml/checkboxlist.ftl
diff --git a/action/src/main/resources/template/css_xhtml/combobox.ftl b/core/src/main/resources/template/css_xhtml/combobox.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/combobox.ftl
rename to core/src/main/resources/template/css_xhtml/combobox.ftl
diff --git a/action/src/main/resources/template/css_xhtml/controlfooter.ftl b/core/src/main/resources/template/css_xhtml/controlfooter.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/controlfooter.ftl
rename to core/src/main/resources/template/css_xhtml/controlfooter.ftl
diff --git a/action/src/main/resources/template/css_xhtml/controlheader.ftl b/core/src/main/resources/template/css_xhtml/controlheader.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/controlheader.ftl
rename to core/src/main/resources/template/css_xhtml/controlheader.ftl
diff --git a/action/src/main/resources/template/css_xhtml/datepicker.ftl b/core/src/main/resources/template/css_xhtml/datepicker.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/datepicker.ftl
rename to core/src/main/resources/template/css_xhtml/datepicker.ftl
diff --git a/action/src/main/resources/template/css_xhtml/debug.ftl b/core/src/main/resources/template/css_xhtml/debug.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/debug.ftl
rename to core/src/main/resources/template/css_xhtml/debug.ftl
diff --git a/action/src/main/resources/template/css_xhtml/doubleselect.ftl b/core/src/main/resources/template/css_xhtml/doubleselect.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/doubleselect.ftl
rename to core/src/main/resources/template/css_xhtml/doubleselect.ftl
diff --git a/action/src/main/resources/template/css_xhtml/file.ftl b/core/src/main/resources/template/css_xhtml/file.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/file.ftl
rename to core/src/main/resources/template/css_xhtml/file.ftl
diff --git a/action/src/main/resources/template/css_xhtml/form-close.ftl b/core/src/main/resources/template/css_xhtml/form-close.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/form-close.ftl
rename to core/src/main/resources/template/css_xhtml/form-close.ftl
diff --git a/action/src/main/resources/template/css_xhtml/form-validate.ftl b/core/src/main/resources/template/css_xhtml/form-validate.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/form-validate.ftl
rename to core/src/main/resources/template/css_xhtml/form-validate.ftl
diff --git a/action/src/main/resources/template/css_xhtml/form.ftl b/core/src/main/resources/template/css_xhtml/form.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/form.ftl
rename to core/src/main/resources/template/css_xhtml/form.ftl
diff --git a/action/src/main/resources/template/css_xhtml/head.ftl b/core/src/main/resources/template/css_xhtml/head.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/head.ftl
rename to core/src/main/resources/template/css_xhtml/head.ftl
diff --git a/action/src/main/resources/template/css_xhtml/label.ftl b/core/src/main/resources/template/css_xhtml/label.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/label.ftl
rename to core/src/main/resources/template/css_xhtml/label.ftl
diff --git a/action/src/main/resources/template/css_xhtml/optiontransferselect.ftl b/core/src/main/resources/template/css_xhtml/optiontransferselect.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/optiontransferselect.ftl
rename to core/src/main/resources/template/css_xhtml/optiontransferselect.ftl
diff --git a/action/src/main/resources/template/css_xhtml/password.ftl b/core/src/main/resources/template/css_xhtml/password.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/password.ftl
rename to core/src/main/resources/template/css_xhtml/password.ftl
diff --git a/action/src/main/resources/template/css_xhtml/radiomap.ftl b/core/src/main/resources/template/css_xhtml/radiomap.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/radiomap.ftl
rename to core/src/main/resources/template/css_xhtml/radiomap.ftl
diff --git a/action/src/main/resources/template/css_xhtml/reset.ftl b/core/src/main/resources/template/css_xhtml/reset.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/reset.ftl
rename to core/src/main/resources/template/css_xhtml/reset.ftl
diff --git a/action/src/main/resources/template/css_xhtml/richtexteditor.ftl b/core/src/main/resources/template/css_xhtml/richtexteditor.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/richtexteditor.ftl
rename to core/src/main/resources/template/css_xhtml/richtexteditor.ftl
diff --git a/action/src/main/resources/template/css_xhtml/select.ftl b/core/src/main/resources/template/css_xhtml/select.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/select.ftl
rename to core/src/main/resources/template/css_xhtml/select.ftl
diff --git a/action/src/main/resources/template/css_xhtml/styles.css b/core/src/main/resources/template/css_xhtml/styles.css
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/styles.css
rename to core/src/main/resources/template/css_xhtml/styles.css
diff --git a/action/src/main/resources/template/css_xhtml/submit.ftl b/core/src/main/resources/template/css_xhtml/submit.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/submit.ftl
rename to core/src/main/resources/template/css_xhtml/submit.ftl
diff --git a/action/src/main/resources/template/css_xhtml/text.ftl b/core/src/main/resources/template/css_xhtml/text.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/text.ftl
rename to core/src/main/resources/template/css_xhtml/text.ftl
diff --git a/action/src/main/resources/template/css_xhtml/textarea.ftl b/core/src/main/resources/template/css_xhtml/textarea.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/textarea.ftl
rename to core/src/main/resources/template/css_xhtml/textarea.ftl
diff --git a/action/src/main/resources/template/css_xhtml/theme.properties b/core/src/main/resources/template/css_xhtml/theme.properties
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/theme.properties
rename to core/src/main/resources/template/css_xhtml/theme.properties
diff --git a/action/src/main/resources/template/css_xhtml/updownselect.ftl b/core/src/main/resources/template/css_xhtml/updownselect.ftl
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/updownselect.ftl
rename to core/src/main/resources/template/css_xhtml/updownselect.ftl
diff --git a/action/src/main/resources/template/css_xhtml/validation.js b/core/src/main/resources/template/css_xhtml/validation.js
similarity index 100%
rename from action/src/main/resources/template/css_xhtml/validation.js
rename to core/src/main/resources/template/css_xhtml/validation.js
diff --git a/action/src/main/resources/template/simple/a-close.ftl b/core/src/main/resources/template/simple/a-close.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/a-close.ftl
rename to core/src/main/resources/template/simple/a-close.ftl
diff --git a/action/src/main/resources/template/simple/a.ftl b/core/src/main/resources/template/simple/a.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/a.ftl
rename to core/src/main/resources/template/simple/a.ftl
diff --git a/action/src/main/resources/template/simple/actionerror.ftl b/core/src/main/resources/template/simple/actionerror.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/actionerror.ftl
rename to core/src/main/resources/template/simple/actionerror.ftl
diff --git a/action/src/main/resources/template/simple/actionmessage.ftl b/core/src/main/resources/template/simple/actionmessage.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/actionmessage.ftl
rename to core/src/main/resources/template/simple/actionmessage.ftl
diff --git a/action/src/main/resources/template/simple/checkbox.ftl b/core/src/main/resources/template/simple/checkbox.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/checkbox.ftl
rename to core/src/main/resources/template/simple/checkbox.ftl
diff --git a/action/src/main/resources/template/simple/checkboxlist.ftl b/core/src/main/resources/template/simple/checkboxlist.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/checkboxlist.ftl
rename to core/src/main/resources/template/simple/checkboxlist.ftl
diff --git a/action/src/main/resources/template/simple/combobox.ftl b/core/src/main/resources/template/simple/combobox.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/combobox.ftl
rename to core/src/main/resources/template/simple/combobox.ftl
diff --git a/action/src/main/resources/template/simple/controlfooter.ftl b/core/src/main/resources/template/simple/controlfooter.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/controlfooter.ftl
rename to core/src/main/resources/template/simple/controlfooter.ftl
diff --git a/action/src/main/resources/template/simple/controlheader.ftl b/core/src/main/resources/template/simple/controlheader.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/controlheader.ftl
rename to core/src/main/resources/template/simple/controlheader.ftl
diff --git a/action/src/main/resources/template/simple/datepicker.ftl b/core/src/main/resources/template/simple/datepicker.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/datepicker.ftl
rename to core/src/main/resources/template/simple/datepicker.ftl
diff --git a/action/src/main/resources/template/simple/debug.ftl b/core/src/main/resources/template/simple/debug.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/debug.ftl
rename to core/src/main/resources/template/simple/debug.ftl
diff --git a/action/src/main/resources/template/simple/div-close.ftl b/core/src/main/resources/template/simple/div-close.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/div-close.ftl
rename to core/src/main/resources/template/simple/div-close.ftl
diff --git a/action/src/main/resources/template/simple/div.ftl b/core/src/main/resources/template/simple/div.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/div.ftl
rename to core/src/main/resources/template/simple/div.ftl
diff --git a/action/src/main/resources/template/simple/dojoRequire.js b/core/src/main/resources/template/simple/dojoRequire.js
similarity index 100%
rename from action/src/main/resources/template/simple/dojoRequire.js
rename to core/src/main/resources/template/simple/dojoRequire.js
diff --git a/action/src/main/resources/template/simple/doubleselect.ftl b/core/src/main/resources/template/simple/doubleselect.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/doubleselect.ftl
rename to core/src/main/resources/template/simple/doubleselect.ftl
diff --git a/action/src/main/resources/template/simple/fielderror.ftl b/core/src/main/resources/template/simple/fielderror.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/fielderror.ftl
rename to core/src/main/resources/template/simple/fielderror.ftl
diff --git a/action/src/main/resources/template/simple/file.ftl b/core/src/main/resources/template/simple/file.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/file.ftl
rename to core/src/main/resources/template/simple/file.ftl
diff --git a/action/src/main/resources/template/simple/form-close.ftl b/core/src/main/resources/template/simple/form-close.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/form-close.ftl
rename to core/src/main/resources/template/simple/form-close.ftl
diff --git a/action/src/main/resources/template/simple/form.ftl b/core/src/main/resources/template/simple/form.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/form.ftl
rename to core/src/main/resources/template/simple/form.ftl
diff --git a/action/src/main/resources/template/simple/head.ftl b/core/src/main/resources/template/simple/head.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/head.ftl
rename to core/src/main/resources/template/simple/head.ftl
diff --git a/action/src/main/resources/template/simple/hidden.ftl b/core/src/main/resources/template/simple/hidden.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/hidden.ftl
rename to core/src/main/resources/template/simple/hidden.ftl
diff --git a/action/src/main/resources/template/simple/label.ftl b/core/src/main/resources/template/simple/label.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/label.ftl
rename to core/src/main/resources/template/simple/label.ftl
diff --git a/action/src/main/resources/template/simple/optiontransferselect.ftl b/core/src/main/resources/template/simple/optiontransferselect.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/optiontransferselect.ftl
rename to core/src/main/resources/template/simple/optiontransferselect.ftl
diff --git a/action/src/main/resources/template/simple/password.ftl b/core/src/main/resources/template/simple/password.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/password.ftl
rename to core/src/main/resources/template/simple/password.ftl
diff --git a/action/src/main/resources/template/simple/radiomap.ftl b/core/src/main/resources/template/simple/radiomap.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/radiomap.ftl
rename to core/src/main/resources/template/simple/radiomap.ftl
diff --git a/action/src/main/resources/template/simple/reset.ftl b/core/src/main/resources/template/simple/reset.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/reset.ftl
rename to core/src/main/resources/template/simple/reset.ftl
diff --git a/action/src/main/resources/template/simple/richtexteditor.ftl b/core/src/main/resources/template/simple/richtexteditor.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/richtexteditor.ftl
rename to core/src/main/resources/template/simple/richtexteditor.ftl
diff --git a/action/src/main/resources/template/simple/scripting-events.ftl b/core/src/main/resources/template/simple/scripting-events.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/scripting-events.ftl
rename to core/src/main/resources/template/simple/scripting-events.ftl
diff --git a/action/src/main/resources/template/simple/select.ftl b/core/src/main/resources/template/simple/select.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/select.ftl
rename to core/src/main/resources/template/simple/select.ftl
diff --git a/action/src/main/resources/template/simple/submit.ftl b/core/src/main/resources/template/simple/submit.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/submit.ftl
rename to core/src/main/resources/template/simple/submit.ftl
diff --git a/action/src/main/resources/template/simple/tab-close.ftl b/core/src/main/resources/template/simple/tab-close.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/tab-close.ftl
rename to core/src/main/resources/template/simple/tab-close.ftl
diff --git a/action/src/main/resources/template/simple/tab.ftl b/core/src/main/resources/template/simple/tab.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/tab.ftl
rename to core/src/main/resources/template/simple/tab.ftl
diff --git a/action/src/main/resources/template/simple/tabbedpanel-close.ftl b/core/src/main/resources/template/simple/tabbedpanel-close.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/tabbedpanel-close.ftl
rename to core/src/main/resources/template/simple/tabbedpanel-close.ftl
diff --git a/action/src/main/resources/template/simple/tabbedpanel.ftl b/core/src/main/resources/template/simple/tabbedpanel.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/tabbedpanel.ftl
rename to core/src/main/resources/template/simple/tabbedpanel.ftl
diff --git a/action/src/main/resources/template/simple/table.ftl b/core/src/main/resources/template/simple/table.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/table.ftl
rename to core/src/main/resources/template/simple/table.ftl
diff --git a/action/src/main/resources/template/simple/text.ftl b/core/src/main/resources/template/simple/text.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/text.ftl
rename to core/src/main/resources/template/simple/text.ftl
diff --git a/action/src/main/resources/template/simple/textarea.ftl b/core/src/main/resources/template/simple/textarea.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/textarea.ftl
rename to core/src/main/resources/template/simple/textarea.ftl
diff --git a/action/src/main/resources/template/simple/token.ftl b/core/src/main/resources/template/simple/token.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/token.ftl
rename to core/src/main/resources/template/simple/token.ftl
diff --git a/action/src/main/resources/template/simple/updownselect.ftl b/core/src/main/resources/template/simple/updownselect.ftl
similarity index 100%
rename from action/src/main/resources/template/simple/updownselect.ftl
rename to core/src/main/resources/template/simple/updownselect.ftl
diff --git a/action/src/main/resources/template/xhtml/checkbox.ftl b/core/src/main/resources/template/xhtml/checkbox.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/checkbox.ftl
rename to core/src/main/resources/template/xhtml/checkbox.ftl
diff --git a/action/src/main/resources/template/xhtml/checkboxlist.ftl b/core/src/main/resources/template/xhtml/checkboxlist.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/checkboxlist.ftl
rename to core/src/main/resources/template/xhtml/checkboxlist.ftl
diff --git a/action/src/main/resources/template/xhtml/combobox.ftl b/core/src/main/resources/template/xhtml/combobox.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/combobox.ftl
rename to core/src/main/resources/template/xhtml/combobox.ftl
diff --git a/action/src/main/resources/template/xhtml/controlfooter.ftl b/core/src/main/resources/template/xhtml/controlfooter.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/controlfooter.ftl
rename to core/src/main/resources/template/xhtml/controlfooter.ftl
diff --git a/action/src/main/resources/template/xhtml/controlheader-core.ftl b/core/src/main/resources/template/xhtml/controlheader-core.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/controlheader-core.ftl
rename to core/src/main/resources/template/xhtml/controlheader-core.ftl
diff --git a/action/src/main/resources/template/xhtml/controlheader.ftl b/core/src/main/resources/template/xhtml/controlheader.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/controlheader.ftl
rename to core/src/main/resources/template/xhtml/controlheader.ftl
diff --git a/action/src/main/resources/template/xhtml/datepicker.ftl b/core/src/main/resources/template/xhtml/datepicker.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/datepicker.ftl
rename to core/src/main/resources/template/xhtml/datepicker.ftl
diff --git a/action/src/main/resources/template/xhtml/debug.ftl b/core/src/main/resources/template/xhtml/debug.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/debug.ftl
rename to core/src/main/resources/template/xhtml/debug.ftl
diff --git a/action/src/main/resources/template/xhtml/doubleselect.ftl b/core/src/main/resources/template/xhtml/doubleselect.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/doubleselect.ftl
rename to core/src/main/resources/template/xhtml/doubleselect.ftl
diff --git a/action/src/main/resources/template/xhtml/empty.ftl b/core/src/main/resources/template/xhtml/empty.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/empty.ftl
rename to core/src/main/resources/template/xhtml/empty.ftl
diff --git a/action/src/main/resources/template/xhtml/file.ftl b/core/src/main/resources/template/xhtml/file.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/file.ftl
rename to core/src/main/resources/template/xhtml/file.ftl
diff --git a/action/src/main/resources/template/xhtml/form-close-validate.ftl b/core/src/main/resources/template/xhtml/form-close-validate.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/form-close-validate.ftl
rename to core/src/main/resources/template/xhtml/form-close-validate.ftl
diff --git a/action/src/main/resources/template/xhtml/form-close.ftl b/core/src/main/resources/template/xhtml/form-close.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/form-close.ftl
rename to core/src/main/resources/template/xhtml/form-close.ftl
diff --git a/action/src/main/resources/template/xhtml/form-validate.ftl b/core/src/main/resources/template/xhtml/form-validate.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/form-validate.ftl
rename to core/src/main/resources/template/xhtml/form-validate.ftl
diff --git a/action/src/main/resources/template/xhtml/form.ftl b/core/src/main/resources/template/xhtml/form.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/form.ftl
rename to core/src/main/resources/template/xhtml/form.ftl
diff --git a/action/src/main/resources/template/xhtml/head.ftl b/core/src/main/resources/template/xhtml/head.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/head.ftl
rename to core/src/main/resources/template/xhtml/head.ftl
diff --git a/action/src/main/resources/template/xhtml/label.ftl b/core/src/main/resources/template/xhtml/label.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/label.ftl
rename to core/src/main/resources/template/xhtml/label.ftl
diff --git a/action/src/main/resources/template/xhtml/optiontransferselect.ftl b/core/src/main/resources/template/xhtml/optiontransferselect.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/optiontransferselect.ftl
rename to core/src/main/resources/template/xhtml/optiontransferselect.ftl
diff --git a/action/src/main/resources/template/xhtml/password.ftl b/core/src/main/resources/template/xhtml/password.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/password.ftl
rename to core/src/main/resources/template/xhtml/password.ftl
diff --git a/action/src/main/resources/template/xhtml/radiomap.ftl b/core/src/main/resources/template/xhtml/radiomap.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/radiomap.ftl
rename to core/src/main/resources/template/xhtml/radiomap.ftl
diff --git a/action/src/main/resources/template/xhtml/reset.ftl b/core/src/main/resources/template/xhtml/reset.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/reset.ftl
rename to core/src/main/resources/template/xhtml/reset.ftl
diff --git a/action/src/main/resources/template/xhtml/richtexteditor.ftl b/core/src/main/resources/template/xhtml/richtexteditor.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/richtexteditor.ftl
rename to core/src/main/resources/template/xhtml/richtexteditor.ftl
diff --git a/action/src/main/resources/template/xhtml/select.ftl b/core/src/main/resources/template/xhtml/select.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/select.ftl
rename to core/src/main/resources/template/xhtml/select.ftl
diff --git a/action/src/main/resources/template/xhtml/styles.css b/core/src/main/resources/template/xhtml/styles.css
similarity index 100%
rename from action/src/main/resources/template/xhtml/styles.css
rename to core/src/main/resources/template/xhtml/styles.css
diff --git a/action/src/main/resources/template/xhtml/submit.ftl b/core/src/main/resources/template/xhtml/submit.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/submit.ftl
rename to core/src/main/resources/template/xhtml/submit.ftl
diff --git a/action/src/main/resources/template/xhtml/text.ftl b/core/src/main/resources/template/xhtml/text.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/text.ftl
rename to core/src/main/resources/template/xhtml/text.ftl
diff --git a/action/src/main/resources/template/xhtml/textarea.ftl b/core/src/main/resources/template/xhtml/textarea.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/textarea.ftl
rename to core/src/main/resources/template/xhtml/textarea.ftl
diff --git a/action/src/main/resources/template/xhtml/theme.properties b/core/src/main/resources/template/xhtml/theme.properties
similarity index 100%
rename from action/src/main/resources/template/xhtml/theme.properties
rename to core/src/main/resources/template/xhtml/theme.properties
diff --git a/action/src/main/resources/template/xhtml/tooltip.ftl b/core/src/main/resources/template/xhtml/tooltip.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/tooltip.ftl
rename to core/src/main/resources/template/xhtml/tooltip.ftl
diff --git a/action/src/main/resources/template/xhtml/updownselect.ftl b/core/src/main/resources/template/xhtml/updownselect.ftl
similarity index 100%
rename from action/src/main/resources/template/xhtml/updownselect.ftl
rename to core/src/main/resources/template/xhtml/updownselect.ftl
diff --git a/action/src/main/resources/template/xhtml/validation.js b/core/src/main/resources/template/xhtml/validation.js
similarity index 100%
rename from action/src/main/resources/template/xhtml/validation.js
rename to core/src/main/resources/template/xhtml/validation.js
diff --git a/action/src/main/xdt/Readme-tagdoclet.txt b/core/src/main/xdt/Readme-tagdoclet.txt
similarity index 100%
rename from action/src/main/xdt/Readme-tagdoclet.txt
rename to core/src/main/xdt/Readme-tagdoclet.txt
diff --git a/action/src/main/xdt/tagdoc-toc.xdt b/core/src/main/xdt/tagdoc-toc.xdt
similarity index 100%
rename from action/src/main/xdt/tagdoc-toc.xdt
rename to core/src/main/xdt/tagdoc-toc.xdt
diff --git a/action/src/main/xdt/tagdoc.xdt b/core/src/main/xdt/tagdoc.xdt
similarity index 100%
rename from action/src/main/xdt/tagdoc.xdt
rename to core/src/main/xdt/tagdoc.xdt
diff --git a/action/src/main/xdt/taglib_tld.xdt b/core/src/main/xdt/taglib_tld.xdt
similarity index 100%
rename from action/src/main/xdt/taglib_tld.xdt
rename to core/src/main/xdt/taglib_tld.xdt
diff --git a/action/src/test/java/org/apache/struts/action2/ExecutionCountTestAction.java b/core/src/test/java/org/apache/struts/action2/ExecutionCountTestAction.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/ExecutionCountTestAction.java
rename to core/src/test/java/org/apache/struts/action2/ExecutionCountTestAction.java
diff --git a/action/src/test/java/org/apache/struts/action2/RequestUtilsTest.java b/core/src/test/java/org/apache/struts/action2/RequestUtilsTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/RequestUtilsTest.java
rename to core/src/test/java/org/apache/struts/action2/RequestUtilsTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/ServletActionContextTest.java b/core/src/test/java/org/apache/struts/action2/ServletActionContextTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/ServletActionContextTest.java
rename to core/src/test/java/org/apache/struts/action2/ServletActionContextTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/TestAction.java b/core/src/test/java/org/apache/struts/action2/TestAction.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/TestAction.java
rename to core/src/test/java/org/apache/struts/action2/TestAction.java
diff --git a/action/src/test/java/org/apache/struts/action2/TestActionTagResult.java b/core/src/test/java/org/apache/struts/action2/TestActionTagResult.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/TestActionTagResult.java
rename to core/src/test/java/org/apache/struts/action2/TestActionTagResult.java
diff --git a/action/src/test/java/org/apache/struts/action2/TestConfigurationProvider.java b/core/src/test/java/org/apache/struts/action2/TestConfigurationProvider.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/TestConfigurationProvider.java
rename to core/src/test/java/org/apache/struts/action2/TestConfigurationProvider.java
diff --git a/action/src/test/java/org/apache/struts/action2/TestResult.java b/core/src/test/java/org/apache/struts/action2/TestResult.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/TestResult.java
rename to core/src/test/java/org/apache/struts/action2/TestResult.java
diff --git a/action/src/test/java/org/apache/struts/action2/components/AbstractRichtexteditorConnectorTest.java b/core/src/test/java/org/apache/struts/action2/components/AbstractRichtexteditorConnectorTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/components/AbstractRichtexteditorConnectorTest.java
rename to core/src/test/java/org/apache/struts/action2/components/AbstractRichtexteditorConnectorTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/components/ComponentTest.java b/core/src/test/java/org/apache/struts/action2/components/ComponentTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/components/ComponentTest.java
rename to core/src/test/java/org/apache/struts/action2/components/ComponentTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/components/FormTest.java b/core/src/test/java/org/apache/struts/action2/components/FormTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/components/FormTest.java
rename to core/src/test/java/org/apache/struts/action2/components/FormTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/components/MockRichtexteditorConnector.java b/core/src/test/java/org/apache/struts/action2/components/MockRichtexteditorConnector.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/components/MockRichtexteditorConnector.java
rename to core/src/test/java/org/apache/struts/action2/components/MockRichtexteditorConnector.java
diff --git a/action/src/test/java/org/apache/struts/action2/components/PropertyTest.java b/core/src/test/java/org/apache/struts/action2/components/PropertyTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/components/PropertyTest.java
rename to core/src/test/java/org/apache/struts/action2/components/PropertyTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/components/UIComponentTest.java b/core/src/test/java/org/apache/struts/action2/components/UIComponentTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/components/UIComponentTest.java
rename to core/src/test/java/org/apache/struts/action2/components/UIComponentTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/config/ConfigurationTest.java b/core/src/test/java/org/apache/struts/action2/config/ConfigurationTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/config/ConfigurationTest.java
rename to core/src/test/java/org/apache/struts/action2/config/ConfigurationTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/config/TestConfiguration.java b/core/src/test/java/org/apache/struts/action2/config/TestConfiguration.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/config/TestConfiguration.java
rename to core/src/test/java/org/apache/struts/action2/config/TestConfiguration.java
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/AbstractServletDispatcherTestCase.java b/core/src/test/java/org/apache/struts/action2/dispatcher/AbstractServletDispatcherTestCase.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/dispatcher/AbstractServletDispatcherTestCase.java
rename to core/src/test/java/org/apache/struts/action2/dispatcher/AbstractServletDispatcherTestCase.java
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/DefautActionMapperTest.java b/core/src/test/java/org/apache/struts/action2/dispatcher/DefautActionMapperTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/dispatcher/DefautActionMapperTest.java
rename to core/src/test/java/org/apache/struts/action2/dispatcher/DefautActionMapperTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java b/core/src/test/java/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java
rename to core/src/test/java/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/FilterDispatcherTest.java b/core/src/test/java/org/apache/struts/action2/dispatcher/FilterDispatcherTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/dispatcher/FilterDispatcherTest.java
rename to core/src/test/java/org/apache/struts/action2/dispatcher/FilterDispatcherTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java b/core/src/test/java/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java
rename to core/src/test/java/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/NullActionMapper.java b/core/src/test/java/org/apache/struts/action2/dispatcher/NullActionMapper.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/dispatcher/NullActionMapper.java
rename to core/src/test/java/org/apache/struts/action2/dispatcher/NullActionMapper.java
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/PlainTextResultTest.java b/core/src/test/java/org/apache/struts/action2/dispatcher/PlainTextResultTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/dispatcher/PlainTextResultTest.java
rename to core/src/test/java/org/apache/struts/action2/dispatcher/PlainTextResultTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatchedTestAssertInterceptor.java b/core/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatchedTestAssertInterceptor.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatchedTestAssertInterceptor.java
rename to core/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatchedTestAssertInterceptor.java
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatcherResultTest.java b/core/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatcherResultTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatcherResultTest.java
rename to core/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatcherResultTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java b/core/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java
rename to core/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/ServletRedirectResultTest.java b/core/src/test/java/org/apache/struts/action2/dispatcher/ServletRedirectResultTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/dispatcher/ServletRedirectResultTest.java
rename to core/src/test/java/org/apache/struts/action2/dispatcher/ServletRedirectResultTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/SessionMapTest.java b/core/src/test/java/org/apache/struts/action2/dispatcher/SessionMapTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/dispatcher/SessionMapTest.java
rename to core/src/test/java/org/apache/struts/action2/dispatcher/SessionMapTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/StreamResultTest.java b/core/src/test/java/org/apache/struts/action2/dispatcher/StreamResultTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/dispatcher/StreamResultTest.java
rename to core/src/test/java/org/apache/struts/action2/dispatcher/StreamResultTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/VelocityResultTest.java b/core/src/test/java/org/apache/struts/action2/dispatcher/VelocityResultTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/dispatcher/VelocityResultTest.java
rename to core/src/test/java/org/apache/struts/action2/dispatcher/VelocityResultTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapperTest.java b/core/src/test/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapperTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapperTest.java
rename to core/src/test/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapperTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapperTest.java b/core/src/test/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapperTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapperTest.java
rename to core/src/test/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapperTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/interceptor/CreateSessionInterceptorTest.java b/core/src/test/java/org/apache/struts/action2/interceptor/CreateSessionInterceptorTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/interceptor/CreateSessionInterceptorTest.java
rename to core/src/test/java/org/apache/struts/action2/interceptor/CreateSessionInterceptorTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/interceptor/ExecuteAndWaitDelayAction.java b/core/src/test/java/org/apache/struts/action2/interceptor/ExecuteAndWaitDelayAction.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/interceptor/ExecuteAndWaitDelayAction.java
rename to core/src/test/java/org/apache/struts/action2/interceptor/ExecuteAndWaitDelayAction.java
diff --git a/action/src/test/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptorTest.java b/core/src/test/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptorTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptorTest.java
rename to core/src/test/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptorTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/interceptor/FileUploadInterceptorTest.java b/core/src/test/java/org/apache/struts/action2/interceptor/FileUploadInterceptorTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/interceptor/FileUploadInterceptorTest.java
rename to core/src/test/java/org/apache/struts/action2/interceptor/FileUploadInterceptorTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java b/core/src/test/java/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java
rename to core/src/test/java/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java b/core/src/test/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java
rename to core/src/test/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/interceptor/TokenInterceptorTest.java b/core/src/test/java/org/apache/struts/action2/interceptor/TokenInterceptorTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/interceptor/TokenInterceptorTest.java
rename to core/src/test/java/org/apache/struts/action2/interceptor/TokenInterceptorTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptorTest.java b/core/src/test/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptorTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptorTest.java
rename to core/src/test/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptorTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/portlet/PortletApplicationMapTest.java b/core/src/test/java/org/apache/struts/action2/portlet/PortletApplicationMapTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/portlet/PortletApplicationMapTest.java
rename to core/src/test/java/org/apache/struts/action2/portlet/PortletApplicationMapTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/portlet/PortletRequestMapTest.java b/core/src/test/java/org/apache/struts/action2/portlet/PortletRequestMapTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/portlet/PortletRequestMapTest.java
rename to core/src/test/java/org/apache/struts/action2/portlet/PortletRequestMapTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/portlet/PortletSessionMapTest.java b/core/src/test/java/org/apache/struts/action2/portlet/PortletSessionMapTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/portlet/PortletSessionMapTest.java
rename to core/src/test/java/org/apache/struts/action2/portlet/PortletSessionMapTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/portlet/context/PortletActionContextTest.java b/core/src/test/java/org/apache/struts/action2/portlet/context/PortletActionContextTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/portlet/context/PortletActionContextTest.java
rename to core/src/test/java/org/apache/struts/action2/portlet/context/PortletActionContextTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/portlet/context/PreparatorServletTest.java b/core/src/test/java/org/apache/struts/action2/portlet/context/PreparatorServletTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/portlet/context/PreparatorServletTest.java
rename to core/src/test/java/org/apache/struts/action2/portlet/context/PreparatorServletTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/portlet/context/ServletContextHolderListenerTest.java b/core/src/test/java/org/apache/struts/action2/portlet/context/ServletContextHolderListenerTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/portlet/context/ServletContextHolderListenerTest.java
rename to core/src/test/java/org/apache/struts/action2/portlet/context/ServletContextHolderListenerTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/portlet/dispatcher/Jsr168DispatcherTest.java b/core/src/test/java/org/apache/struts/action2/portlet/dispatcher/Jsr168DispatcherTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/portlet/dispatcher/Jsr168DispatcherTest.java
rename to core/src/test/java/org/apache/struts/action2/portlet/dispatcher/Jsr168DispatcherTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/portlet/result/PortletResultTest.java b/core/src/test/java/org/apache/struts/action2/portlet/result/PortletResultTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/portlet/result/PortletResultTest.java
rename to core/src/test/java/org/apache/struts/action2/portlet/result/PortletResultTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/portlet/util/PortletUrlHelperTest.java b/core/src/test/java/org/apache/struts/action2/portlet/util/PortletUrlHelperTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/portlet/util/PortletUrlHelperTest.java
rename to core/src/test/java/org/apache/struts/action2/portlet/util/PortletUrlHelperTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/portlet/util/StrutsUtilTest.java b/core/src/test/java/org/apache/struts/action2/portlet/util/StrutsUtilTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/portlet/util/StrutsUtilTest.java
rename to core/src/test/java/org/apache/struts/action2/portlet/util/StrutsUtilTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java b/core/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java
rename to core/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java b/core/src/test/java/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java
rename to core/src/test/java/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/util/CounterTest.java b/core/src/test/java/org/apache/struts/action2/util/CounterTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/util/CounterTest.java
rename to core/src/test/java/org/apache/struts/action2/util/CounterTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/util/InvocationSessionStoreTest.java b/core/src/test/java/org/apache/struts/action2/util/InvocationSessionStoreTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/util/InvocationSessionStoreTest.java
rename to core/src/test/java/org/apache/struts/action2/util/InvocationSessionStoreTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/util/PrefixTrieTest.java b/core/src/test/java/org/apache/struts/action2/util/PrefixTrieTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/util/PrefixTrieTest.java
rename to core/src/test/java/org/apache/struts/action2/util/PrefixTrieTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/util/StrutsTypeConverterTest.java b/core/src/test/java/org/apache/struts/action2/util/StrutsTypeConverterTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/util/StrutsTypeConverterTest.java
rename to core/src/test/java/org/apache/struts/action2/util/StrutsTypeConverterTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/util/TokenHelperTest.java b/core/src/test/java/org/apache/struts/action2/util/TokenHelperTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/util/TokenHelperTest.java
rename to core/src/test/java/org/apache/struts/action2/util/TokenHelperTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/TemplateEngineManagerTest.java b/core/src/test/java/org/apache/struts/action2/views/TemplateEngineManagerTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/TemplateEngineManagerTest.java
rename to core/src/test/java/org/apache/struts/action2/views/TemplateEngineManagerTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java b/core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java
rename to core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerTest.java b/core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerTest.java
rename to core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/freemarker/TestAction.java b/core/src/test/java/org/apache/struts/action2/views/freemarker/TestAction.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/freemarker/TestAction.java
rename to core/src/test/java/org/apache/struts/action2/views/freemarker/TestAction.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/freemarker/TestBean.java b/core/src/test/java/org/apache/struts/action2/views/freemarker/TestBean.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/freemarker/TestBean.java
rename to core/src/test/java/org/apache/struts/action2/views/freemarker/TestBean.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/AbstractTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/AbstractTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/AbstractTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/AbstractTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/AbstractUITagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/AbstractUITagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/AbstractUITagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/AbstractUITagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ActionTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ActionTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ActionTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ActionTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/AnchorTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/AnchorTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/AnchorTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/AnchorTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/AppendIteratorTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/AppendIteratorTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/AppendIteratorTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/AppendIteratorTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/BeanTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/BeanTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/BeanTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/BeanTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ElseIfTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ElseIfTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ElseIfTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ElseIfTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ElseTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ElseTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ElseTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ElseTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/IfTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/IfTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/IfTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/IfTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/IncludeTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/IncludeTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/IncludeTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/IncludeTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/IteratorGeneratorTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/IteratorGeneratorTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/IteratorGeneratorTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/IteratorGeneratorTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/IteratorTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/IteratorTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/IteratorTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/IteratorTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/MergeIteratorTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/MergeIteratorTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/MergeIteratorTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/MergeIteratorTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java
similarity index 99%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java
index 2acff01e1..b692758a7 100644
--- a/action/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java
+++ b/core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Copyright 2006 The Apache Software Foundation.
  *
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/PropertyTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/PropertyTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/PropertyTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/PropertyTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/PushTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/PushTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/PushTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/PushTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/SetTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/SetTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/SetTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/SetTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/SortIteratorTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/SortIteratorTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/SortIteratorTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/SortIteratorTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockBodyContent.java b/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockBodyContent.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockBodyContent.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockBodyContent.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpServletRequest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpServletRequest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpServletRequest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpServletRequest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpServletResponse.java b/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpServletResponse.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpServletResponse.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpServletResponse.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpSession.java b/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpSession.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpSession.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpSession.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockJspWriter.java b/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockJspWriter.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockJspWriter.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockJspWriter.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockPageContext.java b/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockPageContext.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockPageContext.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockPageContext.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockServletContext.java b/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockServletContext.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockServletContext.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockServletContext.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/SubsetIteratorTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/SubsetIteratorTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/SubsetIteratorTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/SubsetIteratorTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/TextTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/TextTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/TextTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/TextTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/URLTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/URLTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/URLTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/URLTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/AnchorTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/AnchorTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/AnchorTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/AnchorTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/CheckboxTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/CheckboxTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/CheckboxTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/CheckboxTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/ComponentTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/ComponentTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/ComponentTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/ComponentTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/DateTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/DateTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/DateTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/DateTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/DebugTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/DebugTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/DebugTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/DebugTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/DivTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/DivTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/DivTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/DivTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/FileTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/FileTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/FileTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/FileTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/FormTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/FormTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/FormTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/FormTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/HeadTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/HeadTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/HeadTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/HeadTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/HiddenTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/HiddenTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/HiddenTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/HiddenTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/JspTemplateTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/JspTemplateTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/JspTemplateTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/JspTemplateTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/LabelTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/LabelTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/LabelTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/LabelTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/MockTag.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/MockTag.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/MockTag.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/MockTag.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/PasswordTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/PasswordTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/PasswordTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/PasswordTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/RadioTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/RadioTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/RadioTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/RadioTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/ResetTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/ResetTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/ResetTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/ResetTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResultTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResultTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResultTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResultTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResultTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResultTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResultTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResultTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/SelectTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/SelectTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/SelectTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/SelectTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/StrutsBodyContent.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/StrutsBodyContent.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/StrutsBodyContent.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/StrutsBodyContent.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/SubmitTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/SubmitTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/SubmitTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/SubmitTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/TestAction1.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TestAction1.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/TestAction1.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/TestAction1.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/TextareaTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TextareaTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/TextareaTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/TextareaTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/TextfieldTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TextfieldTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/TextfieldTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/TextfieldTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/TokenTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TokenTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/TokenTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/TokenTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/TooltipTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TooltipTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/TooltipTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/TooltipTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTagTest.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTagTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTagTest.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTagTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ui/User.java b/core/src/test/java/org/apache/struts/action2/views/jsp/ui/User.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/jsp/ui/User.java
rename to core/src/test/java/org/apache/struts/action2/views/jsp/ui/User.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/util/ContextUtilTest.java b/core/src/test/java/org/apache/struts/action2/views/util/ContextUtilTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/util/ContextUtilTest.java
rename to core/src/test/java/org/apache/struts/action2/views/util/ContextUtilTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/util/ResourceUtilTest.java b/core/src/test/java/org/apache/struts/action2/views/util/ResourceUtilTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/util/ResourceUtilTest.java
rename to core/src/test/java/org/apache/struts/action2/views/util/ResourceUtilTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/util/TextUtilTest.java b/core/src/test/java/org/apache/struts/action2/views/util/TextUtilTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/util/TextUtilTest.java
rename to core/src/test/java/org/apache/struts/action2/views/util/TextUtilTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/util/UrlHelperTest.java b/core/src/test/java/org/apache/struts/action2/views/util/UrlHelperTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/util/UrlHelperTest.java
rename to core/src/test/java/org/apache/struts/action2/views/util/UrlHelperTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/views/xslt/XSLTResultTest.java b/core/src/test/java/org/apache/struts/action2/views/xslt/XSLTResultTest.java
similarity index 100%
rename from action/src/test/java/org/apache/struts/action2/views/xslt/XSLTResultTest.java
rename to core/src/test/java/org/apache/struts/action2/views/xslt/XSLTResultTest.java
diff --git a/action/src/test/resources/XSLTResultTest.xsl b/core/src/test/resources/XSLTResultTest.xsl
similarity index 100%
rename from action/src/test/resources/XSLTResultTest.xsl
rename to core/src/test/resources/XSLTResultTest.xsl
diff --git a/action/src/test/resources/XSLTResultTest2.xsl b/core/src/test/resources/XSLTResultTest2.xsl
similarity index 100%
rename from action/src/test/resources/XSLTResultTest2.xsl
rename to core/src/test/resources/XSLTResultTest2.xsl
diff --git a/action/src/test/resources/XSLTResultTest3.xsl b/core/src/test/resources/XSLTResultTest3.xsl
similarity index 100%
rename from action/src/test/resources/XSLTResultTest3.xsl
rename to core/src/test/resources/XSLTResultTest3.xsl
diff --git a/action/src/test/resources/log4j.properties b/core/src/test/resources/log4j.properties
similarity index 100%
rename from action/src/test/resources/log4j.properties
rename to core/src/test/resources/log4j.properties
diff --git a/action/src/test/resources/org/apache/struts/action2/TestAction-validation.xml b/core/src/test/resources/org/apache/struts/action2/TestAction-validation.xml
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/TestAction-validation.xml
rename to core/src/test/resources/org/apache/struts/action2/TestAction-validation.xml
diff --git a/action/src/test/resources/org/apache/struts/action2/TestAction.properties b/core/src/test/resources/org/apache/struts/action2/TestAction.properties
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/TestAction.properties
rename to core/src/test/resources/org/apache/struts/action2/TestAction.properties
diff --git a/action/src/test/resources/org/apache/struts/action2/components/tempo.properties b/core/src/test/resources/org/apache/struts/action2/components/tempo.properties
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/components/tempo.properties
rename to core/src/test/resources/org/apache/struts/action2/components/tempo.properties
diff --git a/action/src/test/resources/org/apache/struts/action2/dispatcher/ServletDispatcherTest-xwork.xml b/core/src/test/resources/org/apache/struts/action2/dispatcher/ServletDispatcherTest-xwork.xml
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/dispatcher/ServletDispatcherTest-xwork.xml
rename to core/src/test/resources/org/apache/struts/action2/dispatcher/ServletDispatcherTest-xwork.xml
diff --git a/action/src/test/resources/org/apache/struts/action2/dispatcher/someJspFile.jsp b/core/src/test/resources/org/apache/struts/action2/dispatcher/someJspFile.jsp
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/dispatcher/someJspFile.jsp
rename to core/src/test/resources/org/apache/struts/action2/dispatcher/someJspFile.jsp
diff --git a/action/src/test/resources/org/apache/struts/action2/interceptor/FileUploadInterceptor.properties b/core/src/test/resources/org/apache/struts/action2/interceptor/FileUploadInterceptor.properties
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/interceptor/FileUploadInterceptor.properties
rename to core/src/test/resources/org/apache/struts/action2/interceptor/FileUploadInterceptor.properties
diff --git a/action/src/test/resources/org/apache/struts/action2/othertest.properties b/core/src/test/resources/org/apache/struts/action2/othertest.properties
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/othertest.properties
rename to core/src/test/resources/org/apache/struts/action2/othertest.properties
diff --git a/action/src/test/resources/org/apache/struts/action2/sitegraph/hello.jsp b/core/src/test/resources/org/apache/struts/action2/sitegraph/hello.jsp
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/sitegraph/hello.jsp
rename to core/src/test/resources/org/apache/struts/action2/sitegraph/hello.jsp
diff --git a/action/src/test/resources/org/apache/struts/action2/sitegraph/out.txt b/core/src/test/resources/org/apache/struts/action2/sitegraph/out.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/sitegraph/out.txt
rename to core/src/test/resources/org/apache/struts/action2/sitegraph/out.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-error.ftl b/core/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-error.ftl
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-error.ftl
rename to core/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-error.ftl
diff --git a/action/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-input.ftl b/core/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-input.ftl
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-input.ftl
rename to core/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-input.ftl
diff --git a/action/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-success.jsp b/core/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-success.jsp
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-success.jsp
rename to core/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-success.jsp
diff --git a/action/src/test/resources/org/apache/struts/action2/sitegraph/xwork.xml b/core/src/test/resources/org/apache/struts/action2/sitegraph/xwork.xml
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/sitegraph/xwork.xml
rename to core/src/test/resources/org/apache/struts/action2/sitegraph/xwork.xml
diff --git a/action/src/test/resources/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml b/core/src/test/resources/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml
rename to core/src/test/resources/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-3.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-3.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-3.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-3.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-4.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-4.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-4.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-4.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-5.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-5.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-5.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-5.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-3.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-3.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-3.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-3.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-4.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-4.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-4.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-4.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-3.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-3.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-3.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-3.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-param.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-param.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-param.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-param.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/DoubleSelect-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/DoubleSelect-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/DoubleSelect-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/DoubleSelect-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/DoubleSelect-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/DoubleSelect-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/DoubleSelect-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/DoubleSelect-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/File-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/File-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/File-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/File-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-3.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-3.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-3.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-3.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-4.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-4.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-4.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-4.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-5.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-5.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-5.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-5.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-6.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-6.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-6.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-6.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-7.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-7.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-7.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-7.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-8.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-8.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-8.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-8.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-3.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-3.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-3.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-3.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-4.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-4.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-4.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-4.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Hidden-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Hidden-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Hidden-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Hidden-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-3.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-3.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-3.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-3.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Password-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Password-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Password-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Password-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-3.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-3.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-3.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-3.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-4.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-4.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-4.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-4.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResultTest1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResultTest1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResultTest1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResultTest1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest3.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest3.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest3.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest3.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResultTest1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResultTest1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResultTest1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResultTest1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-3.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-3.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-3.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-3.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-4.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-4.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-4.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-4.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-5.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-5.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-5.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-5.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-6.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-6.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-6.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-6.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-3.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-3.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-3.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-3.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-4.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-4.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-4.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-4.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-5.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-5.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-5.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-5.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-6.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-6.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-6.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-6.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1.properties b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1.properties
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1.properties
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1.properties
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1_de.properties b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1_de.properties
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1_de.properties
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1_de.properties
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1_fr.properties b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1_fr.properties
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1_fr.properties
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1_fr.properties
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textarea-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textarea-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textarea-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textarea-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-3.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-3.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-3.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-3.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/User-validation.xml b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/User-validation.xml
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/User-validation.xml
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/User-validation.xml
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/User.properties b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/User.properties
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/User.properties
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/User.properties
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionerror-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionerror-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionerror-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionerror-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionerror-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionerror-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionerror-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionerror-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionmessage-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionmessage-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionmessage-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionmessage-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionmessage-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionmessage-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionmessage-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionmessage-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/div-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/div-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/div-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/div-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-3.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-3.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-3.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-3.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-4.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-4.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-4.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-4.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-5.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-5.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-5.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-5.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/href-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/href-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/href-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/href-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-3.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-3.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-3.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-3.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-4.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-4.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-4.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-4.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-5.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-5.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-5.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-5.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-6.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-6.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-6.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-6.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-7.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-7.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-7.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-7.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-3.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-3.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-3.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-3.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-4.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-4.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-4.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-4.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/submit-ajax-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/submit-ajax-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/submit-ajax-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/submit-ajax-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-3.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-3.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-3.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-3.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-1.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-1.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-1.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-1.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-10.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-10.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-10.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-10.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-11.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-11.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-11.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-11.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-2.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-2.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-2.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-2.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-3.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-3.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-3.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-3.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-4.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-4.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-4.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-4.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-5.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-5.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-5.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-5.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-6.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-6.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-6.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-6.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-7.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-7.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-7.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-7.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-8.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-8.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-8.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-8.txt
diff --git a/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-9.txt b/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-9.txt
similarity index 100%
rename from action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-9.txt
rename to core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-9.txt
diff --git a/action/src/test/resources/struts.properties b/core/src/test/resources/struts.properties
similarity index 100%
rename from action/src/test/resources/struts.properties
rename to core/src/test/resources/struts.properties
diff --git a/action/src/test/resources/template/test/Component.ftl b/core/src/test/resources/template/test/Component.ftl
similarity index 100%
rename from action/src/test/resources/template/test/Component.ftl
rename to core/src/test/resources/template/test/Component.ftl
diff --git a/action/src/test/resources/template/test/checkbox.jsp b/core/src/test/resources/template/test/checkbox.jsp
similarity index 100%
rename from action/src/test/resources/template/test/checkbox.jsp
rename to core/src/test/resources/template/test/checkbox.jsp
diff --git a/action/src/test/resources/test.properties b/core/src/test/resources/test.properties
similarity index 100%
rename from action/src/test/resources/test.properties
rename to core/src/test/resources/test.properties
diff --git a/action/src/test/resources/testmessages.properties b/core/src/test/resources/testmessages.properties
similarity index 100%
rename from action/src/test/resources/testmessages.properties
rename to core/src/test/resources/testmessages.properties
diff --git a/action/src/test/resources/testmessages2.properties b/core/src/test/resources/testmessages2.properties
similarity index 100%
rename from action/src/test/resources/testmessages2.properties
rename to core/src/test/resources/testmessages2.properties
diff --git a/action/src/test/resources/validators.xml b/core/src/test/resources/validators.xml
similarity index 100%
rename from action/src/test/resources/validators.xml
rename to core/src/test/resources/validators.xml
diff --git a/action/src/test/resources/xwork.xml b/core/src/test/resources/xwork.xml
similarity index 100%
rename from action/src/test/resources/xwork.xml
rename to core/src/test/resources/xwork.xml
diff --git a/osbuild.xml b/osbuild.xml
index f05e65382..52316947f 100644
--- a/osbuild.xml
+++ b/osbuild.xml
@@ -30,7 +30,7 @@
     <property name="lib.build" value="${lib}/build"/>
     <property name="lib.optional" value="${lib}/optional"/>
 
-    <property name="src" location="action/src"/>
+    <property name="src" location="core/src"/>
     <property name="src.java" value="${src}/main/java"/>
     <property name="src.test" value="${src}/test/java/"/>
 
@@ -342,7 +342,7 @@
     <!-- =================================================================== -->
     <target name="fixcrlf" description="Fixed CR/LF problems">
         <echo>Running fixcrlf....</echo>
-         <fixcrlf eol="lf" srcdir="${basedir}/action/src"
+         <fixcrlf eol="lf" srcdir="${basedir}/core/src"
                  includes="**/*.sh,
                       **/*.properties,
                       **/*.sql,
diff --git a/pom.xml b/pom.xml
index 80af177ab..b2d07b749 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,8 +85,8 @@
         </mailingList>
     </mailingLists>
     <modules>
-        <module>action-api</module>
-        <module>action</module>
+        <module>core</module>
+        <module>thirdparty</module>
         <module>webapps</module>
     </modules>
     <repositories>
@@ -203,346 +203,5 @@
             </plugin>
         </plugins>
     </build>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.struts.action2</groupId>
-                <artifactId>action-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.struts.action2</groupId>
-                <artifactId>action</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.struts.action2</groupId>
-                <version>${project.version}</version>
-                <artifactId>action-jasperreports</artifactId>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.struts.action2</groupId>
-                <version>${project.version}</version>
-                <artifactId>action-jfreechart</artifactId>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.struts.action2</groupId>
-                <version>${project.version}</version>
-                <artifactId>action-pell-file-upload</artifactId>
-            </dependency>
-
-            <dependency>
-                <groupId>opensymphony</groupId>
-                <artifactId>xwork</artifactId>
-                <version>1.2-SNAPSHOT</version>
-            </dependency>
-
-            <dependency>
-                <groupId>freemarker</groupId>
-                <artifactId>freemarker</artifactId>
-                <version>2.3.4</version>
-            </dependency>
-
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>2.4</version>
-            </dependency>
-
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>jsp-api</artifactId>
-                <version>2.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>1.0.4</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-lang</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>2.0</version>
-            </dependency>
-
-            <!-- Ajax -->
-            <dependency>
-                <groupId>uk.ltd.getahead</groupId>
-                <artifactId>dwr</artifactId>
-                <version>1.1-beta-3</version>
-            </dependency>
-
-            <!-- Velocity -->
-            <dependency>
-                <groupId>velocity</groupId>
-                <artifactId>velocity</artifactId>
-                <version>1.4</version>
-            </dependency>
-
-            <dependency>
-                <groupId>velocity-tools</groupId>
-                <artifactId>velocity-tools</artifactId>
-                <version>1.1</version>
-            </dependency>
-
-            <!-- File upload -->
-            <dependency>
-                <groupId>commons-fileupload</groupId>
-                <artifactId>commons-fileupload</artifactId>
-                <version>1.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>servlets.com</groupId>
-                <artifactId>cos</artifactId>
-                <version>05Nov2002</version>
-            </dependency>
-
-            <dependency>
-                <groupId>opensymphony</groupId>
-                <artifactId>pell-multipart</artifactId>
-                <version>2.1.5</version>
-            </dependency>
-
-            <!-- Sitemesh -->
-            <dependency>
-                <groupId>opensymphony</groupId>
-                <artifactId>sitemesh</artifactId>
-                <version>2.2.1</version>
-            </dependency>
-
-            <!-- Quickstart -->
-            <dependency>
-                <groupId>jetty</groupId>
-                <artifactId>org.mortbay.jetty</artifactId>
-                <version>5.1.4</version>
-            </dependency>
-
-            <dependency>
-                <groupId>eclipse</groupId>
-                <artifactId>jdtcore</artifactId>
-                <version>3.1.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>ant</groupId>
-                <artifactId>ant</artifactId>
-                <version>1.6.5</version>
-            </dependency>
-
-            <dependency>
-                <groupId>tomcat</groupId>
-                <artifactId>jasper-runtime</artifactId>
-                <version>5.5.12</version>
-            </dependency>
-
-            <dependency>
-                <groupId>tomcat</groupId>
-                <artifactId>jasper-compiler</artifactId>
-                <version>5.5.12</version>
-            </dependency>
-
-            <dependency>
-                <groupId>tomcat</groupId>
-                <artifactId>jasper-compiler-jdt</artifactId>
-                <version>5.5.12</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-el</groupId>
-                <artifactId>commons-el</artifactId>
-                <version>1.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>1.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-lang</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>2.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>jspapi</groupId>
-                <artifactId>jsp-api</artifactId>
-                <version>2.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
-                <version>2.1.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>xstream</groupId>
-                <artifactId>xstream</artifactId>
-                <version>1.1.2</version>
-            </dependency>
-
-            <!-- Tiles -->
-            <dependency>
-                <groupId>org.apache.struts.tiles</groupId>
-                <artifactId>tiles-core</artifactId>
-                <version>0.2-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-digester</groupId>
-                <artifactId>commons-digester</artifactId>
-                <version>1.7</version>
-            </dependency>
-
-            <!-- Portlet -->
-            <dependency>
-                <groupId>portlet-api</groupId>
-                <artifactId>portlet-api</artifactId>
-                <version>1.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto</artifactId>
-                <version>1.0.1-rc4</version>
-            </dependency>
-
-            <!-- Plexus -->
-            <dependency>
-                <groupId>org.codehaus.plexus</groupId>
-                <artifactId>plexus-container-default</artifactId>
-                <version>1.0-alpha-10-SNAPSHOT</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>
-
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-mock</artifactId>
-                <version>1.2.6</version>
-            </dependency>
-
-            <!-- Test dependencies -->
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>3.8.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>jmock</groupId>
-                <artifactId>jmock</artifactId>
-                <version>1.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>easymock</groupId>
-                <artifactId>easymock</artifactId>
-                <version>2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>easymock</groupId>
-                <artifactId>easymockclassextension</artifactId>
-                <version>1.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>jmock</groupId>
-                <artifactId>jmock-cglib</artifactId>
-                <version>1.0.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>mockobjects</groupId>
-                <artifactId>mockobjects-core</artifactId>
-                <version>0.09</version>
-            </dependency>
-
-            <dependency>
-                <groupId>mockobjects</groupId>
-                <artifactId>mockobjects-jdk1.3</artifactId>
-                <version>0.09</version>
-            </dependency>
-
-            <dependency>
-                <groupId>mockobjects</groupId>
-                <artifactId>mockobjects-alt-jdk1.3</artifactId>
-                <version>0.09</version>
-            </dependency>
-
-            <dependency>
-                <groupId>mockobjects</groupId>
-                <artifactId>mockobjects-alt-jdk1.3-j2ee1.3</artifactId>
-                <version>0.09</version>
-            </dependency>
-
-            <dependency>
-                <groupId>mockobjects</groupId>
-                <artifactId>mockobjects-jdk1.3-j2ee1.3</artifactId>
-                <version>0.09</version>
-            </dependency>
-
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.9</version>
-            </dependency>
-
-            <dependency>
-                <groupId>jasperreports</groupId>
-                <artifactId>jasperreports</artifactId>
-                <version>1.1.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>jasperreports</groupId>
-                <artifactId>jasperreports</artifactId>
-                <version>1.1.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>jfree</groupId>
-                <artifactId>jfreechart</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>opensymphony</groupId>
-                <artifactId>pell-multipart</artifactId>
-                <version>2.1.5</version>
-            </dependency>
-
-            <dependency>
-                <groupId>cewolf</groupId>
-                <artifactId>cewolf</artifactId>
-                <version>1.0</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+    
 </project>
diff --git a/src/site/site.xml b/src/site/site.xml
index 410c56d5d..f1ecc7f06 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -30,7 +30,7 @@
         <menu name="Documentation">
             <item
                     name="Javadoc"
-                    href="apidocs/index.html"
+                    href="core/apidocs/index.html"
                     />        
             <item
                     name="Source Repository"
diff --git a/thirdparty/jasperreports/pom.xml b/thirdparty/jasperreports/pom.xml
index 60871e914..a72132607 100644
--- a/thirdparty/jasperreports/pom.xml
+++ b/thirdparty/jasperreports/pom.xml
@@ -8,20 +8,36 @@
       <version>2.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.struts.action2</groupId>
-    <artifactId>action-jasperreports</artifactId>
+    <artifactId>struts-jasperreports</artifactId>
     <packaging>jar</packaging>
     <name>JasperReports</name>
+    
+    <distributionManagement>
+        <site>
+            <id>apache-site</id>
+            <url>scp://people.apache.org/www/struts.apache.org/struts-action2/thirdparty/jasperreports</url>
+        </site>
+    </distributionManagement>
+    
     <dependencies>
+    
+        <dependency>
+           <groupId>javax.servlet</groupId>
+           <artifactId>servlet-api</artifactId>
+           <version>2.4</version>
+           <scope>provided</scope>
+        </dependency>
+    
+        <dependency>
+            <groupId>org.apache.struts.action2</groupId>
+            <artifactId>struts-core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+      
         <dependency>
             <groupId>jasperreports</groupId>
             <artifactId>jasperreports</artifactId>
             <version>1.2.1</version>
         </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/thirdparty/jfreechart/pom.xml b/thirdparty/jfreechart/pom.xml
index 92e0c801e..5440f6cbe 100644
--- a/thirdparty/jfreechart/pom.xml
+++ b/thirdparty/jfreechart/pom.xml
@@ -8,13 +8,22 @@
       <version>2.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.struts.action2</groupId>
-    <artifactId>action-jfreechart</artifactId>
+    <artifactId>struts-jfreechart</artifactId>
     <packaging>jar</packaging>
-    <name>JFree Chart</name>
+    <name>JFreeChart</name>
+    
+    <distributionManagement>
+        <site>
+            <id>apache-site</id>
+            <url>scp://people.apache.org/www/struts.apache.org/struts-action2/thirdparty/jfreechart</url>
+        </site>
+    </distributionManagement>
+    
     <dependencies>
         <dependency>
             <groupId>jfree</groupId>
             <artifactId>jfreechart</artifactId>
+            <version>1.0.0</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -23,11 +32,18 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        
+        <dependency>
+           <groupId>javax.servlet</groupId>
+           <artifactId>servlet-api</artifactId>
+           <version>2.4</version>
+           <scope>provided</scope>
+        </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
+            <groupId>org.apache.struts.action2</groupId>
+            <artifactId>struts-core</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
diff --git a/thirdparty/pell-file-upload/pom.xml b/thirdparty/pell-file-upload/pom.xml
index 654a218ee..1886b7600 100644
--- a/thirdparty/pell-file-upload/pom.xml
+++ b/thirdparty/pell-file-upload/pom.xml
@@ -8,25 +8,38 @@
       <version>2.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.struts.action2</groupId>
-    <artifactId>action-pell-file-upload</artifactId>
+    <artifactId>struts-pell-file-upload</artifactId>
     <packaging>jar</packaging>
     <name>Pell File Upload</name>
+    
+    <distributionManagement>
+        <site>
+            <id>apache-site</id>
+            <url>scp://people.apache.org/www/struts.apache.org/struts-action2/thirdparty/pell-file-upload</url>
+        </site>
+    </distributionManagement>
+    
     <dependencies>
+    
+      
+        <dependency>
+           <groupId>javax.servlet</groupId>
+           <artifactId>servlet-api</artifactId>
+           <version>2.4</version>
+           <scope>provided</scope>
+        </dependency>
+      
         <dependency>
             <groupId>opensymphony</groupId>
             <artifactId>pell-multipart</artifactId>
+            <version>2.1.5</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>  
-
-		<dependency>
-        	<groupId>commons-logging</groupId>
-        	<artifactId>commons-logging</artifactId>
+            <groupId>org.apache.struts.action2</groupId>
+            <artifactId>struts-core</artifactId>
+            <version>${pom.version}</version>
         </dependency>    
     </dependencies>
 </project>
diff --git a/thirdparty/pom.xml b/thirdparty/pom.xml
index 1415b4b75..90f6f7a24 100644
--- a/thirdparty/pom.xml
+++ b/thirdparty/pom.xml
@@ -11,15 +11,17 @@
     <artifactId>thirdparty</artifactId>
     <packaging>pom</packaging>
     <name>Third Party Modules</name>
+    
+    <distributionManagement>
+        <site>
+            <id>apache-site</id>
+            <url>scp://people.apache.org/www/struts.apache.org/struts-action2/thirdparty</url>
+        </site>
+    </distributionManagement>
+    
     <modules>
         <module>jasperreports</module>
         <module>jfreechart</module>
         <module>pell-file-upload</module>
     </modules>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.struts.action2</groupId>
-            <artifactId>action</artifactId>
-        </dependency>
-    </dependencies>
 </project>
diff --git a/webapps/blank/pom.xml b/webapps/blank/pom.xml
index fe8f5b51d..5b6b0d9a8 100644
--- a/webapps/blank/pom.xml
+++ b/webapps/blank/pom.xml
@@ -4,14 +4,28 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
       <groupId>org.apache.struts.action2</groupId>
-      <artifactId>webapps</artifactId>
+      <artifactId>struts-apps</artifactId>
       <version>2.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.struts.action2</groupId>
-    <artifactId>webapp-blank</artifactId>
+    <artifactId>struts-blank</artifactId>
     <packaging>war</packaging>
     <name>Blank Webapp</name>
     <dependencies>
+      
+      <dependency>
+         <groupId>javax.servlet</groupId>
+         <artifactId>servlet-api</artifactId>
+         <version>2.4</version>
+         <scope>provided</scope>
+      </dependency>
+      
+      <dependency>
+          <groupId>org.apache.struts.action2</groupId>
+          <artifactId>struts-core</artifactId>
+          <version>${pom.version}</version>
+      </dependency>
+    
     </dependencies>
     
     <build>
@@ -33,4 +47,6 @@
     		</plugin>
     	</plugins>
     </build>
+    
+    
 </project>
diff --git a/webapps/pom.xml b/webapps/pom.xml
index f18aa963b..829f8c2d6 100644
--- a/webapps/pom.xml
+++ b/webapps/pom.xml
@@ -8,7 +8,7 @@
         <version>2.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.struts.action2</groupId>
-    <artifactId>webapps</artifactId>
+    <artifactId>struts-apps</artifactId>
     <packaging>pom</packaging>
     <name>Webapps</name>
     <modules>
@@ -18,6 +18,14 @@
         <module>showcase</module>
         <module>starter</module>
     </modules>
+    
+     <distributionManagement>
+        <site>
+            <id>apache-site</id>
+            <url>scp://people.apache.org/www/struts.apache.org/struts-action2/webapps</url>
+        </site>
+    </distributionManagement>
+    
     <profiles>
         <profile>
             <id>hostedqa</id>
@@ -87,16 +95,13 @@
             </build>
         </profile>
     </profiles>
+    
     <dependencies>
+    
         <dependency>
             <groupId>org.apache.struts.action2</groupId>
-            <artifactId>action</artifactId>
+            <artifactId>struts-core</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+    </dependencies>    
 </project>
diff --git a/webapps/portlet/pom.xml b/webapps/portlet/pom.xml
index 8d13a9f1d..70fabdfa7 100644
--- a/webapps/portlet/pom.xml
+++ b/webapps/portlet/pom.xml
@@ -4,25 +4,21 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
       <groupId>org.apache.struts.action2</groupId>
-      <artifactId>webapps</artifactId>
+      <artifactId>struts-apps</artifactId>
       <version>2.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.struts.action2</groupId>
-    <artifactId>webapp-portlet</artifactId>
+    <artifactId>struts-portlet</artifactId>
     <packaging>war</packaging>
     <name>Portet Webapp</name>
     <dependencies>
         <dependency>
             <groupId>portlet-api</groupId>
             <artifactId>portlet-api</artifactId>
+            <version>1.0</version>
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>cewolf</groupId>
             <artifactId>cewolf</artifactId>
@@ -34,5 +30,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        
+        <dependency>
+           <groupId>javax.servlet</groupId>
+           <artifactId>servlet-api</artifactId>
+           <version>2.4</version>
+           <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/webapps/shopping-cart/pom.xml b/webapps/shopping-cart/pom.xml
index 0a1ce934d..be8c7a668 100644
--- a/webapps/shopping-cart/pom.xml
+++ b/webapps/shopping-cart/pom.xml
@@ -4,14 +4,28 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
       <groupId>org.apache.struts.action2</groupId>
-      <artifactId>webapps</artifactId>
+      <artifactId>struts-apps</artifactId>
       <version>2.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.struts.action2</groupId>
-    <artifactId>webapp-shopping-cart</artifactId>
+    <artifactId>struts-shopping-cart</artifactId>
     <packaging>war</packaging>
     <name>Shopping Cart Webapp</name>
     <dependencies>
+      
+      <dependency>
+         <groupId>javax.servlet</groupId>
+         <artifactId>servlet-api</artifactId>
+         <version>2.4</version>
+         <scope>provided</scope>
+      </dependency>
+      
+      <dependency>
+          <groupId>org.apache.struts.action2</groupId>
+          <artifactId>struts-core</artifactId>
+          <version>${pom.version}</version>
+      </dependency>
+    
     </dependencies>
     
     <build>
diff --git a/webapps/showcase/pom.xml b/webapps/showcase/pom.xml
index 84d374473..1a2a1e9d4 100644
--- a/webapps/showcase/pom.xml
+++ b/webapps/showcase/pom.xml
@@ -4,11 +4,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.struts.action2</groupId>
-        <artifactId>webapps</artifactId>
+        <artifactId>struts-apps</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.struts.action2</groupId>
-    <artifactId>webapp-showcase</artifactId>
+    <artifactId>struts-showcase</artifactId>
     <packaging>war</packaging>
     <name>Showcase Webapp</name>
     <profiles>
@@ -25,54 +25,23 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.struts.action2</groupId>
-            <artifactId>action-jasperreports</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>opensymphony</groupId>
-            <artifactId>sitemesh</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>uk.ltd.getahead</groupId>
-            <artifactId>dwr</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>jasperreports</groupId>
-            <artifactId>jasperreports</artifactId>
-            <version>1.2.1</version>
+            <artifactId>struts-jasperreports</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         
         <dependency>
-        	<groupId>org.apache.struts.action2</groupId>
-        	<artifactId>action-jasperreports</artifactId>
-        </dependency>	
+           <groupId>javax.servlet</groupId>
+           <artifactId>servlet-api</artifactId>
+           <version>2.4</version>
+           <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>opensymphony</groupId>
+            <artifactId>sitemesh</artifactId>
+            <version>2.2.1</version>
+        </dependency>
+        
     </dependencies>
     
     <build>
diff --git a/webapps/starter/pom.xml b/webapps/starter/pom.xml
index 8d0db59cf..c6bf5d246 100644
--- a/webapps/starter/pom.xml
+++ b/webapps/starter/pom.xml
@@ -4,14 +4,29 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
       <groupId>org.apache.struts.action2</groupId>
-      <artifactId>webapps</artifactId>
+      <artifactId>struts-apps</artifactId>
       <version>2.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.struts.action2</groupId>
-    <artifactId>webapp-starter</artifactId>
+    <artifactId>struts-starter</artifactId>
     <packaging>war</packaging>
     <name>Starter Webapp</name>
     <dependencies>
+    
+        <dependency>
+           <groupId>javax.servlet</groupId>
+           <artifactId>servlet-api</artifactId>
+           <version>2.4</version>
+           <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.struts.action2</groupId>
+            <artifactId>struts-core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>  
+    
+    
     </dependencies>
     
     <build>