diff --git a/jetty-fcgi/fcgi-core/pom.xml b/jetty-fcgi/fcgi-client/pom.xml
similarity index 75%
rename from jetty-fcgi/fcgi-core/pom.xml
rename to jetty-fcgi/fcgi-client/pom.xml
index c83bd453bd5..4844b233eca 100644
--- a/jetty-fcgi/fcgi-core/pom.xml
+++ b/jetty-fcgi/fcgi-client/pom.xml
@@ -9,11 +9,11 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>fcgi-core</artifactId>
-    <name>Jetty :: FastCGI :: Core</name>
+    <artifactId>fcgi-client</artifactId>
+    <name>Jetty :: FastCGI :: Client</name>
 
     <properties>
-        <bundle-symbolic-name>${project.groupId}.core</bundle-symbolic-name>
+        <bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
     </properties>
 
     <dependencies>
@@ -32,6 +32,11 @@
             <artifactId>jetty-http</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/FCGI.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/FCGI.java
similarity index 100%
rename from jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/FCGI.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/FCGI.java
diff --git a/jetty-fcgi/fcgi-http-client-transport/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpChannelOverFCGI.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpChannelOverFCGI.java
similarity index 100%
rename from jetty-fcgi/fcgi-http-client-transport/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpChannelOverFCGI.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpChannelOverFCGI.java
diff --git a/jetty-fcgi/fcgi-http-client-transport/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpClientTransportOverFCGI.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpClientTransportOverFCGI.java
similarity index 100%
rename from jetty-fcgi/fcgi-http-client-transport/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpClientTransportOverFCGI.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpClientTransportOverFCGI.java
diff --git a/jetty-fcgi/fcgi-http-client-transport/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java
similarity index 100%
rename from jetty-fcgi/fcgi-http-client-transport/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java
diff --git a/jetty-fcgi/fcgi-http-client-transport/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpDestinationOverFCGI.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpDestinationOverFCGI.java
similarity index 100%
rename from jetty-fcgi/fcgi-http-client-transport/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpDestinationOverFCGI.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpDestinationOverFCGI.java
diff --git a/jetty-fcgi/fcgi-http-client-transport/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpReceiverOverFCGI.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpReceiverOverFCGI.java
similarity index 100%
rename from jetty-fcgi/fcgi-http-client-transport/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpReceiverOverFCGI.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpReceiverOverFCGI.java
diff --git a/jetty-fcgi/fcgi-http-client-transport/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpSenderOverFCGI.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpSenderOverFCGI.java
similarity index 100%
rename from jetty-fcgi/fcgi-http-client-transport/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpSenderOverFCGI.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpSenderOverFCGI.java
diff --git a/jetty-fcgi/fcgi-http-client-transport/src/main/java/org/eclipse/jetty/fcgi/client/http/MultiplexHttpDestinationOverFCGI.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/MultiplexHttpDestinationOverFCGI.java
similarity index 100%
rename from jetty-fcgi/fcgi-http-client-transport/src/main/java/org/eclipse/jetty/fcgi/client/http/MultiplexHttpDestinationOverFCGI.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/MultiplexHttpDestinationOverFCGI.java
diff --git a/jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/generator/ClientGenerator.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/ClientGenerator.java
similarity index 100%
rename from jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/generator/ClientGenerator.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/ClientGenerator.java
diff --git a/jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java
similarity index 100%
rename from jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java
diff --git a/jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/generator/Generator.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Generator.java
similarity index 100%
rename from jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/generator/Generator.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Generator.java
diff --git a/jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/generator/ServerGenerator.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/ServerGenerator.java
similarity index 100%
rename from jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/generator/ServerGenerator.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/ServerGenerator.java
diff --git a/jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/BeginRequestContentParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/BeginRequestContentParser.java
similarity index 100%
rename from jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/BeginRequestContentParser.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/BeginRequestContentParser.java
diff --git a/jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ClientParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ClientParser.java
similarity index 100%
rename from jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ClientParser.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ClientParser.java
diff --git a/jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ContentParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ContentParser.java
similarity index 100%
rename from jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ContentParser.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ContentParser.java
diff --git a/jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java
similarity index 100%
rename from jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java
diff --git a/jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java
similarity index 100%
rename from jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java
diff --git a/jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java
similarity index 100%
rename from jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java
diff --git a/jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java
similarity index 100%
rename from jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java
diff --git a/jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java
similarity index 100%
rename from jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java
diff --git a/jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ServerParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ServerParser.java
similarity index 100%
rename from jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/ServerParser.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ServerParser.java
diff --git a/jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java
similarity index 100%
rename from jetty-fcgi/fcgi-core/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java
rename to jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java
diff --git a/jetty-fcgi/fcgi-core/src/test/java/org/eclipse/jetty/fcgi/generator/ClientGeneratorTest.java b/jetty-fcgi/fcgi-client/src/test/java/org/eclipse/jetty/fcgi/generator/ClientGeneratorTest.java
similarity index 100%
rename from jetty-fcgi/fcgi-core/src/test/java/org/eclipse/jetty/fcgi/generator/ClientGeneratorTest.java
rename to jetty-fcgi/fcgi-client/src/test/java/org/eclipse/jetty/fcgi/generator/ClientGeneratorTest.java
diff --git a/jetty-fcgi/fcgi-core/src/test/java/org/eclipse/jetty/fcgi/parser/ClientParserTest.java b/jetty-fcgi/fcgi-client/src/test/java/org/eclipse/jetty/fcgi/parser/ClientParserTest.java
similarity index 100%
rename from jetty-fcgi/fcgi-core/src/test/java/org/eclipse/jetty/fcgi/parser/ClientParserTest.java
rename to jetty-fcgi/fcgi-client/src/test/java/org/eclipse/jetty/fcgi/parser/ClientParserTest.java
diff --git a/jetty-fcgi/fcgi-core/src/test/resources/jetty-logging.properties b/jetty-fcgi/fcgi-client/src/test/resources/jetty-logging.properties
similarity index 100%
rename from jetty-fcgi/fcgi-core/src/test/resources/jetty-logging.properties
rename to jetty-fcgi/fcgi-client/src/test/resources/jetty-logging.properties
diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml
index 4baa432ba87..f40a0950f66 100644
--- a/jetty-fcgi/fcgi-server/pom.xml
+++ b/jetty-fcgi/fcgi-server/pom.xml
@@ -17,9 +17,18 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.fcgi</groupId>
-            <artifactId>fcgi-core</artifactId>
+            <artifactId>fcgi-client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-proxy</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -27,6 +36,19 @@
             <artifactId>jetty-server</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.spdy</groupId>
