diff --git a/core/src/main/java/org/apache/struts2/ActionInvocation.java b/core/src/main/java/org/apache/struts2/ActionInvocation.java
index b38014980..bd52e185a 100644
--- a/core/src/main/java/org/apache/struts2/ActionInvocation.java
+++ b/core/src/main/java/org/apache/struts2/ActionInvocation.java
@@ -20,6 +20,7 @@ package org.apache.struts2;
 
 import org.apache.struts2.action.Action;
 import org.apache.struts2.interceptor.PreResultListener;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.result.Result;
 import org.apache.struts2.util.ValueStack;
 
diff --git a/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java b/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
index 17ab2e71e..cc477abc2 100644
--- a/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
+++ b/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
@@ -34,6 +34,7 @@ import org.apache.struts2.interceptor.Interceptor;
 import org.apache.struts2.interceptor.PreResultListener;
 import org.apache.struts2.interceptor.WithLazyParams;
 import org.apache.struts2.ognl.OgnlUtil;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.result.Result;
 import org.apache.struts2.util.ValueStack;
 import org.apache.struts2.util.ValueStackFactory;
diff --git a/core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java
index f7755d212..c114d65e1 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java
@@ -20,7 +20,7 @@ package org.apache.struts2.interceptor;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.struts2.ActionChainResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.ActionInvocation;
 import org.apache.struts2.StrutsConstants;
 import org.apache.struts2.Unchainable;
diff --git a/core/src/main/java/org/apache/struts2/ActionChainResult.java b/core/src/main/java/org/apache/struts2/result/ActionChainResult.java
similarity index 97%
rename from core/src/main/java/org/apache/struts2/ActionChainResult.java
rename to core/src/main/java/org/apache/struts2/result/ActionChainResult.java
index 30f59b1a6..ba1ca315f 100644
--- a/core/src/main/java/org/apache/struts2/ActionChainResult.java
+++ b/core/src/main/java/org/apache/struts2/result/ActionChainResult.java
@@ -16,13 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2;
+package org.apache.struts2.result;
 
+import org.apache.struts2.ActionContext;
+import org.apache.struts2.ActionInvocation;
+import org.apache.struts2.ActionProxy;
+import org.apache.struts2.ActionProxyFactory;
+import org.apache.struts2.StrutsException;
+import org.apache.struts2.inject.Inject;
+import org.apache.struts2.util.TextParseUtil;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.struts2.inject.Inject;
-import org.apache.struts2.result.Result;
-import org.apache.struts2.util.TextParseUtil;
 
 import java.util.HashSet;
 import java.util.LinkedList;
diff --git a/core/src/main/java/org/apache/struts2/result/Result.java b/core/src/main/java/org/apache/struts2/result/Result.java
index fbbc86cd3..082e4866f 100644
--- a/core/src/main/java/org/apache/struts2/result/Result.java
+++ b/core/src/main/java/org/apache/struts2/result/Result.java
@@ -18,10 +18,8 @@
  */
 package org.apache.struts2.result;
 
-import org.apache.struts2.Action;
-import org.apache.struts2.ActionInvocation;
-
 import org.apache.struts2.action.Action;
+import org.apache.struts2.ActionInvocation;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 4f2ccb18d..f9a0eced0 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -31,7 +31,7 @@
 
     <package name="struts-default" abstract="true">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult"/>
             <result-type name="dispatcher" class="org.apache.struts2.result.ServletDispatcherResult" default="true"/>
             <result-type name="freemarker" class="org.apache.struts2.views.freemarker.FreemarkerResult"/>
             <result-type name="httpheader" class="org.apache.struts2.result.HttpHeaderResult"/>
diff --git a/core/src/main/resources/xwork-default.xml b/core/src/main/resources/xwork-default.xml
index e56b2e6e0..504c21b35 100644
--- a/core/src/main/resources/xwork-default.xml
+++ b/core/src/main/resources/xwork-default.xml
@@ -26,7 +26,7 @@
     <package name="xwork-default" abstract="true">
 
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult"/>
         </result-types>
         <interceptors>
             <interceptor name="logger" class="org.apache.struts2.interceptor.LoggingInterceptor"/>
diff --git a/core/src/test/java/org/apache/struts2/ActionChainResultTest.java b/core/src/test/java/org/apache/struts2/ActionChainResultTest.java
index 58f4ea90a..11075c9cc 100644
--- a/core/src/test/java/org/apache/struts2/ActionChainResultTest.java
+++ b/core/src/test/java/org/apache/struts2/ActionChainResultTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.struts2;
 
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.result.Result;
 import org.junit.Test;
 
