diff --git a/samples/echo/client/spring-ws/src/org/springframework/ws/samples/echo/client/sws/EchoClient.java b/samples/echo/client/spring-ws/src/org/springframework/ws/samples/echo/client/sws/EchoClient.java
new file mode 100644
index 00000000..935d11f2
--- /dev/null
+++ b/samples/echo/client/spring-ws/src/org/springframework/ws/samples/echo/client/sws/EchoClient.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ws.samples.echo.client.sws;
+
+import java.io.IOException;
+import javax.xml.transform.Source;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.core.io.Resource;
+import org.springframework.ws.client.core.support.WebServiceGatewaySupport;
+import org.springframework.xml.transform.ResourceSource;
+import org.springframework.xml.transform.StringResult;
+
+public class EchoClient extends WebServiceGatewaySupport {
+
+    private Resource request;
+
+    public void setRequest(Resource request) {
+        this.request = request;
+    }
+
+    public void echo() throws IOException {
+        Source requestSource = new ResourceSource(request);
+        StringResult result = new StringResult();
+        getWebServiceTemplate().sendAndReceive(requestSource, result);
+        System.out.println(result);
+    }
+
+    public static void main(String[] args) throws IOException {
+        ApplicationContext applicationContext =
+                new ClassPathXmlApplicationContext("applicationContext.xml", EchoClient.class);
+        EchoClient echoClient = (EchoClient) applicationContext.getBean("echoClient");
+        echoClient.echo();
+    }
+
+}
diff --git a/samples/echo/client/spring-ws/src/org/springframework/ws/samples/echo/client/sws/applicationContext.xml b/samples/echo/client/spring-ws/src/org/springframework/ws/samples/echo/client/sws/applicationContext.xml
new file mode 100644
index 00000000..aa0a9a29
--- /dev/null
+++ b/samples/echo/client/spring-ws/src/org/springframework/ws/samples/echo/client/sws/applicationContext.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+    <bean id="echoClient" class="org.springframework.ws.samples.echo.client.sws.EchoClient">
+        <property name="messageFactory">
+            <bean class="org.springframework.ws.soap.saaj.SaajSoapMessageFactory"/>
+        </property>
+        <property name="messageSender" ref="commonsMessageSender"/>
+        <property name="request" value="classpath:org/springframework/ws/samples/echo/client/sws/echoRequest.xml"/>
+    </bean>
+
+    <bean id="urlMessageSender" class="org.springframework.ws.transport.http.HttpUrlConnectionMessageSender">
+        <property name="url" value="http://localhost:8080/echo/services"/>
+    </bean>
+
+    <bean id="commonsMessageSender" class="org.springframework.ws.transport.http.HttpUrlConnectionMessageSender">
+        <property name="url" value="http://localhost:8080/echo/services"/>
+    </bean>
+
+</beans>
diff --git a/samples/echo/client/spring-ws/src/org/springframework/ws/samples/echo/client/sws/echoRequest.xml b/samples/echo/client/spring-ws/src/org/springframework/ws/samples/echo/client/sws/echoRequest.xml
new file mode 100644
index 00000000..36da9480
--- /dev/null
+++ b/samples/echo/client/spring-ws/src/org/springframework/ws/samples/echo/client/sws/echoRequest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<echoRequest xmlns="http://www.springframework.org/spring-ws/samples/echo">Hello</echoRequest>
diff --git a/samples/echo/src/main/java/org/springframework/ws/samples/echo/ws/EchoEndpoint.java b/samples/echo/src/main/java/org/springframework/ws/samples/echo/ws/EchoEndpoint.java
index 2f045f46..0f91fd4e 100755
--- a/samples/echo/src/main/java/org/springframework/ws/samples/echo/ws/EchoEndpoint.java
+++ b/samples/echo/src/main/java/org/springframework/ws/samples/echo/ws/EchoEndpoint.java
@@ -16,16 +16,15 @@
 
 package org.springframework.ws.samples.echo.ws;
 
+import org.springframework.util.Assert;
+import org.springframework.ws.samples.echo.service.EchoService;
+import org.springframework.ws.server.endpoint.AbstractDomPayloadEndpoint;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
 
-import org.springframework.util.Assert;
-import org.springframework.ws.endpoint.AbstractDomPayloadEndpoint;
-import org.springframework.ws.samples.echo.service.EchoService;
-
 /**
  * Simple echoing Web service endpoint. Uses a <code>EchoService</code> to create a response string.
  *
diff --git a/samples/echo/src/main/webapp/WEB-INF/spring-ws-servlet.xml b/samples/echo/src/main/webapp/WEB-INF/spring-ws-servlet.xml
index 53f3822a..7c46b465 100755
--- a/samples/echo/src/main/webapp/WEB-INF/spring-ws-servlet.xml
+++ b/samples/echo/src/main/webapp/WEB-INF/spring-ws-servlet.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
     <description>
@@ -8,7 +7,7 @@
         detected by Spring-WS, similar to the way Controllers are picked up in Spring Web MVC.
     </description>
 
-    <bean id="payloadMapping" class="org.springframework.ws.endpoint.mapping.PayloadRootQNameEndpointMapping">
+    <bean id="payloadMapping" class="org.springframework.ws.server.endpoint.mapping.PayloadRootQNameEndpointMapping">
         <description>
             This endpoint mapping uses the qualified name of the payload (body contents) to determine the endpoint for
             an incoming message. Every message is passed to the default endpoint. Additionally, messages are logged
@@ -23,7 +22,8 @@
         </property>
     </bean>
 
-    <bean id="validatingInterceptor" class="org.springframework.ws.endpoint.interceptor.PayloadValidatingInterceptor">
+    <bean id="validatingInterceptor"
+          class="org.springframework.ws.server.endpoint.interceptor.PayloadValidatingInterceptor">
         <description>
             This interceptor validates both incoming and outgoing message contents according to the 'echo.xsd' XML
             Schema file.
@@ -33,7 +33,7 @@
         <property name="validateResponse" value="true"/>
     </bean>
 
-    <bean id="loggingInterceptor" class="org.springframework.ws.endpoint.interceptor.PayloadLoggingInterceptor">
+    <bean id="loggingInterceptor" class="org.springframework.ws.server.endpoint.interceptor.PayloadLoggingInterceptor">
         <description>
             This interceptor logs the message payload.
         </description>