+            <artifactId>spdy-http-server</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/jetty-fcgi/fcgi-distribution/src/main/config/modules/fcgi.mod b/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod
similarity index 100%
rename from jetty-fcgi/fcgi-distribution/src/main/config/modules/fcgi.mod
rename to jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod
diff --git a/jetty-fcgi/fcgi-proxy/src/main/java/org/eclipse/jetty/fcgi/proxy/FastCGIProxyServlet.java b/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/proxy/FastCGIProxyServlet.java
similarity index 99%
rename from jetty-fcgi/fcgi-proxy/src/main/java/org/eclipse/jetty/fcgi/proxy/FastCGIProxyServlet.java
rename to jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/proxy/FastCGIProxyServlet.java
index 505bca50335..5107f3b2323 100644
--- a/jetty-fcgi/fcgi-proxy/src/main/java/org/eclipse/jetty/fcgi/proxy/FastCGIProxyServlet.java
+++ b/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/proxy/FastCGIProxyServlet.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.fcgi.proxy;
+package org.eclipse.jetty.fcgi.server.proxy;
 
 import java.net.URI;
 import java.util.regex.Matcher;
diff --git a/jetty-fcgi/fcgi-proxy/src/main/java/org/eclipse/jetty/fcgi/proxy/TryFilesFilter.java b/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/proxy/TryFilesFilter.java
similarity index 98%
rename from jetty-fcgi/fcgi-proxy/src/main/java/org/eclipse/jetty/fcgi/proxy/TryFilesFilter.java
rename to jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/proxy/TryFilesFilter.java
index 7a179847b2b..44c7f2a4187 100644
--- a/jetty-fcgi/fcgi-proxy/src/main/java/org/eclipse/jetty/fcgi/proxy/TryFilesFilter.java
+++ b/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/proxy/TryFilesFilter.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.fcgi.proxy;
+package org.eclipse.jetty.fcgi.server.proxy;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
diff --git a/jetty-fcgi/fcgi-http-client-transport/src/test/java/org/eclipse/jetty/fcgi/client/http/AbstractHttpClientServerTest.java b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java
similarity index 96%
rename from jetty-fcgi/fcgi-http-client-transport/src/test/java/org/eclipse/jetty/fcgi/client/http/AbstractHttpClientServerTest.java
rename to jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java
index b6eed0396c2..cabdca854af 100644
--- a/jetty-fcgi/fcgi-http-client-transport/src/test/java/org/eclipse/jetty/fcgi/client/http/AbstractHttpClientServerTest.java
+++ b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.fcgi.client.http;
+package org.eclipse.jetty.fcgi.server;
 
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -25,7 +25,8 @@ import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.HttpDestination;
 import org.eclipse.jetty.client.LeakTrackingConnectionPool;
 import org.eclipse.jetty.client.Origin;
