diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml
index a5071238200..9b32a761e5b 100644
--- a/jetty-http/pom.xml
+++ b/jetty-http/pom.xml
@@ -25,11 +25,6 @@
       <artifactId>jetty-io</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-servlet-api</artifactId>
-      <optional>true</optional>
-    </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
@@ -40,14 +35,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>
-            @{argLine} ${jetty.surefire.argLine} --add-modules jetty.servlet.api
-          </argLine>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
diff --git a/jetty-http/src/main/java/module-info.java b/jetty-http/src/main/java/module-info.java
index 8b3ee0e3bbb..09320f89cc5 100644
--- a/jetty-http/src/main/java/module-info.java
+++ b/jetty-http/src/main/java/module-info.java
@@ -26,9 +26,6 @@ module org.eclipse.jetty.http
 
     requires transitive org.eclipse.jetty.io;
 
-    // Only required if using the MultiPart classes.
-    requires static jetty.servlet.api;
-
     uses HttpFieldPreEncoder;
 
     provides HttpFieldPreEncoder with Http1FieldPreEncoder;
diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormInputStream.java b/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java
similarity index 99%
rename from jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormInputStream.java
rename to jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java
index d960c2a3e5a..1ec16938043 100644
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormInputStream.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.http;
+package org.eclipse.jetty.server;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartParser.java b/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartParser.java
similarity index 99%
rename from jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartParser.java
rename to jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartParser.java
index 5109a67cb34..667852b8c9c 100644
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartParser.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartParser.java
@@ -16,13 +16,15 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.http;
+package org.eclipse.jetty.server;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.EnumSet;
 
+import org.eclipse.jetty.http.BadMessageException;
 import org.eclipse.jetty.http.HttpParser.RequestHandler;
+import org.eclipse.jetty.http.HttpTokens;
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.SearchPattern;
 import org.eclipse.jetty.util.Utf8StringBuilder;
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
index 2a604bbce43..4c4bef9bfdb 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
@@ -81,7 +81,6 @@ import org.eclipse.jetty.http.HttpURI;
 import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.http.MetaData;
 import org.eclipse.jetty.http.MimeTypes;
-import org.eclipse.jetty.http.MultiPartFormInputStream;
 import org.eclipse.jetty.http.pathmap.PathSpec;
 import org.eclipse.jetty.http.pathmap.ServletPathSpec;
 import org.eclipse.jetty.io.RuntimeIOException;
diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartCaptureTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/MultiPartCaptureTest.java
similarity index 99%
rename from jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartCaptureTest.java
rename to jetty-server/src/test/java/org/eclipse/jetty/server/MultiPartCaptureTest.java
index 6635735ace9..30a37225446 100644
--- a/jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartCaptureTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/MultiPartCaptureTest.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.http;
+package org.eclipse.jetty.server;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartFormInputStreamTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/MultiPartFormInputStreamTest.java
similarity index 99%
rename from jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartFormInputStreamTest.java
rename to jetty-server/src/test/java/org/eclipse/jetty/server/MultiPartFormInputStreamTest.java
index 2308314886c..0ab8b47fbc1 100644
--- a/jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartFormInputStreamTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/MultiPartFormInputStreamTest.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.http;
+package org.eclipse.jetty.server;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -31,7 +31,7 @@ import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.Part;
 
-import org.eclipse.jetty.http.MultiPartFormInputStream.MultiPart;
+import org.eclipse.jetty.server.MultiPartFormInputStream.MultiPart;
 import org.eclipse.jetty.util.IO;
 import org.junit.jupiter.api.Test;
 
diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartParserTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/MultiPartParserTest.java
similarity index 99%
rename from jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartParserTest.java
rename to jetty-server/src/test/java/org/eclipse/jetty/server/MultiPartParserTest.java
index 44358ebabcd..2fa99b6b798 100644
--- a/jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartParserTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/MultiPartParserTest.java
@@ -16,14 +16,15 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.http;
+package org.eclipse.jetty.server;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
-import org.eclipse.jetty.http.MultiPartParser.State;
+import org.eclipse.jetty.http.BadMessageException;
+import org.eclipse.jetty.server.MultiPartParser.State;
 import org.eclipse.jetty.util.BufferUtil;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-company-urlencoded-apache-httpcomp.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-company-urlencoded-apache-httpcomp.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-company-urlencoded-apache-httpcomp.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-company-urlencoded-apache-httpcomp.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-company-urlencoded-apache-httpcomp.raw b/jetty-server/src/test/resources/multipart/browser-capture-company-urlencoded-apache-httpcomp.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-company-urlencoded-apache-httpcomp.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-company-urlencoded-apache-httpcomp.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-complex-apache-httpcomp.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-complex-apache-httpcomp.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-complex-apache-httpcomp.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-complex-apache-httpcomp.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-complex-apache-httpcomp.raw b/jetty-server/src/test/resources/multipart/browser-capture-complex-apache-httpcomp.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-complex-apache-httpcomp.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-complex-apache-httpcomp.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-complex-jetty-client.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-complex-jetty-client.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-complex-jetty-client.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-complex-jetty-client.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-complex-jetty-client.raw b/jetty-server/src/test/resources/multipart/browser-capture-complex-jetty-client.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-complex-jetty-client.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-complex-jetty-client.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-duplicate-names-apache-httpcomp.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-duplicate-names-apache-httpcomp.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-duplicate-names-apache-httpcomp.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-duplicate-names-apache-httpcomp.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-duplicate-names-apache-httpcomp.raw b/jetty-server/src/test/resources/multipart/browser-capture-duplicate-names-apache-httpcomp.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-duplicate-names-apache-httpcomp.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-duplicate-names-apache-httpcomp.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-duplicate-names-jetty-client.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-duplicate-names-jetty-client.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-duplicate-names-jetty-client.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-duplicate-names-jetty-client.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-duplicate-names-jetty-client.raw b/jetty-server/src/test/resources/multipart/browser-capture-duplicate-names-jetty-client.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-duplicate-names-jetty-client.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-duplicate-names-jetty-client.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-encoding-mess-apache-httpcomp.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-encoding-mess-apache-httpcomp.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-encoding-mess-apache-httpcomp.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-encoding-mess-apache-httpcomp.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-encoding-mess-apache-httpcomp.raw b/jetty-server/src/test/resources/multipart/browser-capture-encoding-mess-apache-httpcomp.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-encoding-mess-apache-httpcomp.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-encoding-mess-apache-httpcomp.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-encoding-mess-jetty-client.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-encoding-mess-jetty-client.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-encoding-mess-jetty-client.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-encoding-mess-jetty-client.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-encoding-mess-jetty-client.raw b/jetty-server/src/test/resources/multipart/browser-capture-encoding-mess-jetty-client.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-encoding-mess-jetty-client.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-encoding-mess-jetty-client.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-chrome.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-chrome.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-chrome.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-chrome.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-chrome.raw b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-chrome.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-chrome.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-chrome.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-edge.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-edge.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-edge.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-edge.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-edge.raw b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-edge.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-edge.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-edge.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-firefox.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-firefox.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-firefox.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-firefox.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-firefox.raw b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-firefox.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-firefox.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-firefox.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-msie.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-msie.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-msie.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-msie.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-msie.raw b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-msie.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-msie.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-msie.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-safari.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-safari.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-safari.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-safari.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-safari.raw b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-safari.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-safari.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-alt-safari.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-android-chrome.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-android-chrome.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-android-chrome.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-android-chrome.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-android-chrome.raw b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-android-chrome.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-android-chrome.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-android-chrome.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-android-firefox.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-android-firefox.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-android-firefox.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-android-firefox.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-android-firefox.raw b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-android-firefox.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-android-firefox.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-android-firefox.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-chrome.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-chrome.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-chrome.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-chrome.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-chrome.raw b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-chrome.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-chrome.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-chrome.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-edge.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-edge.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-edge.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-edge.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-edge.raw b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-edge.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-edge.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-edge.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-firefox.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-firefox.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-firefox.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-firefox.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-firefox.raw b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-firefox.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-firefox.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-firefox.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-ios-safari.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-ios-safari.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-ios-safari.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-ios-safari.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-ios-safari.raw b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-ios-safari.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-ios-safari.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-ios-safari.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-msie.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-msie.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-msie.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-msie.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-msie.raw b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-msie.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-msie.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-msie.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-safari.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-safari.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-safari.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-safari.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-safari.raw b/jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-safari.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-safari.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form-fileupload-safari.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form1-android-chrome.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form1-android-chrome.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form1-android-chrome.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form1-android-chrome.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form1-android-chrome.raw b/jetty-server/src/test/resources/multipart/browser-capture-form1-android-chrome.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form1-android-chrome.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form1-android-chrome.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form1-android-firefox.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form1-android-firefox.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form1-android-firefox.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form1-android-firefox.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form1-android-firefox.raw b/jetty-server/src/test/resources/multipart/browser-capture-form1-android-firefox.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form1-android-firefox.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form1-android-firefox.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form1-chrome.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form1-chrome.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form1-chrome.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form1-chrome.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form1-chrome.raw b/jetty-server/src/test/resources/multipart/browser-capture-form1-chrome.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form1-chrome.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form1-chrome.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form1-edge.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form1-edge.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form1-edge.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form1-edge.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form1-edge.raw b/jetty-server/src/test/resources/multipart/browser-capture-form1-edge.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form1-edge.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form1-edge.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form1-firefox.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form1-firefox.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form1-firefox.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form1-firefox.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form1-firefox.raw b/jetty-server/src/test/resources/multipart/browser-capture-form1-firefox.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form1-firefox.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form1-firefox.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form1-ios-safari.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form1-ios-safari.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form1-ios-safari.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form1-ios-safari.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form1-ios-safari.raw b/jetty-server/src/test/resources/multipart/browser-capture-form1-ios-safari.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form1-ios-safari.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form1-ios-safari.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form1-msie.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form1-msie.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form1-msie.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form1-msie.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form1-msie.raw b/jetty-server/src/test/resources/multipart/browser-capture-form1-msie.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form1-msie.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form1-msie.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form1-osx-safari.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-form1-osx-safari.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form1-osx-safari.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-form1-osx-safari.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-form1-osx-safari.raw b/jetty-server/src/test/resources/multipart/browser-capture-form1-osx-safari.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-form1-osx-safari.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-form1-osx-safari.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-nested-apache-httpcomp.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-nested-apache-httpcomp.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-nested-apache-httpcomp.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-nested-apache-httpcomp.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-nested-apache-httpcomp.raw b/jetty-server/src/test/resources/multipart/browser-capture-nested-apache-httpcomp.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-nested-apache-httpcomp.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-nested-apache-httpcomp.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-nested-binary-apache-httpcomp.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-nested-binary-apache-httpcomp.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-nested-binary-apache-httpcomp.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-nested-binary-apache-httpcomp.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-nested-binary-apache-httpcomp.raw b/jetty-server/src/test/resources/multipart/browser-capture-nested-binary-apache-httpcomp.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-nested-binary-apache-httpcomp.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-nested-binary-apache-httpcomp.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-nested-jetty-client.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-nested-jetty-client.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-nested-jetty-client.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-nested-jetty-client.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-nested-jetty-client.raw b/jetty-server/src/test/resources/multipart/browser-capture-nested-jetty-client.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-nested-jetty-client.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-nested-jetty-client.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-number-only-apache-httpcomp.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-number-only-apache-httpcomp.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-number-only-apache-httpcomp.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-number-only-apache-httpcomp.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-number-only-apache-httpcomp.raw b/jetty-server/src/test/resources/multipart/browser-capture-number-only-apache-httpcomp.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-number-only-apache-httpcomp.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-number-only-apache-httpcomp.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-number-only-jetty-client.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-number-only-jetty-client.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-number-only-jetty-client.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-number-only-jetty-client.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-number-only-jetty-client.raw b/jetty-server/src/test/resources/multipart/browser-capture-number-only-jetty-client.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-number-only-jetty-client.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-number-only-jetty-client.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-number-only2-apache-httpcomp.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-number-only2-apache-httpcomp.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-number-only2-apache-httpcomp.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-number-only2-apache-httpcomp.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-number-only2-apache-httpcomp.raw b/jetty-server/src/test/resources/multipart/browser-capture-number-only2-apache-httpcomp.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-number-only2-apache-httpcomp.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-number-only2-apache-httpcomp.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-apache-httpcomp.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-sjis-apache-httpcomp.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-apache-httpcomp.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-apache-httpcomp.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-apache-httpcomp.raw b/jetty-server/src/test/resources/multipart/browser-capture-sjis-apache-httpcomp.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-apache-httpcomp.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-apache-httpcomp.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-android-chrome.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-android-chrome.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-android-chrome.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-android-chrome.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-android-chrome.raw b/jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-android-chrome.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-android-chrome.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-android-chrome.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-android-firefox.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-android-firefox.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-android-firefox.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-android-firefox.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-android-firefox.raw b/jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-android-firefox.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-android-firefox.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-android-firefox.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-chrome.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-chrome.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-chrome.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-chrome.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-chrome.raw b/jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-chrome.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-chrome.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-chrome.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-edge.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-edge.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-edge.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-edge.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-edge.raw b/jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-edge.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-edge.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-edge.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-firefox.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-firefox.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-firefox.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-firefox.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-firefox.raw b/jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-firefox.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-firefox.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-firefox.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-ios-safari.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-ios-safari.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-ios-safari.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-ios-safari.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-ios-safari.raw b/jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-ios-safari.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-ios-safari.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-ios-safari.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-msie.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-msie.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-msie.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-msie.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-msie.raw b/jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-msie.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-msie.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-msie.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-safari.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-safari.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-safari.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-safari.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-safari.raw b/jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-safari.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-charset-form-safari.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-charset-form-safari.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-form-android-chrome.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-sjis-form-android-chrome.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-form-android-chrome.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-form-android-chrome.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-form-android-chrome.raw b/jetty-server/src/test/resources/multipart/browser-capture-sjis-form-android-chrome.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-form-android-chrome.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-form-android-chrome.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-form-android-firefox.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-sjis-form-android-firefox.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-form-android-firefox.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-form-android-firefox.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-form-android-firefox.raw b/jetty-server/src/test/resources/multipart/browser-capture-sjis-form-android-firefox.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-form-android-firefox.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-form-android-firefox.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-form-chrome.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-sjis-form-chrome.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-form-chrome.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-form-chrome.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-form-chrome.raw b/jetty-server/src/test/resources/multipart/browser-capture-sjis-form-chrome.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-form-chrome.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-form-chrome.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-form-edge.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-sjis-form-edge.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-form-edge.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-form-edge.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-form-edge.raw b/jetty-server/src/test/resources/multipart/browser-capture-sjis-form-edge.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-form-edge.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-form-edge.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-form-firefox.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-sjis-form-firefox.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-form-firefox.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-form-firefox.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-form-firefox.raw b/jetty-server/src/test/resources/multipart/browser-capture-sjis-form-firefox.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-form-firefox.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-form-firefox.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-form-ios-safari.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-sjis-form-ios-safari.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-form-ios-safari.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-form-ios-safari.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-form-ios-safari.raw b/jetty-server/src/test/resources/multipart/browser-capture-sjis-form-ios-safari.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-form-ios-safari.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-form-ios-safari.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-form-msie.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-sjis-form-msie.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-form-msie.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-form-msie.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-form-msie.raw b/jetty-server/src/test/resources/multipart/browser-capture-sjis-form-msie.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-form-msie.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-form-msie.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-form-safari.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-sjis-form-safari.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-form-safari.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-form-safari.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-form-safari.raw b/jetty-server/src/test/resources/multipart/browser-capture-sjis-form-safari.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-form-safari.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-form-safari.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-jetty-client.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-sjis-jetty-client.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-jetty-client.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-jetty-client.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-sjis-jetty-client.raw b/jetty-server/src/test/resources/multipart/browser-capture-sjis-jetty-client.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-sjis-jetty-client.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-sjis-jetty-client.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-strange-quoting-apache-httpcomp.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-strange-quoting-apache-httpcomp.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-strange-quoting-apache-httpcomp.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-strange-quoting-apache-httpcomp.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-strange-quoting-apache-httpcomp.raw b/jetty-server/src/test/resources/multipart/browser-capture-strange-quoting-apache-httpcomp.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-strange-quoting-apache-httpcomp.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-strange-quoting-apache-httpcomp.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-text-files-apache-httpcomp.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-text-files-apache-httpcomp.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-text-files-apache-httpcomp.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-text-files-apache-httpcomp.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-text-files-apache-httpcomp.raw b/jetty-server/src/test/resources/multipart/browser-capture-text-files-apache-httpcomp.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-text-files-apache-httpcomp.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-text-files-apache-httpcomp.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-text-files-jetty-client.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-text-files-jetty-client.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-text-files-jetty-client.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-text-files-jetty-client.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-text-files-jetty-client.raw b/jetty-server/src/test/resources/multipart/browser-capture-text-files-jetty-client.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-text-files-jetty-client.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-text-files-jetty-client.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-unicode-names-apache-httpcomp.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-unicode-names-apache-httpcomp.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-unicode-names-apache-httpcomp.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-unicode-names-apache-httpcomp.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-unicode-names-apache-httpcomp.raw b/jetty-server/src/test/resources/multipart/browser-capture-unicode-names-apache-httpcomp.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-unicode-names-apache-httpcomp.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-unicode-names-apache-httpcomp.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-unicode-names-jetty-client.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-unicode-names-jetty-client.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-unicode-names-jetty-client.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-unicode-names-jetty-client.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-unicode-names-jetty-client.raw b/jetty-server/src/test/resources/multipart/browser-capture-unicode-names-jetty-client.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-unicode-names-jetty-client.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-unicode-names-jetty-client.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-whitespace-only-jetty-client.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-whitespace-only-jetty-client.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-whitespace-only-jetty-client.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-whitespace-only-jetty-client.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-whitespace-only-jetty-client.raw b/jetty-server/src/test/resources/multipart/browser-capture-whitespace-only-jetty-client.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-whitespace-only-jetty-client.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-whitespace-only-jetty-client.raw
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-zalgo-text-plain-apache-httpcomp.expected.txt b/jetty-server/src/test/resources/multipart/browser-capture-zalgo-text-plain-apache-httpcomp.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-zalgo-text-plain-apache-httpcomp.expected.txt
rename to jetty-server/src/test/resources/multipart/browser-capture-zalgo-text-plain-apache-httpcomp.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/browser-capture-zalgo-text-plain-apache-httpcomp.raw b/jetty-server/src/test/resources/multipart/browser-capture-zalgo-text-plain-apache-httpcomp.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/browser-capture-zalgo-text-plain-apache-httpcomp.raw
rename to jetty-server/src/test/resources/multipart/browser-capture-zalgo-text-plain-apache-httpcomp.raw
diff --git a/jetty-http/src/test/resources/multipart/multipart-base64-long.expected.txt b/jetty-server/src/test/resources/multipart/multipart-base64-long.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/multipart-base64-long.expected.txt
rename to jetty-server/src/test/resources/multipart/multipart-base64-long.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/multipart-base64-long.raw b/jetty-server/src/test/resources/multipart/multipart-base64-long.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/multipart-base64-long.raw
rename to jetty-server/src/test/resources/multipart/multipart-base64-long.raw
diff --git a/jetty-http/src/test/resources/multipart/multipart-base64.expected.txt b/jetty-server/src/test/resources/multipart/multipart-base64.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/multipart-base64.expected.txt
rename to jetty-server/src/test/resources/multipart/multipart-base64.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/multipart-base64.raw b/jetty-server/src/test/resources/multipart/multipart-base64.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/multipart-base64.raw
rename to jetty-server/src/test/resources/multipart/multipart-base64.raw
diff --git a/jetty-http/src/test/resources/multipart/multipart-uppercase.expected.txt b/jetty-server/src/test/resources/multipart/multipart-uppercase.expected.txt
similarity index 100%
rename from jetty-http/src/test/resources/multipart/multipart-uppercase.expected.txt
rename to jetty-server/src/test/resources/multipart/multipart-uppercase.expected.txt
diff --git a/jetty-http/src/test/resources/multipart/multipart-uppercase.raw b/jetty-server/src/test/resources/multipart/multipart-uppercase.raw
similarity index 100%
rename from jetty-http/src/test/resources/multipart/multipart-uppercase.raw
rename to jetty-server/src/test/resources/multipart/multipart-uppercase.raw
diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/MultiPartServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/MultiPartServletTest.java
index 056746c90af..e765f41b35c 100644
--- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/MultiPartServletTest.java
+++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/MultiPartServletTest.java
@@ -35,8 +35,8 @@ import org.eclipse.jetty.client.util.MultiPartContentProvider;
 import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.http.HttpScheme;
 import org.eclipse.jetty.http.MimeTypes;
-import org.eclipse.jetty.http.MultiPartFormInputStream;
 import org.eclipse.jetty.server.HttpChannel;
+import org.eclipse.jetty.server.MultiPartFormInputStream;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.util.IO;