diff --git a/core/src/test/java/org/apache/struts2/ChainResultTest.java b/core/src/test/java/org/apache/struts2/ChainResultTest.java
index dbdecf2c8..109d72352 100644
--- a/core/src/test/java/org/apache/struts2/ChainResultTest.java
+++ b/core/src/test/java/org/apache/struts2/ChainResultTest.java
@@ -21,9 +21,9 @@ package org.apache.struts2;
 import com.mockobjects.dynamic.Mock;
 import org.apache.struts2.config.providers.XmlConfigurationProvider;
 import org.apache.struts2.mock.MockResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.util.ValueStack;
 import junit.framework.TestCase;
-import org.apache.struts2.StrutsException;
 import org.apache.struts2.config.StrutsXmlConfigurationProvider;
 
 import java.util.HashMap;
diff --git a/core/src/test/java/org/apache/struts2/DefaultActionInvocationTest.java b/core/src/test/java/org/apache/struts2/DefaultActionInvocationTest.java
index b853a23ce..76d3cd432 100644
--- a/core/src/test/java/org/apache/struts2/DefaultActionInvocationTest.java
+++ b/core/src/test/java/org/apache/struts2/DefaultActionInvocationTest.java
@@ -28,6 +28,7 @@ import org.apache.struts2.interceptor.Interceptor;
 import org.apache.struts2.mock.MockActionProxy;
 import org.apache.struts2.mock.MockInterceptor;
 import org.apache.struts2.mock.MockResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.result.Result;
 import org.apache.struts2.util.ValueStack;
 import org.apache.struts2.util.ValueStackFactory;
diff --git a/core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java b/core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java
index 7d243150a..f0eabcc3a 100644
--- a/core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java
+++ b/core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java
@@ -51,7 +51,7 @@ public class ConfigurationProviderOgnlAllowlistTest extends XWorkJUnit4TestCase
                 Class.forName("org.apache.struts2.mock.MockResult"),
                 Class.forName("org.apache.struts2.interceptor.ConditionalInterceptor"),
                 Class.forName("org.apache.struts2.ActionSupport"),
-                Class.forName("org.apache.struts2.ActionChainResult"),
+                Class.forName("org.apache.struts2.result.ActionChainResult"),
                 Class.forName("org.apache.struts2.TextProvider"),
                 Class.forName("org.apache.struts2.interceptor.NoOpInterceptor"),
                 Class.forName("org.apache.struts2.interceptor.Interceptor"),
@@ -100,7 +100,7 @@ public class ConfigurationProviderOgnlAllowlistTest extends XWorkJUnit4TestCase
                 Class.forName("java.io.Serializable"),
                 Class.forName("org.apache.struts2.interceptor.ConditionalInterceptor"),
                 Class.forName("org.apache.struts2.ActionSupport"),
-                Class.forName("org.apache.struts2.ActionChainResult"),
+                Class.forName("org.apache.struts2.result.ActionChainResult"),
                 Class.forName("org.apache.struts2.TextProvider"),
                 Class.forName("org.apache.struts2.interceptor.NoOpInterceptor"),
                 Class.forName("org.apache.struts2.interceptor.Interceptor"),
diff --git a/core/src/test/java/org/apache/struts2/config/providers/MockConfigurationProvider.java b/core/src/test/java/org/apache/struts2/config/providers/MockConfigurationProvider.java
index 197008175..7b89a4ad7 100644
--- a/core/src/test/java/org/apache/struts2/config/providers/MockConfigurationProvider.java
+++ b/core/src/test/java/org/apache/struts2/config/providers/MockConfigurationProvider.java
@@ -19,7 +19,7 @@
 package org.apache.struts2.config.providers;
 
 import org.apache.struts2.action.Action;
-import org.apache.struts2.ActionChainResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.ModelDrivenAction;
 import org.apache.struts2.ObjectFactory;
 import org.apache.struts2.SimpleAction;
diff --git a/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java b/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java
index d120e91d2..af68d7dc6 100644
--- a/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java
+++ b/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.struts2.config.providers;
 
-import org.apache.struts2.ActionChainResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.SimpleAction;
 import org.apache.struts2.config.ConfigurationException;
 import org.apache.struts2.config.ConfigurationProvider;
diff --git a/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderMultilevelTest.java b/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderMultilevelTest.java
index cd6827fa1..a1fdcaccf 100644
--- a/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderMultilevelTest.java
+++ b/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderMultilevelTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.struts2.config.providers;
 
-import org.apache.struts2.ActionChainResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.config.ConfigurationProvider;
 import org.apache.struts2.config.entities.ActionConfig;
 import org.apache.struts2.config.entities.InterceptorMapping;
diff --git a/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderResultsTest.java b/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderResultsTest.java
index ba9ab6564..1f7285db9 100644
--- a/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderResultsTest.java
+++ b/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderResultsTest.java
@@ -19,7 +19,7 @@
 package org.apache.struts2.config.providers;
 
 import org.apache.struts2.action.Action;