-import org.eclipse.jetty.fcgi.server.ServerFCGIConnectionFactory;
+import org.eclipse.jetty.fcgi.client.http.HttpClientTransportOverFCGI;
+import org.eclipse.jetty.fcgi.client.http.HttpDestinationOverFCGI;
 import org.eclipse.jetty.http.HttpScheme;
 import org.eclipse.jetty.io.ArrayByteBufferPool;
 import org.eclipse.jetty.io.LeakTrackingByteBufferPool;
diff --git a/jetty-fcgi/fcgi-http-client-transport/src/test/java/org/eclipse/jetty/fcgi/client/http/EmptyServerHandler.java b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/EmptyServerHandler.java
similarity index 96%
rename from jetty-fcgi/fcgi-http-client-transport/src/test/java/org/eclipse/jetty/fcgi/client/http/EmptyServerHandler.java
rename to jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/EmptyServerHandler.java
index e14b24c02e7..7eaf4e2091e 100644
--- a/jetty-fcgi/fcgi-http-client-transport/src/test/java/org/eclipse/jetty/fcgi/client/http/EmptyServerHandler.java
+++ b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/EmptyServerHandler.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.fcgi.client.http;
+package org.eclipse.jetty.fcgi.server;
 
 import java.io.IOException;
 import javax.servlet.ServletException;
