diff --git a/samples/pox/client/curl/client.sh b/samples/pox/client/curl/client.sh
deleted file mode 100755
index 1abc9004..00000000
--- a/samples/pox/client/curl/client.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-curl --header "Content-type: application/xml" -v --data @contactsRequest.xml http://localhost:8080/pox/
diff --git a/samples/pox/client/pom.xml b/samples/pox/client/pom.xml
new file mode 100644
index 00000000..1daa524c
--- /dev/null
+++ b/samples/pox/client/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>pox</artifactId>
+        <groupId>org.springframework.ws</groupId>
+        <version>2.0.0-M1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>pox-client</artifactId>
+    <packaging>pom</packaging>
+    <name>Spring WS POX Sample - Clients</name>
+    <modules>
+        <module>spring-ws</module>
+    </modules>
+</project>
diff --git a/samples/pox/client/spring-ws/build.xml b/samples/pox/client/spring-ws/build.xml
deleted file mode 100644
index 11831009..00000000
--- a/samples/pox/client/spring-ws/build.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<project name="spring-ws-pox-sample-spring-ws-client" default="build" xmlns:artifact="urn:maven-artifact-ant">
-    <property name="bin.dir" value="bin"/>
-    <property name="src.dir" value="src"/>
-
-    <target name="init">
-        <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
-            <classpath>
-                <pathelement location="${basedir}/../../../maven-ant-tasks-2.0.7.jar"/>
-            </classpath>
-        </typedef>
-
-        <artifact:dependencies pathId="classpath">
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="2.0.0-M1"/>
-            <dependency groupId="log4j" artifactId="log4j" version="1.2.13"/>
-        </artifact:dependencies>
-
-    </target>
-
-    <target name="build" depends="init">
-        <mkdir dir="${bin.dir}"/>
-        <javac srcdir="${src.dir}" destdir="${bin.dir}">
-            <classpath refid="classpath"/>
-        </javac>
-        <copy todir="${bin.dir}">
-            <fileset dir="${src.dir}">
-                <exclude name="**/*.java"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="clean">
-        <delete dir="${bin.dir}"/>
-    </target>
-
-    <target name="run" depends="contacts"/>
-
-    <target name="contacts" depends="build">
-        <java classname="org.springframework.ws.samples.pox.client.sws.ContactsClient" fork="true" failonerror="true">
-            <classpath refid="classpath"/>
-            <classpath location="${bin.dir}"/>
-        </java>
-    </target>
-
-</project>
diff --git a/samples/pox/client/spring-ws/pom.xml b/samples/pox/client/spring-ws/pom.xml
new file mode 100644
index 00000000..1f15103e
--- /dev/null
+++ b/samples/pox/client/spring-ws/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>pox-client</artifactId>
+        <groupId>org.springframework.ws</groupId>
+        <version>2.0.0-M1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>pox-spring-ws-client</artifactId>
+    <packaging>jar</packaging>
+    <name>Spring WS POX Sample - Spring-WS Client</name>
+    <profiles>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>!1.6</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.xml.soap</groupId>
+                    <artifactId>saaj-api</artifactId>
+                    <scope>runtime</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <mainClass>org.springframework.ws.samples.pox.client.sws.ContactsClient</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>    
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.ws</groupId>
+            <artifactId>spring-xml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.ws</groupId>
+            <artifactId>spring-ws-core</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/samples/pox/client/spring-ws/src/org/springframework/ws/samples/pox/client/sws/ContactsClient.java b/samples/pox/client/spring-ws/src/main/java/org/springframework/ws/samples/pox/client/sws/ContactsClient.java
similarity index 97%
rename from samples/pox/client/spring-ws/src/org/springframework/ws/samples/pox/client/sws/ContactsClient.java
rename to samples/pox/client/spring-ws/src/main/java/org/springframework/ws/samples/pox/client/sws/ContactsClient.java
index a9d7972f..de19ac8d 100644
--- a/samples/pox/client/spring-ws/src/org/springframework/ws/samples/pox/client/sws/ContactsClient.java
+++ b/samples/pox/client/spring-ws/src/main/java/org/springframework/ws/samples/pox/client/sws/ContactsClient.java
@@ -52,7 +52,9 @@ public class ContactsClient extends WebServiceGatewaySupport {
         DOMResult result = new DOMResult();
         getWebServiceTemplate().sendSourceAndReceiveToResult(requestSource, result);
         int contactCount = (int) expression.evaluateAsNumber(result.getNode());
+        System.out.println();
         System.out.println("contactCount = " + contactCount);
+        System.out.println();
     }
 
     public static void main(String[] args) throws IOException {
diff --git a/samples/pox/client/spring-ws/src/log4j.properties b/samples/pox/client/spring-ws/src/main/resources/log4j.properties
similarity index 100%
rename from samples/pox/client/spring-ws/src/log4j.properties
rename to samples/pox/client/spring-ws/src/main/resources/log4j.properties
diff --git a/samples/pox/client/spring-ws/src/org/springframework/ws/samples/pox/client/sws/applicationContext.xml b/samples/pox/client/spring-ws/src/main/resources/org/springframework/ws/samples/pox/client/sws/applicationContext.xml
similarity index 98%
rename from samples/pox/client/spring-ws/src/org/springframework/ws/samples/pox/client/sws/applicationContext.xml
rename to samples/pox/client/spring-ws/src/main/resources/org/springframework/ws/samples/pox/client/sws/applicationContext.xml
index b76d5437..d8ac2897 100644
--- a/samples/pox/client/spring-ws/src/org/springframework/ws/samples/pox/client/sws/applicationContext.xml
+++ b/samples/pox/client/spring-ws/src/main/resources/org/springframework/ws/samples/pox/client/sws/applicationContext.xml
@@ -4,7 +4,7 @@
 
     <bean id="contactsClient" class="org.springframework.ws.samples.pox.client.sws.ContactsClient">
         <constructor-arg ref="messageFactory"/>
-        <property name="defaultUri" value="http://localhost:8080/pox/"/>
+        <property name="defaultUri" value="http://localhost:8080/pox-server/"/>
         <property name="request" value="classpath:org/springframework/ws/samples/pox/client/sws/contactsRequest.xml"/>
         <property name="expression" ref="expression"/>
     </bean>
diff --git a/samples/pox/client/curl/contactsRequest.xml b/samples/pox/client/spring-ws/src/main/resources/org/springframework/ws/samples/pox/client/sws/contactsRequest.xml
similarity index 100%
rename from samples/pox/client/curl/contactsRequest.xml
rename to samples/pox/client/spring-ws/src/main/resources/org/springframework/ws/samples/pox/client/sws/contactsRequest.xml
diff --git a/samples/pox/pom.xml b/samples/pox/server/pom.xml
similarity index 60%
rename from samples/pox/pom.xml
rename to samples/pox/server/pom.xml
index 8471e9e3..e79d5c52 100644
--- a/samples/pox/pom.xml
+++ b/samples/pox/server/pom.xml
@@ -1,14 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <artifactId>spring-ws-samples</artifactId>
+        <artifactId>pox</artifactId>
         <groupId>org.springframework.ws</groupId>
         <version>2.0.0-M1-SNAPSHOT</version>
-        <relativePath>../samples/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>pox</artifactId>
+    <artifactId>pox-server</artifactId>
     <packaging>war</packaging>
-    <name>Spring WS POX Sample</name>
+    <name>Spring WS POX Sample - Server</name>
     <description>A Spring-WS sample that uses Plain Old XML, rather than SOAP.</description>
     <profiles>
         <profile>
@@ -24,28 +24,11 @@
             </dependencies>
         </profile>
     </profiles>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <stylesheetfile>${basedir}/../../src/main/javadoc/javadoc.css</stylesheetfile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
     <dependencies>
         <!-- Spring-WS dependencies -->
         <dependency>
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-ws-core</artifactId>
         </dependency>
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>1.2_Java1.3</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/samples/pox/src/main/java/org/springframework/ws/samples/pox/ws/ContactCountEndpoint.java b/samples/pox/server/src/main/java/org/springframework/ws/samples/pox/ws/ContactCountEndpoint.java
similarity index 100%
rename from samples/pox/src/main/java/org/springframework/ws/samples/pox/ws/ContactCountEndpoint.java
rename to samples/pox/server/src/main/java/org/springframework/ws/samples/pox/ws/ContactCountEndpoint.java
diff --git a/samples/pox/src/main/resources/log4j.properties b/samples/pox/server/src/main/resources/log4j.properties
similarity index 100%
rename from samples/pox/src/main/resources/log4j.properties
rename to samples/pox/server/src/main/resources/log4j.properties
diff --git a/samples/pox/src/main/webapp/WEB-INF/contacts.xsd b/samples/pox/server/src/main/webapp/WEB-INF/contacts.xsd
similarity index 100%
rename from samples/pox/src/main/webapp/WEB-INF/contacts.xsd
rename to samples/pox/server/src/main/webapp/WEB-INF/contacts.xsd
diff --git a/samples/pox/src/main/webapp/WEB-INF/spring-ws-servlet.xml b/samples/pox/server/src/main/webapp/WEB-INF/spring-ws-servlet.xml
similarity index 100%
rename from samples/pox/src/main/webapp/WEB-INF/spring-ws-servlet.xml
rename to samples/pox/server/src/main/webapp/WEB-INF/spring-ws-servlet.xml
diff --git a/samples/pox/src/main/webapp/WEB-INF/web.xml b/samples/pox/server/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from samples/pox/src/main/webapp/WEB-INF/web.xml
rename to samples/pox/server/src/main/webapp/WEB-INF/web.xml
diff --git a/samples/pox/src/test/java/org/springframework/ws/samples/pox/ws/ContactCountEndpointTest.java b/samples/pox/server/src/test/java/org/springframework/ws/samples/pox/ws/ContactCountEndpointTest.java
similarity index 100%
rename from samples/pox/src/test/java/org/springframework/ws/samples/pox/ws/ContactCountEndpointTest.java
rename to samples/pox/server/src/test/java/org/springframework/ws/samples/pox/ws/ContactCountEndpointTest.java
diff --git a/samples/pox/src/test/resources/org/springframework/ws/samples/pox/ws/contactCountResponse.xml b/samples/pox/server/src/test/resources/org/springframework/ws/samples/pox/ws/contactCountResponse.xml
similarity index 100%
rename from samples/pox/src/test/resources/org/springframework/ws/samples/pox/ws/contactCountResponse.xml
rename to samples/pox/server/src/test/resources/org/springframework/ws/samples/pox/ws/contactCountResponse.xml
diff --git a/samples/pox/client/spring-ws/src/org/springframework/ws/samples/pox/client/sws/contactsRequest.xml b/samples/pox/server/src/test/resources/org/springframework/ws/samples/pox/ws/contactsRequest.xml
similarity index 100%
rename from samples/pox/client/spring-ws/src/org/springframework/ws/samples/pox/client/sws/contactsRequest.xml
rename to samples/pox/server/src/test/resources/org/springframework/ws/samples/pox/ws/contactsRequest.xml
diff --git a/samples/pox/src/test/resources/org/springframework/ws/samples/pox/ws/contactsRequest.xml b/samples/pox/src/test/resources/org/springframework/ws/samples/pox/ws/contactsRequest.xml
deleted file mode 100644
index ad5fdc4f..00000000
--- a/samples/pox/src/test/resources/org/springframework/ws/samples/pox/ws/contactsRequest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Contacts xmlns="http://www.springframework.org/spring-ws/samples/pox">
-    <Contact>
-        <Name>John Doe</Name>
-        <Phone>626-555-3456</Phone>
-    </Contact>
-    <Contact>
-        <Name>Jane Doe</Name>
-        <Phone>626-555-6543</Phone>
-    </Contact>
-</Contacts>
\ No newline at end of file