diff --git a/samples/airline/client/spring-ws/pom.xml b/samples/airline/client/spring-ws/pom.xml
new file mode 100644
index 00000000..acdf7ff9
--- /dev/null
+++ b/samples/airline/client/spring-ws/pom.xml
@@ -0,0 +1,86 @@
+<?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>airline-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>airline-spring-ws-client</artifactId>
+    <packaging>jar</packaging>
+    <name>Spring WS Airline 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>xmlbeans-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>xmlbeans</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <schemaDirectory>${project.basedir}/../../server/src/main/webapp/</schemaDirectory>
+                </configuration>
+            </plugin>
+            <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.airline.client.sws.GetFlights</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
+        </dependency>
+        <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-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.ws</groupId>
+            <artifactId>spring-ws-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.security</groupId>
+            <artifactId>wss4j</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/samples/airline/client/spring-ws/src/org/springframework/ws/samples/airline/client/sws/GetFlights.java b/samples/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/GetFlights.java
similarity index 100%
rename from samples/airline/client/spring-ws/src/org/springframework/ws/samples/airline/client/sws/GetFlights.java
rename to samples/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/GetFlights.java
diff --git a/samples/airline/client/spring-ws/src/org/springframework/ws/samples/airline/client/sws/GetFrequentFlyerMileage.java b/samples/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/GetFrequentFlyerMileage.java
similarity index 95%
rename from samples/airline/client/spring-ws/src/org/springframework/ws/samples/airline/client/sws/GetFrequentFlyerMileage.java
rename to samples/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/GetFrequentFlyerMileage.java
index ab959a93..8caf7893 100644
--- a/samples/airline/client/spring-ws/src/org/springframework/ws/samples/airline/client/sws/GetFrequentFlyerMileage.java
+++ b/samples/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/GetFrequentFlyerMileage.java
@@ -45,7 +45,7 @@ public class GetFrequentFlyerMileage extends WebServiceGatewaySupport {
         ApplicationContext applicationContext = new ClassPathXmlApplicationContext(
                 "org/springframework/ws/samples/airline/client/sws/applicationContext.xml");
 
-        GetFrequentFlyerMileage getFrequentFlyerMileage = (GetFrequentFlyerMileage) applicationContext
+        GetFrequentFlyerMileage getFrequentFlyerMileage = applicationContext
                 .getBean("getFrequentFlyerMileage", GetFrequentFlyerMileage.class);
         getFrequentFlyerMileage.getFrequentFlyerMileage();
     }
diff --git a/samples/airline/client/spring-ws/src/org/springframework/ws/samples/airline/client/sws/applicationContext.xml b/samples/airline/client/spring-ws/src/main/resources/org/springframework/ws/samples/airline/client/sws/applicationContext.xml
similarity index 97%
rename from samples/airline/client/spring-ws/src/org/springframework/ws/samples/airline/client/sws/applicationContext.xml
rename to samples/airline/client/spring-ws/src/main/resources/org/springframework/ws/samples/airline/client/sws/applicationContext.xml
index e3ded019..2013f876 100644
--- a/samples/airline/client/spring-ws/src/org/springframework/ws/samples/airline/client/sws/applicationContext.xml
+++ b/samples/airline/client/spring-ws/src/main/resources/org/springframework/ws/samples/airline/client/sws/applicationContext.xml
@@ -8,7 +8,7 @@
         <constructor-arg ref="messagFactory"/>
         <property name="destinationProvider">
             <bean class="org.springframework.ws.client.support.destination.Wsdl11DestinationProvider">
-                <property name="wsdl" value="http://localhost:8080/airline/airline.wsdl"/>
+                <property name="wsdl" value="http://localhost:8080/airline-server/airline.wsdl"/>
             </bean>
         </property>
     </bean>
diff --git a/samples/airline/client/spring-ws/src/org/springframework/ws/samples/airline/client/sws/securityPolicy.xml b/samples/airline/client/spring-ws/src/main/resources/org/springframework/ws/samples/airline/client/sws/securityPolicy.xml
similarity index 100%
rename from samples/airline/client/spring-ws/src/org/springframework/ws/samples/airline/client/sws/securityPolicy.xml
rename to samples/airline/client/spring-ws/src/main/resources/org/springframework/ws/samples/airline/client/sws/securityPolicy.xml