-import org.apache.struts2.ActionChainResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.SimpleAction;
 import org.apache.struts2.config.ConfigurationException;
 import org.apache.struts2.config.ConfigurationProvider;
diff --git a/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorTest.java
index 9fa6f2613..85df164cc 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorTest.java
@@ -20,7 +20,7 @@ package org.apache.struts2.interceptor;
 
 import com.mockobjects.dynamic.Mock;
 import org.apache.struts2.action.Action;
-import org.apache.struts2.ActionChainResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.ActionContext;
 import org.apache.struts2.ActionInvocation;
 import org.apache.struts2.SimpleAction;
diff --git a/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorWithConfigTest.java b/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorWithConfigTest.java
index b8e912705..88d5fcc8c 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorWithConfigTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorWithConfigTest.java
@@ -19,7 +19,7 @@
 package org.apache.struts2.interceptor;
 
 import org.apache.struts2.action.Action;
-import org.apache.struts2.ActionChainResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.ActionProxy;
 import org.apache.struts2.ActionProxyFactory;
 import org.apache.struts2.DefaultActionProxyFactory;
diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork- test.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork- test.xml
index 42941e5f2..4febcad9d 100644
--- a/core/src/test/resources/org/apache/struts2/config/providers/xwork- test.xml	
+++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork- test.xml	
@@ -26,7 +26,7 @@
     <include file="xwork-test-beans.xml"/>
     <package name="default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
             <result-type name="mock" class="org.apache.struts2.mock.MockResult"/>
         </result-types>
 
diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-include-parent.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-include-parent.xml
index ca38ab0ab..d74c500f2 100644
--- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-include-parent.xml
+++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-include-parent.xml
@@ -27,7 +27,7 @@
 
     <package name="default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
         </result-types>
         <interceptors>
             <interceptor name="params" class="org.apache.struts2.interceptor.parameter.ParametersInterceptor"/>
diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions-packagedefaultclassref.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions-packagedefaultclassref.xml
index f94e7fd13..0e0259b47 100644
--- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions-packagedefaultclassref.xml
+++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions-packagedefaultclassref.xml
@@ -26,7 +26,7 @@
     <package name="default">
 
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
             <result-type name="mock" class="org.apache.struts2.mock.MockResult"/>
         </result-types>
 
diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions.xml
index 42941e5f2..4febcad9d 100644
--- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions.xml
+++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions.xml
@@ -26,7 +26,7 @@
     <include file="xwork-test-beans.xml"/>
     <package name="default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
             <result-type name="mock" class="org.apache.struts2.mock.MockResult"/>
         </result-types>
 
diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-allowlist-2.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-allowlist-2.xml
index d920b03bd..ff884c86c 100644
--- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-allowlist-2.xml
+++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-allowlist-2.xml
@@ -25,7 +25,7 @@
 <struts>
     <package name="allow2">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
         </result-types>
 
         <interceptors>
diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-exception-mappings.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-exception-mappings.xml
index 99a6b4ecc..951eca5be 100644
--- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-exception-mappings.xml
+++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-exception-mappings.xml
@@ -26,7 +26,7 @@
 	<include file="xwork-test-beans.xml" />
     <package name="default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
             <result-type name="mock" class="org.apache.struts2.mock.MockResult"/>
         </result-types>
 
diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-multilevel.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-multilevel.xml
index f710519b7..71d4c82b4 100644
--- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-multilevel.xml
+++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-multilevel.xml
@@ -26,7 +26,7 @@
 	<include file="xwork-test-beans.xml" />
     <package name="default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
         </result-types>
         <interceptors>
             <interceptor name="params" class="org.apache.struts2.interceptor.parameter.ParametersInterceptor"/>
diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-inheritance.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-inheritance.xml
index e42274f2e..b4bc03a1b 100644
--- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-inheritance.xml
+++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-inheritance.xml
@@ -26,7 +26,7 @@
 	<include file="xwork-test-beans.xml" />
     <package name="default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true" />
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true" />
             <result-type name="mock" class="org.apache.struts2.mock.MockResult"/>
         </result-types>
     </package>
diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-names.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-names.xml
index f7c67b165..99bfcf69f 100644
--- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-names.xml
+++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-names.xml
@@ -26,7 +26,7 @@
     <include file="xwork-test-beans.xml" />
     <package name="default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
         </result-types>
 
         <action name="noname">
diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-results.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-results.xml
index 82582db3c..9020e1a1a 100644
--- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-results.xml
+++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-results.xml
@@ -26,7 +26,7 @@
 	<include file="xwork-test-beans.xml" />
     <package name="default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
             <result-type name="mock" class="org.apache.struts2.mock.MockResult"/>
         </result-types>
 
