diff --git a/core/src/main/java/org/springframework/ws/server/EndpointMapping.java b/core/src/main/java/org/springframework/ws/server/EndpointMapping.java
index bb69aec3..b0473426 100644
--- a/core/src/main/java/org/springframework/ws/server/EndpointMapping.java
+++ b/core/src/main/java/org/springframework/ws/server/EndpointMapping.java
@@ -33,7 +33,7 @@ import org.springframework.ws.context.MessageContext;
  * @author Arjen Poutsma
  * @see org.springframework.ws.server.endpoint.mapping.AbstractEndpointMapping
  * @see org.springframework.ws.server.endpoint.mapping.PayloadRootQNameEndpointMapping
- * @see org.springframework.ws.soap.endpoint.mapping.SoapActionEndpointMapping
+ * @see org.springframework.ws.soap.server.endpoint.mapping.SoapActionEndpointMapping
  */
 public interface EndpointMapping {
 
diff --git a/core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java b/core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java
index 234e47c8..ec510ec7 100644
--- a/core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java
+++ b/core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java
@@ -36,7 +36,7 @@ import org.springframework.ws.soap.SoapHeader;
 import org.springframework.ws.soap.SoapHeaderElement;
 import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.SoapVersion;
-import org.springframework.ws.soap.endpoint.SimpleSoapExceptionResolver;
+import org.springframework.ws.soap.server.endpoint.SimpleSoapExceptionResolver;
 import org.springframework.ws.soap.soap12.Soap12Header;
 
 /**
@@ -82,7 +82,7 @@ public class SoapMessageDispatcher extends MessageDispatcher {
      *
      * @see org.springframework.ws.server.MessageDispatcher#initDefaultStrategies()
      * @see #setEndpointExceptionResolvers(java.util.List)
-     * @see org.springframework.ws.soap.endpoint.SimpleSoapExceptionResolver
+     * @see org.springframework.ws.soap.server.endpoint.SimpleSoapExceptionResolver
      */
     protected void initDefaultStrategies() {
         super.initDefaultStrategies();
diff --git a/core/src/main/java/org/springframework/ws/soap/endpoint/SimpleSoapExceptionResolver.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java
similarity index 96%
rename from core/src/main/java/org/springframework/ws/soap/endpoint/SimpleSoapExceptionResolver.java
rename to core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java
index f3ea28b5..52f9b7a7 100644
--- a/core/src/main/java/org/springframework/ws/soap/endpoint/SimpleSoapExceptionResolver.java
+++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java
@@ -1,4 +1,4 @@
-package org.springframework.ws.soap.endpoint;
+package org.springframework.ws.soap.server.endpoint;
 
 import java.util.Locale;
 
diff --git a/core/src/main/java/org/springframework/ws/soap/endpoint/SoapFaultDefinition.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinition.java
similarity index 94%
rename from core/src/main/java/org/springframework/ws/soap/endpoint/SoapFaultDefinition.java
rename to core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinition.java
index 970ce666..eee5a3c2 100644
--- a/core/src/main/java/org/springframework/ws/soap/endpoint/SoapFaultDefinition.java
+++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.soap.endpoint;
+package org.springframework.ws.soap.server.endpoint;
 
 import java.util.Locale;
 import javax.xml.namespace.QName;
@@ -32,28 +32,28 @@ public class SoapFaultDefinition {
     /**
      * Constant <code>QName</code> used to indicate that a <code>Client</code> fault must be created.
      *
-     * @see org.springframework.ws.soap.SoapBody#addClientOrSenderFault(String, java.util.Locale)
+     * @see org.springframework.ws.soap.SoapBody#addClientOrSenderFault(String,java.util.Locale)
      */
     public static final QName CLIENT = new QName("CLIENT");
 
     /**
      * Constant <code>QName</code> used to indicate that a <code>Receiver</code> fault must be created.
      *
-     * @see org.springframework.ws.soap.SoapBody#addServerOrReceiverFault(String, java.util.Locale)
+     * @see org.springframework.ws.soap.SoapBody#addServerOrReceiverFault(String,java.util.Locale)
      */
     public static final QName RECEIVER = new QName("RECEIVER");
 
     /**
      * Constant <code>QName</code> used to indicate that a <code>Sender</code> fault must be created.
      *
-     * @see org.springframework.ws.soap.SoapBody#addServerOrReceiverFault(String, java.util.Locale)
+     * @see org.springframework.ws.soap.SoapBody#addServerOrReceiverFault(String,java.util.Locale)
      */
     public static final QName SENDER = new QName("SENDER");
 
     /**
      * Constant <code>QName</code> used to indicate that a <code>Server</code>  fault must be created.
      *
-     * @see org.springframework.ws.soap.SoapBody#addClientOrSenderFault(String, java.util.Locale)
+     * @see org.springframework.ws.soap.SoapBody#addClientOrSenderFault(String,java.util.Locale)
      */
     public static final QName SERVER = new QName("SERVER");
 
diff --git a/core/src/main/java/org/springframework/ws/soap/endpoint/SoapFaultDefinitionEditor.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java
similarity index 98%
rename from core/src/main/java/org/springframework/ws/soap/endpoint/SoapFaultDefinitionEditor.java
rename to core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java
index 34251ac1..32bca3c3 100644
--- a/core/src/main/java/org/springframework/ws/soap/endpoint/SoapFaultDefinitionEditor.java
+++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.soap.endpoint;
+package org.springframework.ws.soap.server.endpoint;
 
 import java.beans.PropertyEditorSupport;
 import java.util.Locale;
diff --git a/core/src/main/java/org/springframework/ws/soap/endpoint/SoapFaultMappingExceptionResolver.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolver.java
similarity index 99%
rename from core/src/main/java/org/springframework/ws/soap/endpoint/SoapFaultMappingExceptionResolver.java
rename to core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolver.java
index c4c8eb4e..cd1a7367 100644
--- a/core/src/main/java/org/springframework/ws/soap/endpoint/SoapFaultMappingExceptionResolver.java
+++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.soap.endpoint;
+package org.springframework.ws.soap.server.endpoint;
 
 import java.util.Enumeration;
 import java.util.Properties;
diff --git a/core/src/main/java/org/springframework/ws/soap/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java
similarity index 97%
rename from core/src/main/java/org/springframework/ws/soap/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java
rename to core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java
index 606a0fe6..41ea567b 100644
--- a/core/src/main/java/org/springframework/ws/soap/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java
+++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.soap.endpoint.interceptor;
+package org.springframework.ws.soap.server.endpoint.interceptor;
 
 import javax.xml.transform.Source;
 
diff --git a/core/src/main/java/org/springframework/ws/soap/endpoint/interceptor/package.html b/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/endpoint/interceptor/package.html
rename to core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/endpoint/mapping/DelegatingSoapEndpointMapping.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java
similarity index 98%
rename from core/src/main/java/org/springframework/ws/soap/endpoint/mapping/DelegatingSoapEndpointMapping.java
rename to core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java
index ed6e02f0..60acae3b 100644
--- a/core/src/main/java/org/springframework/ws/soap/endpoint/mapping/DelegatingSoapEndpointMapping.java
+++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.soap.endpoint.mapping;
+package org.springframework.ws.soap.server.endpoint.mapping;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/springframework/ws/soap/endpoint/mapping/SoapActionEndpointMapping.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java
similarity index 98%
rename from core/src/main/java/org/springframework/ws/soap/endpoint/mapping/SoapActionEndpointMapping.java
rename to core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java
index 60d77963..3609ea46 100644
--- a/core/src/main/java/org/springframework/ws/soap/endpoint/mapping/SoapActionEndpointMapping.java
+++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.soap.endpoint.mapping;
+package org.springframework.ws.soap.server.endpoint.mapping;
 
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/package.html b/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/package.html
new file mode 100644
index 00000000..62444fe0
--- /dev/null
+++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/package.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Provides miscellaneous endpoints <code>EndpointMapping</code> implementations for SOAP purposes.
+</body>
+</html>
diff --git a/core/src/main/java/org/springframework/ws/soap/endpoint/package.html b/core/src/main/java/org/springframework/ws/soap/server/endpoint/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/endpoint/package.html
rename to core/src/main/java/org/springframework/ws/soap/server/endpoint/package.html
diff --git a/core/src/test/java/org/springframework/ws/soap/endpoint/SimpleSoapExceptionResolverTest.java b/core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTest.java
similarity index 98%
rename from core/src/test/java/org/springframework/ws/soap/endpoint/SimpleSoapExceptionResolverTest.java
rename to core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTest.java
index 7f0922ac..f1664c52 100644
--- a/core/src/test/java/org/springframework/ws/soap/endpoint/SimpleSoapExceptionResolverTest.java
+++ b/core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.soap.endpoint;
+package org.springframework.ws.soap.server.endpoint;
 
 import java.util.Locale;
 
diff --git a/core/src/test/java/org/springframework/ws/soap/endpoint/SoapFaultDefinitionEditorTest.java b/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTest.java
similarity index 98%
rename from core/src/test/java/org/springframework/ws/soap/endpoint/SoapFaultDefinitionEditorTest.java
rename to core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTest.java
index 6d2b2ca3..e34e2e68 100644
--- a/core/src/test/java/org/springframework/ws/soap/endpoint/SoapFaultDefinitionEditorTest.java
+++ b/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.soap.endpoint;
+package org.springframework.ws.soap.server.endpoint;
 
 import java.util.Locale;
 import javax.xml.namespace.QName;
diff --git a/core/src/test/java/org/springframework/ws/soap/endpoint/SoapFaultMappingExceptionResolverTest.java b/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTest.java
similarity index 99%
rename from core/src/test/java/org/springframework/ws/soap/endpoint/SoapFaultMappingExceptionResolverTest.java
rename to core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTest.java
index cf8636ac..a3ba84b1 100644
--- a/core/src/test/java/org/springframework/ws/soap/endpoint/SoapFaultMappingExceptionResolverTest.java
+++ b/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.soap.endpoint;
+package org.springframework.ws.soap.server.endpoint;
 
 import java.util.Locale;
 import java.util.Properties;
diff --git a/core/src/test/java/org/springframework/ws/soap/endpoint/interceptor/SoapEnvelopeLoggingInterceptorTest.java b/core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptorTest.java
similarity index 98%
rename from core/src/test/java/org/springframework/ws/soap/endpoint/interceptor/SoapEnvelopeLoggingInterceptorTest.java
rename to core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptorTest.java
index 97645c00..ee2b1c79 100644
--- a/core/src/test/java/org/springframework/ws/soap/endpoint/interceptor/SoapEnvelopeLoggingInterceptorTest.java
+++ b/core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptorTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.soap.endpoint.interceptor;
+package org.springframework.ws.soap.server.endpoint.interceptor;
 
 import junit.framework.TestCase;
 import org.apache.log4j.AppenderSkeleton;
diff --git a/core/src/test/java/org/springframework/ws/soap/endpoint/mapping/DelegatingSoapEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTest.java
similarity index 97%
rename from core/src/test/java/org/springframework/ws/soap/endpoint/mapping/DelegatingSoapEndpointMappingTest.java
rename to core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTest.java
index 0fdb9ed7..0859281b 100644
--- a/core/src/test/java/org/springframework/ws/soap/endpoint/mapping/DelegatingSoapEndpointMappingTest.java
+++ b/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.soap.endpoint.mapping;
+package org.springframework.ws.soap.server.endpoint.mapping;
 
 import junit.framework.TestCase;
 import org.easymock.MockControl;
diff --git a/core/src/test/java/org/springframework/ws/soap/endpoint/mapping/SoapActionEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTest.java
similarity index 97%
rename from core/src/test/java/org/springframework/ws/soap/endpoint/mapping/SoapActionEndpointMappingTest.java
rename to core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTest.java
index 2153615b..32c23afd 100644
--- a/core/src/test/java/org/springframework/ws/soap/endpoint/mapping/SoapActionEndpointMappingTest.java
+++ b/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.soap.endpoint.mapping;
+package org.springframework.ws.soap.server.endpoint.mapping;
 
 import javax.xml.soap.MessageFactory;
 
diff --git a/core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java b/core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java
index bb75bbdc..73ab7e07 100644
--- a/core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java
+++ b/core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java
@@ -20,7 +20,7 @@ import org.springframework.web.context.support.StaticWebApplicationContext;
 import org.springframework.ws.server.MessageDispatcher;
 import org.springframework.ws.server.endpoint.PayloadEndpointAdapter;
 import org.springframework.ws.server.endpoint.mapping.PayloadRootQNameEndpointMapping;
-import org.springframework.ws.soap.endpoint.SimpleSoapExceptionResolver;
+import org.springframework.ws.soap.server.endpoint.SimpleSoapExceptionResolver;
 import org.springframework.ws.wsdl.wsdl11.SimpleWsdl11Definition;
 import org.w3c.dom.Document;