diff --git a/core/pom.xml b/core/pom.xml
index cdda4923..1e7119f1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -101,5 +101,16 @@
             <groupId>javax.activation</groupId>
             <artifactId>activation</artifactId>
         </dependency>
+        <!-- Transport dependencies -->
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/sandbox/src/main/java/org/springframework/ws/client/WebServiceClientException.java b/core/src/main/java/org/springframework/ws/client/WebServiceClientException.java
similarity index 100%
rename from sandbox/src/main/java/org/springframework/ws/client/WebServiceClientException.java
rename to core/src/main/java/org/springframework/ws/client/WebServiceClientException.java
diff --git a/sandbox/src/main/java/org/springframework/ws/client/WebServiceMessageCallback.java b/core/src/main/java/org/springframework/ws/client/WebServiceMessageCallback.java
similarity index 100%
rename from sandbox/src/main/java/org/springframework/ws/client/WebServiceMessageCallback.java
rename to core/src/main/java/org/springframework/ws/client/WebServiceMessageCallback.java
diff --git a/sandbox/src/main/java/org/springframework/ws/client/WebServiceOperations.java b/core/src/main/java/org/springframework/ws/client/WebServiceOperations.java
similarity index 100%
rename from sandbox/src/main/java/org/springframework/ws/client/WebServiceOperations.java
rename to core/src/main/java/org/springframework/ws/client/WebServiceOperations.java
diff --git a/sandbox/src/main/java/org/springframework/ws/client/WebServiceTemplate.java b/core/src/main/java/org/springframework/ws/client/WebServiceTemplate.java
similarity index 100%
rename from sandbox/src/main/java/org/springframework/ws/client/WebServiceTemplate.java
rename to core/src/main/java/org/springframework/ws/client/WebServiceTemplate.java
diff --git a/sandbox/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java b/core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java
similarity index 100%
rename from sandbox/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java
rename to core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java
diff --git a/sandbox/src/main/java/org/springframework/ws/client/support/WebServiceGatewaySupport.java b/core/src/main/java/org/springframework/ws/client/support/WebServiceGatewaySupport.java
similarity index 100%
rename from sandbox/src/main/java/org/springframework/ws/client/support/WebServiceGatewaySupport.java
rename to core/src/main/java/org/springframework/ws/client/support/WebServiceGatewaySupport.java
diff --git a/sandbox/src/main/java/org/springframework/ws/transport/WebServiceMessageSender.java b/core/src/main/java/org/springframework/ws/transport/WebServiceMessageSender.java
similarity index 100%
rename from sandbox/src/main/java/org/springframework/ws/transport/WebServiceMessageSender.java
rename to core/src/main/java/org/springframework/ws/transport/WebServiceMessageSender.java
diff --git a/sandbox/src/main/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSender.java b/core/src/main/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSender.java
similarity index 100%
rename from sandbox/src/main/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSender.java
rename to core/src/main/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSender.java
diff --git a/sandbox/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java b/core/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java
similarity index 100%
rename from sandbox/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java
rename to core/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java
diff --git a/sandbox/src/main/java/org/springframework/ws/transport/http/CommonsHttpTransportInputStream.java b/core/src/main/java/org/springframework/ws/transport/http/CommonsHttpTransportInputStream.java
similarity index 100%
rename from sandbox/src/main/java/org/springframework/ws/transport/http/CommonsHttpTransportInputStream.java
rename to core/src/main/java/org/springframework/ws/transport/http/CommonsHttpTransportInputStream.java
diff --git a/sandbox/src/main/java/org/springframework/ws/transport/http/CommonsHttpTransportOutputStream.java b/core/src/main/java/org/springframework/ws/transport/http/CommonsHttpTransportOutputStream.java
similarity index 100%
rename from sandbox/src/main/java/org/springframework/ws/transport/http/CommonsHttpTransportOutputStream.java
rename to core/src/main/java/org/springframework/ws/transport/http/CommonsHttpTransportOutputStream.java
diff --git a/sandbox/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSender.java b/core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSender.java
similarity index 100%
rename from sandbox/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSender.java
rename to core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSender.java
diff --git a/sandbox/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionTransportInputStream.java b/core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionTransportInputStream.java
similarity index 100%
rename from sandbox/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionTransportInputStream.java
rename to core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionTransportInputStream.java
diff --git a/sandbox/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionTransportOutputStream.java b/core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionTransportOutputStream.java
similarity index 100%
rename from sandbox/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionTransportOutputStream.java
rename to core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionTransportOutputStream.java
diff --git a/sandbox/src/test/java/org/springframework/ws/client/WebServiceTemplateTest.java b/core/src/test/java/org/springframework/ws/client/WebServiceTemplateTest.java
similarity index 100%
rename from sandbox/src/test/java/org/springframework/ws/client/WebServiceTemplateTest.java
rename to core/src/test/java/org/springframework/ws/client/WebServiceTemplateTest.java
diff --git a/sandbox/src/test/java/org/springframework/ws/client/support/WebServiceAccessorTest.java b/core/src/test/java/org/springframework/ws/client/support/WebServiceAccessorTest.java
similarity index 100%
rename from sandbox/src/test/java/org/springframework/ws/client/support/WebServiceAccessorTest.java
rename to core/src/test/java/org/springframework/ws/client/support/WebServiceAccessorTest.java
diff --git a/sandbox/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderTestCase.java b/core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderTestCase.java
similarity index 100%
rename from sandbox/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderTestCase.java
rename to core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderTestCase.java
diff --git a/sandbox/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderTest.java b/core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderTest.java
similarity index 100%
rename from sandbox/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderTest.java
rename to core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderTest.java
diff --git a/sandbox/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderTest.java b/core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderTest.java
similarity index 100%
rename from sandbox/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderTest.java
rename to core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderTest.java
diff --git a/pom.xml b/pom.xml
index 35c9d277..09393d4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -557,6 +557,11 @@
                 <artifactId>commons-httpclient</artifactId>
                 <version>3.0.1</version>
             </dependency>
+            <dependency>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty</artifactId>
+                <version>6.1.0</version>
+            </dependency>
             <!-- Logging dependencies -->
             <dependency>
                 <groupId>commons-logging</groupId>