diff --git a/jetty-fcgi/fcgi-http-client-transport/src/test/java/org/eclipse/jetty/fcgi/client/http/ExternalFastCGIServerTest.java b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/ExternalFastCGIServerTest.java
similarity index 94%
rename from jetty-fcgi/fcgi-http-client-transport/src/test/java/org/eclipse/jetty/fcgi/client/http/ExternalFastCGIServerTest.java
rename to jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/ExternalFastCGIServerTest.java
index b1b2ee394df..871b2031222 100644
--- a/jetty-fcgi/fcgi-http-client-transport/src/test/java/org/eclipse/jetty/fcgi/client/http/ExternalFastCGIServerTest.java
+++ b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/ExternalFastCGIServerTest.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.fcgi.client.http;
+package org.eclipse.jetty.fcgi.server;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.api.ContentResponse;
+import org.eclipse.jetty.fcgi.client.http.HttpClientTransportOverFCGI;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/jetty-fcgi/fcgi-http-client-transport/src/test/java/org/eclipse/jetty/fcgi/client/http/HttpClientTest.java b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
similarity index 99%
rename from jetty-fcgi/fcgi-http-client-transport/src/test/java/org/eclipse/jetty/fcgi/client/http/HttpClientTest.java
rename to jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
index b176523dce4..3db51fd48c9 100644
--- a/jetty-fcgi/fcgi-http-client-transport/src/test/java/org/eclipse/jetty/fcgi/client/http/HttpClientTest.java
+++ b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.fcgi.client.http;
+package org.eclipse.jetty.fcgi.server;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/jetty-fcgi/fcgi-proxy/src/test/java/org/eclipse/jetty/fcgi/proxy/DrupalSPDYFastCGIProxyServer.java b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/DrupalSPDYFastCGIProxyServer.java
similarity index 98%
rename from jetty-fcgi/fcgi-proxy/src/test/java/org/eclipse/jetty/fcgi/proxy/DrupalSPDYFastCGIProxyServer.java
rename to jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/DrupalSPDYFastCGIProxyServer.java
index 47ea8cd5536..227fa66e570 100644
--- a/jetty-fcgi/fcgi-proxy/src/test/java/org/eclipse/jetty/fcgi/proxy/DrupalSPDYFastCGIProxyServer.java
+++ b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/DrupalSPDYFastCGIProxyServer.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.fcgi.proxy;
+package org.eclipse.jetty.fcgi.server.proxy;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/jetty-fcgi/fcgi-proxy/src/test/java/org/eclipse/jetty/fcgi/proxy/WordPressSPDYFastCGIProxyServer.java b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/WordPressSPDYFastCGIProxyServer.java
similarity index 98%
rename from jetty-fcgi/fcgi-proxy/src/test/java/org/eclipse/jetty/fcgi/proxy/WordPressSPDYFastCGIProxyServer.java
rename to jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/WordPressSPDYFastCGIProxyServer.java
index d1bbd0686d7..ea023a4b00a 100644
--- a/jetty-fcgi/fcgi-proxy/src/test/java/org/eclipse/jetty/fcgi/proxy/WordPressSPDYFastCGIProxyServer.java
+++ b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/WordPressSPDYFastCGIProxyServer.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.fcgi.proxy;
+package org.eclipse.jetty.fcgi.server.proxy;
 
 import java.util.EnumSet;
 import java.util.HashMap;
diff --git a/jetty-fcgi/fcgi-proxy/src/test/resources/jetty-logging.properties b/jetty-fcgi/fcgi-server/src/test/resources/jetty-logging.properties
similarity index 100%
rename from jetty-fcgi/fcgi-proxy/src/test/resources/jetty-logging.properties
rename to jetty-fcgi/fcgi-server/src/test/resources/jetty-logging.properties
diff --git a/jetty-fcgi/fcgi-proxy/src/test/resources/keystore.jks b/jetty-fcgi/fcgi-server/src/test/resources/keystore.jks
similarity index 100%
rename from jetty-fcgi/fcgi-proxy/src/test/resources/keystore.jks
rename to jetty-fcgi/fcgi-server/src/test/resources/keystore.jks
diff --git a/jetty-fcgi/fcgi-proxy/src/test/resources/truststore.jks b/jetty-fcgi/fcgi-server/src/test/resources/truststore.jks
similarity index 100%
rename from jetty-fcgi/fcgi-proxy/src/test/resources/truststore.jks
rename to jetty-fcgi/fcgi-server/src/test/resources/truststore.jks
diff --git a/jetty-fcgi/pom.xml b/jetty-fcgi/pom.xml
index d67b4046dc5..3054c2db4af 100644
--- a/jetty-fcgi/pom.xml
+++ b/jetty-fcgi/pom.xml
@@ -15,11 +15,11 @@
     <name>Jetty :: FastCGI :: Parent</name>
 
     <modules>
-        <module>fcgi-core</module>
-        <module>fcgi-http-client-transport</module>
+        <module>fcgi-client</module>
+        <!--<module>fcgi-http-client-transport</module>-->
         <module>fcgi-server</module>
-        <module>fcgi-proxy</module>
-        <module>fcgi-distribution</module>
+        <!--<module>fcgi-proxy</module>-->
+        <!--<module>fcgi-distribution</module>-->
     </modules>
 
     <dependencies>