diff --git a/spring-web-reactive/build.gradle b/spring-web-reactive/build.gradle
index d227418046..8d0d6709f5 100644
--- a/spring-web-reactive/build.gradle
+++ b/spring-web-reactive/build.gradle
@@ -44,17 +44,17 @@ dependencies {
 
 	optional "io.projectreactor:reactor-net:2.1.0.BUILD-SNAPSHOT"
 
+	optional 'org.apache.tomcat:tomcat-util:8.0.24'
+	optional 'org.apache.tomcat.embed:tomcat-embed-core:8.0.24'
+
+	optional 'org.eclipse.jetty:jetty-server:9.3.2.v20150730'
+	optional 'org.eclipse.jetty:jetty-servlet:9.3.2.v20150730'
+
 	provided "javax.servlet:javax.servlet-api:3.1.0"
 
 	testCompile "junit:junit:4.12"
 	testCompile "org.springframework:spring-test:4.2.0.RELEASE"
 
-	testCompile 'org.apache.tomcat:tomcat-util:8.0.24'
-	testCompile 'org.apache.tomcat.embed:tomcat-embed-core:8.0.24'
-
-	testCompile 'org.eclipse.jetty:jetty-server:9.3.2.v20150730'
-	testCompile 'org.eclipse.jetty:jetty-servlet:9.3.2.v20150730'
-
 	testCompile "org.slf4j:slf4j-jcl:1.7.12"
 	testCompile "org.slf4j:jul-to-slf4j:1.7.12"
 	testCompile("log4j:log4j:1.2.16")
diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/HttpServer.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpServer.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/http/HttpServer.java
rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpServer.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/HttpServerSupport.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpServerSupport.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/http/HttpServerSupport.java
rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpServerSupport.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/ReactorHttpServer.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorHttpServer.java
similarity index 91%
rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/http/ReactorHttpServer.java
rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorHttpServer.java
index 028e650137..063b725e9f 100644
--- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/ReactorHttpServer.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorHttpServer.java
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.reactive.web.http;
+package org.springframework.reactive.web.http.reactor;
 
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.reactive.web.http.HttpServer;
+import org.springframework.reactive.web.http.HttpServerSupport;
 import org.springframework.reactive.web.http.reactor.RequestHandlerAdapter;
 import org.springframework.util.Assert;
 import reactor.bus.selector.Selectors;
diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/RxNettyHttpServer.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyHttpServer.java
similarity index 91%
rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/http/RxNettyHttpServer.java
rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyHttpServer.java
index d3eb174c03..d07cc78c84 100644
--- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/RxNettyHttpServer.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyHttpServer.java
@@ -13,11 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.reactive.web.http;
+package org.springframework.reactive.web.http.rxnetty;
 
 import io.netty.buffer.ByteBuf;
 
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.reactive.web.http.HttpServer;
+import org.springframework.reactive.web.http.HttpServerSupport;
 import org.springframework.reactive.web.http.rxnetty.RequestHandlerAdapter;
 import org.springframework.util.Assert;
 
diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/JettyHttpServer.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/JettyHttpServer.java
similarity index 92%
rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/http/JettyHttpServer.java
rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/JettyHttpServer.java
index ce2bc19e8b..ddfd5d01ab 100644
--- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/JettyHttpServer.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/JettyHttpServer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.reactive.web.http;
+package org.springframework.reactive.web.http.servlet;
 
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
@@ -21,7 +21,8 @@ import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.reactive.web.http.servlet.HttpHandlerServlet;
+import org.springframework.reactive.web.http.HttpServer;
+import org.springframework.reactive.web.http.HttpServerSupport;
 import org.springframework.util.Assert;
 import org.springframework.util.SocketUtils;
 
diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/TomcatHttpServer.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/TomcatHttpServer.java
similarity index 92%
rename from spring-web-reactive/src/test/java/org/springframework/reactive/web/http/TomcatHttpServer.java
rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/TomcatHttpServer.java
index 18716d4e97..16e37d0e85 100644
--- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/TomcatHttpServer.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/TomcatHttpServer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.reactive.web.http;
+package org.springframework.reactive.web.http.servlet;
 
 import java.io.File;
 
@@ -22,7 +22,8 @@ import org.apache.catalina.LifecycleException;
 import org.apache.catalina.startup.Tomcat;
 
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.reactive.web.http.servlet.HttpHandlerServlet;
+import org.springframework.reactive.web.http.HttpServer;
+import org.springframework.reactive.web.http.HttpServerSupport;
 import org.springframework.util.Assert;
 import org.springframework.util.SocketUtils;
 
diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/AbstractHttpHandlerIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/AbstractHttpHandlerIntegrationTests.java
index 4a01fa334c..56d36384e8 100644
--- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/AbstractHttpHandlerIntegrationTests.java
+++ b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/AbstractHttpHandlerIntegrationTests.java
@@ -21,6 +21,10 @@ import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import org.springframework.reactive.web.http.reactor.ReactorHttpServer;
+import org.springframework.reactive.web.http.rxnetty.RxNettyHttpServer;
+import org.springframework.reactive.web.http.servlet.JettyHttpServer;
+import org.springframework.reactive.web.http.servlet.TomcatHttpServer;
 import org.springframework.util.SocketUtils;