diff --git a/core/src/test/resources/xwork - jar.jar b/core/src/test/resources/xwork - jar.jar
index 001de63fc..4258db034 100644
Binary files a/core/src/test/resources/xwork - jar.jar and b/core/src/test/resources/xwork - jar.jar differ
diff --git a/core/src/test/resources/xwork - zip.zip b/core/src/test/resources/xwork - zip.zip
index 6490cf77e..5777c256f 100644
Binary files a/core/src/test/resources/xwork - zip.zip and b/core/src/test/resources/xwork - zip.zip differ
diff --git a/core/src/test/resources/xwork-jar.jar b/core/src/test/resources/xwork-jar.jar
index 58335095e..36bc457c6 100644
Binary files a/core/src/test/resources/xwork-jar.jar and b/core/src/test/resources/xwork-jar.jar differ
diff --git a/core/src/test/resources/xwork-proxyinvoke.xml b/core/src/test/resources/xwork-proxyinvoke.xml
index 7a4b78425..64919e306 100644
--- a/core/src/test/resources/xwork-proxyinvoke.xml
+++ b/core/src/test/resources/xwork-proxyinvoke.xml
@@ -30,7 +30,7 @@
 
     <package name="xwork-test-default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
             <result-type name="void" class="org.apache.struts2.VoidResult"/>
             <result-type name="mock" class="org.apache.struts2.mock.MockResult"/>
         </result-types>
diff --git a/core/src/test/resources/xwork-test-default.xml b/core/src/test/resources/xwork-test-default.xml
index 7f9f3c0ae..31f92d9d6 100644
--- a/core/src/test/resources/xwork-test-default.xml
+++ b/core/src/test/resources/xwork-test-default.xml
@@ -25,7 +25,7 @@
 <struts>
     <package name="xwork-test-default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
             <result-type name="void" class="org.apache.struts2.VoidResult"/>
             <result-type name="mock" class="org.apache.struts2.mock.MockResult"/>
         </result-types>
diff --git a/core/src/test/resources/xwork-test-validation.xml b/core/src/test/resources/xwork-test-validation.xml
index feb14423a..e45183636 100644
--- a/core/src/test/resources/xwork-test-validation.xml
+++ b/core/src/test/resources/xwork-test-validation.xml
@@ -26,7 +26,7 @@
 	<include file="xwork-test-beans.xml" />
     <package name="xwork-test-default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
             <result-type name="void" class="org.apache.struts2.VoidResult"/>
             <result-type name="mock" class="org.apache.struts2.mock.MockResult"/>
         </result-types>
diff --git a/core/src/test/resources/xwork-zip.zip b/core/src/test/resources/xwork-zip.zip
index 19c19c12a..b60c94b52 100644
Binary files a/core/src/test/resources/xwork-zip.zip and b/core/src/test/resources/xwork-zip.zip differ
diff --git a/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java b/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
index c17a75b02..dcb0b4352 100644
--- a/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
+++ b/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
@@ -18,10 +18,10 @@
  */
 package org.apache.struts2.convention;
 
+import org.apache.struts2.result.ActionChainResult;
 import jakarta.servlet.ServletContext;
 import junit.framework.TestCase;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.struts2.ActionChainResult;
 import org.apache.struts2.ActionContext;
 import org.apache.struts2.FileManager;
 import org.apache.struts2.FileManagerFactory;
diff --git a/plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java b/plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java
index 9c1cc09b8..01990e59a 100644
--- a/plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java
+++ b/plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java
@@ -19,7 +19,7 @@
 package org.apache.struts2.spring;
 
 import org.apache.struts2.action.Action;
-import org.apache.struts2.ActionChainResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.ActionContext;
 import org.apache.struts2.ModelDrivenAction;
 import org.apache.struts2.ObjectFactory;
diff --git a/plugins/spring/src/test/resources/org/apache/struts2/spring/actionContext-xwork.xml b/plugins/spring/src/test/resources/org/apache/struts2/spring/actionContext-xwork.xml
index 60f64ef5b..2a80b6fa3 100644
--- a/plugins/spring/src/test/resources/org/apache/struts2/spring/actionContext-xwork.xml
+++ b/plugins/spring/src/test/resources/org/apache/struts2/spring/actionContext-xwork.xml
@@ -31,7 +31,7 @@
             <result-type name="null" class="org.apache.struts2.mock.MockResult" default="true"/>
             <result-type name="springResult" class="springResult"/>
             <result-type name="chain"
-                         class="org.apache.struts2.ActionChainResult"/>
+                         class="org.apache.struts2.result.ActionChainResult"/>
         </result-types>
 
         <interceptors>