diff --git a/Package.swift b/Package.swift
index e71c0ad..f71a28d 100644
--- a/Package.swift
+++ b/Package.swift
@@ -33,7 +33,11 @@ let package = Package(
         .library(
             name: "HTTPServer",
             targets: ["HTTPServer"]
-        )
+        ),
+        .library(
+            name: "NIOHTTPServer",
+            targets: ["NIOHTTPServer"]
+        ),
     ],
     traits: [
         .trait(name: "SwiftConfiguration"),
@@ -65,11 +69,20 @@ let package = Package(
                 .product(name: "Logging", package: "swift-log"),
                 "HTTPServer",
                 "Middleware",
+                "NIOHTTPServer",
             ],
             swiftSettings: extraSettings
         ),
         .target(
             name: "HTTPServer",
+            dependencies: [
+                "AsyncStreaming",
+                .product(name: "HTTPTypes", package: "swift-http-types"),
+            ],
+            swiftSettings: extraSettings
+        ),
+        .target(
+            name: "NIOHTTPServer",
             dependencies: [
                 "AsyncStreaming",
                 .product(name: "DequeModule", package: "swift-collections"),
@@ -90,6 +103,7 @@ let package = Package(
                     package: "swift-configuration",
                     condition: .when(traits: ["SwiftConfiguration"])
                 ),
+                "HTTPServer",
             ],
             swiftSettings: extraSettings
         ),
@@ -109,10 +123,10 @@ let package = Package(
             swiftSettings: extraSettings
         ),
         .testTarget(
-            name: "HTTPServerTests",
+            name: "NIOHTTPServerTests",
             dependencies: [
                 .product(name: "Logging", package: "swift-log"),
-                "HTTPServer",
+                "NIOHTTPServer",
             ]
         ),
     ]
diff --git a/Sources/Example/Example.swift b/Sources/Example/Example.swift
index aac137e..7560856 100644
--- a/Sources/Example/Example.swift
+++ b/Sources/Example/Example.swift
@@ -20,6 +20,7 @@ import HTTPTypes
 import Instrumentation
 import Logging
 import Middleware
+import NIOHTTPServer
 import X509
 
 @main
diff --git a/Sources/HTTPServer/HTTPRequestConcludingAsyncReader.swift b/Sources/NIOHTTPServer/HTTPRequestConcludingAsyncReader.swift
similarity index 100%
rename from Sources/HTTPServer/HTTPRequestConcludingAsyncReader.swift
rename to Sources/NIOHTTPServer/HTTPRequestConcludingAsyncReader.swift
diff --git a/Sources/HTTPServer/HTTPResponseConcludingAsyncWriter.swift b/Sources/NIOHTTPServer/HTTPResponseConcludingAsyncWriter.swift
similarity index 100%
rename from Sources/HTTPServer/HTTPResponseConcludingAsyncWriter.swift
rename to Sources/NIOHTTPServer/HTTPResponseConcludingAsyncWriter.swift
diff --git a/Sources/HTTPServer/NIOHTTPServer+ConnectionContext.swift b/Sources/NIOHTTPServer/NIOHTTPServer+ConnectionContext.swift
similarity index 100%
rename from Sources/HTTPServer/NIOHTTPServer+ConnectionContext.swift
rename to Sources/NIOHTTPServer/NIOHTTPServer+ConnectionContext.swift
diff --git a/Sources/HTTPServer/NIOHTTPServer+HTTP1_1.swift b/Sources/NIOHTTPServer/NIOHTTPServer+HTTP1_1.swift
similarity index 99%
rename from Sources/HTTPServer/NIOHTTPServer+HTTP1_1.swift
rename to Sources/NIOHTTPServer/NIOHTTPServer+HTTP1_1.swift
index 00a11ca..dc5cd13 100644
--- a/Sources/HTTPServer/NIOHTTPServer+HTTP1_1.swift
+++ b/Sources/NIOHTTPServer/NIOHTTPServer+HTTP1_1.swift
@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+import HTTPServer
 import NIOCore
 import NIOEmbedded
 import NIOHTTP1
diff --git a/Sources/HTTPServer/NIOHTTPServer+ListeningAddress.swift b/Sources/NIOHTTPServer/NIOHTTPServer+ListeningAddress.swift
similarity index 100%
rename from Sources/HTTPServer/NIOHTTPServer+ListeningAddress.swift
rename to Sources/NIOHTTPServer/NIOHTTPServer+ListeningAddress.swift
diff --git a/Sources/HTTPServer/NIOHTTPServer+SecureUpgrade.swift b/Sources/NIOHTTPServer/NIOHTTPServer+SecureUpgrade.swift
similarity index 99%
rename from Sources/HTTPServer/NIOHTTPServer+SecureUpgrade.swift
rename to Sources/NIOHTTPServer/NIOHTTPServer+SecureUpgrade.swift
index ac0579a..4315ede 100644
--- a/Sources/HTTPServer/NIOHTTPServer+SecureUpgrade.swift
+++ b/Sources/NIOHTTPServer/NIOHTTPServer+SecureUpgrade.swift
@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+import HTTPServer
 import Logging
 import NIOCore
 import NIOEmbedded
diff --git a/Sources/HTTPServer/NIOHTTPServer+SwiftConfiguration.swift b/Sources/NIOHTTPServer/NIOHTTPServer+SwiftConfiguration.swift
similarity index 100%
rename from Sources/HTTPServer/NIOHTTPServer+SwiftConfiguration.swift
rename to Sources/NIOHTTPServer/NIOHTTPServer+SwiftConfiguration.swift
diff --git a/Sources/HTTPServer/NIOHTTPServer.swift b/Sources/NIOHTTPServer/NIOHTTPServer.swift
similarity index 99%
rename from Sources/HTTPServer/NIOHTTPServer.swift
rename to Sources/NIOHTTPServer/NIOHTTPServer.swift
index a5dd0bd..e5d3083 100644
--- a/Sources/HTTPServer/NIOHTTPServer.swift
+++ b/Sources/NIOHTTPServer/NIOHTTPServer.swift
@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+public import HTTPServer
 import HTTPTypes
 public import Logging
 import NIOCertificateReloading
diff --git a/Sources/HTTPServer/NIOHTTPServerConfiguration.swift b/Sources/NIOHTTPServer/NIOHTTPServerConfiguration.swift
similarity index 100%
rename from Sources/HTTPServer/NIOHTTPServerConfiguration.swift
rename to Sources/NIOHTTPServer/NIOHTTPServerConfiguration.swift
diff --git a/Sources/HTTPServer/NIOSSL+X509.swift b/Sources/NIOHTTPServer/NIOSSL+X509.swift
similarity index 100%
rename from Sources/HTTPServer/NIOSSL+X509.swift
rename to Sources/NIOHTTPServer/NIOSSL+X509.swift
diff --git a/Sources/HTTPServer/SocketAddress.swift b/Sources/NIOHTTPServer/SocketAddress.swift
similarity index 100%
rename from Sources/HTTPServer/SocketAddress.swift
rename to Sources/NIOHTTPServer/SocketAddress.swift
diff --git a/Tests/HTTPServerTests/HTTPRequestConcludingAsyncReaderTests.swift b/Tests/NIOHTTPServerTests/HTTPRequestConcludingAsyncReaderTests.swift
similarity index 99%
rename from Tests/HTTPServerTests/HTTPRequestConcludingAsyncReaderTests.swift
rename to Tests/NIOHTTPServerTests/HTTPRequestConcludingAsyncReaderTests.swift
index 82baa80..eed8f2f 100644
--- a/Tests/HTTPServerTests/HTTPRequestConcludingAsyncReaderTests.swift
+++ b/Tests/NIOHTTPServerTests/HTTPRequestConcludingAsyncReaderTests.swift
@@ -20,7 +20,7 @@ import NIOHTTPTypes
 import NIOPosix
 import Testing
 
-@testable import HTTPServer
+@testable import NIOHTTPServer
 
 @Suite
 struct HTTPRequestConcludingAsyncReaderTests {
diff --git a/Tests/HTTPServerTests/HTTPResponseConcludingAsyncWriterTests.swift b/Tests/NIOHTTPServerTests/HTTPResponseConcludingAsyncWriterTests.swift
similarity index 99%
rename from Tests/HTTPServerTests/HTTPResponseConcludingAsyncWriterTests.swift
rename to Tests/NIOHTTPServerTests/HTTPResponseConcludingAsyncWriterTests.swift
index 4302368..05b6d81 100644
--- a/Tests/HTTPServerTests/HTTPResponseConcludingAsyncWriterTests.swift
+++ b/Tests/NIOHTTPServerTests/HTTPResponseConcludingAsyncWriterTests.swift
@@ -17,7 +17,7 @@ import NIOCore
 import NIOHTTPTypes
 import Testing
 
-@testable import HTTPServer
+@testable import NIOHTTPServer
 
 @Suite
 struct HTTPResponseConcludingAsyncWriterTests {
diff --git a/Tests/HTTPServerTests/HTTPResponseSenderTests.swift b/Tests/NIOHTTPServerTests/HTTPResponseSenderTests.swift
similarity index 98%
rename from Tests/HTTPServerTests/HTTPResponseSenderTests.swift
rename to Tests/NIOHTTPServerTests/HTTPResponseSenderTests.swift
index 03a1a13..4e9cc23 100644
--- a/Tests/HTTPServerTests/HTTPResponseSenderTests.swift
+++ b/Tests/NIOHTTPServerTests/HTTPResponseSenderTests.swift
@@ -12,12 +12,13 @@
 //
 //===----------------------------------------------------------------------===//
 
+import HTTPServer
 import HTTPTypes
 import NIOCore
 import NIOHTTPTypes
 import Testing
 
-@testable import HTTPServer
+@testable import NIOHTTPServer
 
 @Suite
 struct HTTPResponseSenderTests {
diff --git a/Tests/HTTPServerTests/HTTPServerTests.swift b/Tests/NIOHTTPServerTests/HTTPServerTests.swift
similarity index 99%
rename from Tests/HTTPServerTests/HTTPServerTests.swift
rename to Tests/NIOHTTPServerTests/HTTPServerTests.swift
index 673505f..a7d986a 100644
--- a/Tests/HTTPServerTests/HTTPServerTests.swift
+++ b/Tests/NIOHTTPServerTests/HTTPServerTests.swift
@@ -15,6 +15,7 @@
 import HTTPServer
 import HTTPTypes
 import Logging
+import NIOHTTPServer
 import Testing
 
 @Suite
diff --git a/Tests/HTTPServerTests/NIOHTTPServerEndToEndTests.swift b/Tests/NIOHTTPServerTests/NIOHTTPServerEndToEndTests.swift
similarity index 98%
rename from Tests/HTTPServerTests/NIOHTTPServerEndToEndTests.swift
rename to Tests/NIOHTTPServerTests/NIOHTTPServerEndToEndTests.swift
index edadc75..f134252 100644
--- a/Tests/HTTPServerTests/NIOHTTPServerEndToEndTests.swift
+++ b/Tests/NIOHTTPServerTests/NIOHTTPServerEndToEndTests.swift
@@ -12,6 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+import HTTPServer
+import HTTPTypes
 import NIOCore
 import NIOEmbedded
 import NIOHTTP1
@@ -22,7 +24,7 @@ import NIOSSL
 import Testing
 import X509
 
-@testable import HTTPServer
+@testable import NIOHTTPServer
 
 @Suite
 struct NIOHTTPServerEndToEndTests {
diff --git a/Tests/HTTPServerTests/NIOHTTPServerSwiftConfigurationTests.swift b/Tests/NIOHTTPServerTests/NIOHTTPServerSwiftConfigurationTests.swift
similarity index 99%
rename from Tests/HTTPServerTests/NIOHTTPServerSwiftConfigurationTests.swift
rename to Tests/NIOHTTPServerTests/NIOHTTPServerSwiftConfigurationTests.swift
index 08346a8..8391af2 100644
--- a/Tests/HTTPServerTests/NIOHTTPServerSwiftConfigurationTests.swift
+++ b/Tests/NIOHTTPServerTests/NIOHTTPServerSwiftConfigurationTests.swift
@@ -21,7 +21,7 @@ import SwiftASN1
 import Testing
 import X509
 
-@testable import HTTPServer
+@testable import NIOHTTPServer
 
 @Suite
 struct NIOHTTPServerSwiftConfigurationTests {
diff --git a/Tests/HTTPServerTests/NIOHTTPServerTests.swift b/Tests/NIOHTTPServerTests/NIOHTTPServerTests.swift
similarity index 99%
rename from Tests/HTTPServerTests/NIOHTTPServerTests.swift
rename to Tests/NIOHTTPServerTests/NIOHTTPServerTests.swift
index e61cca6..f001d02 100644
--- a/Tests/HTTPServerTests/NIOHTTPServerTests.swift
+++ b/Tests/NIOHTTPServerTests/NIOHTTPServerTests.swift
@@ -19,7 +19,7 @@ import NIOHTTPTypes
 import Testing
 import X509
 
-@testable import HTTPServer
+@testable import NIOHTTPServer
 
 #if canImport(Dispatch)
 import Dispatch
diff --git a/Tests/HTTPServerTests/Utilities/TestError.swift b/Tests/NIOHTTPServerTests/TestError.swift
similarity index 100%
rename from Tests/HTTPServerTests/Utilities/TestError.swift
rename to Tests/NIOHTTPServerTests/TestError.swift
diff --git a/Tests/HTTPServerTests/Utilities/Certificates.swift b/Tests/NIOHTTPServerTests/Utilities/Certificates.swift
similarity index 100%
rename from Tests/HTTPServerTests/Utilities/Certificates.swift
rename to Tests/NIOHTTPServerTests/Utilities/Certificates.swift
diff --git a/Tests/HTTPServerTests/Utilities/Client.swift b/Tests/NIOHTTPServerTests/Utilities/Client.swift
similarity index 99%
rename from Tests/HTTPServerTests/Utilities/Client.swift
rename to Tests/NIOHTTPServerTests/Utilities/Client.swift
index 10ac724..0428875 100644
--- a/Tests/HTTPServerTests/Utilities/Client.swift
+++ b/Tests/NIOHTTPServerTests/Utilities/Client.swift
@@ -20,7 +20,7 @@ import NIOPosix
 import NIOSSL
 import X509
 
-@testable import HTTPServer
+@testable import NIOHTTPServer
 
 @available(macOS 26.0, iOS 26.0, watchOS 26.0, tvOS 26.0, visionOS 26.0, *)
 func setUpClient(host: String, port: Int) async throws -> NIOAsyncChannel<HTTPResponsePart, HTTPRequestPart> {
diff --git a/Tests/HTTPServerTests/Utilities/HTTP1ClientServerProvider.swift b/Tests/NIOHTTPServerTests/Utilities/HTTP1ClientServerProvider.swift
similarity index 99%
rename from Tests/HTTPServerTests/Utilities/HTTP1ClientServerProvider.swift
rename to Tests/NIOHTTPServerTests/Utilities/HTTP1ClientServerProvider.swift
index 6a06a0c..7c1b39d 100644
--- a/Tests/HTTPServerTests/Utilities/HTTP1ClientServerProvider.swift
+++ b/Tests/NIOHTTPServerTests/Utilities/HTTP1ClientServerProvider.swift
@@ -20,6 +20,7 @@ import NIOHTTPTypesHTTP1
 import X509
 
 @testable import HTTPServer
+@testable import NIOHTTPServer
 
 @available(macOS 26.0, iOS 26.0, watchOS 26.0, tvOS 26.0, visionOS 26.0, *)
 struct HTTP1ClientServerProvider {
diff --git a/Tests/HTTPServerTests/Utilities/HTTPSecureUpgradeClientServerProvider.swift b/Tests/NIOHTTPServerTests/Utilities/HTTPSecureUpgradeClientServerProvider.swift
similarity index 99%
rename from Tests/HTTPServerTests/Utilities/HTTPSecureUpgradeClientServerProvider.swift
rename to Tests/NIOHTTPServerTests/Utilities/HTTPSecureUpgradeClientServerProvider.swift
index b066f94..41cab29 100644
--- a/Tests/HTTPServerTests/Utilities/HTTPSecureUpgradeClientServerProvider.swift
+++ b/Tests/NIOHTTPServerTests/Utilities/HTTPSecureUpgradeClientServerProvider.swift
@@ -22,6 +22,7 @@ import NIOSSL
 import X509
 
 @testable import HTTPServer
+@testable import NIOHTTPServer
 
 @available(macOS 26.0, iOS 26.0, watchOS 26.0, tvOS 26.0, visionOS 26.0, *)
 struct HTTPSecureUpgradeClientServerProvider {
diff --git a/Tests/HTTPServerTests/Utilities/NIOHTTPServer+HTTP1.swift b/Tests/NIOHTTPServerTests/Utilities/NIOHTTPServer+HTTP1.swift
similarity index 98%
rename from Tests/HTTPServerTests/Utilities/NIOHTTPServer+HTTP1.swift
rename to Tests/NIOHTTPServerTests/Utilities/NIOHTTPServer+HTTP1.swift
index ad4e81b..0feea28 100644
--- a/Tests/HTTPServerTests/Utilities/NIOHTTPServer+HTTP1.swift
+++ b/Tests/NIOHTTPServerTests/Utilities/NIOHTTPServer+HTTP1.swift
@@ -17,6 +17,7 @@ import NIOEmbedded
 import NIOHTTPTypes
 
 @testable import HTTPServer
+@testable import NIOHTTPServer
 
 @available(macOS 26.0, iOS 26.0, watchOS 26.0, tvOS 26.0, visionOS 26.0, *)
 extension NIOHTTPServer {
diff --git a/Tests/HTTPServerTests/Utilities/NIOHTTPServer+SecureUpgrade.swift b/Tests/NIOHTTPServerTests/Utilities/NIOHTTPServer+SecureUpgrade.swift
similarity index 98%
rename from Tests/HTTPServerTests/Utilities/NIOHTTPServer+SecureUpgrade.swift
rename to Tests/NIOHTTPServerTests/Utilities/NIOHTTPServer+SecureUpgrade.swift
index e4dcda9..e93d08f 100644
--- a/Tests/HTTPServerTests/Utilities/NIOHTTPServer+SecureUpgrade.swift
+++ b/Tests/NIOHTTPServerTests/Utilities/NIOHTTPServer+SecureUpgrade.swift
@@ -17,6 +17,7 @@ import NIOEmbedded
 import NIOHTTPTypes
 
 @testable import HTTPServer
+@testable import NIOHTTPServer
 
 @available(macOS 26.0, iOS 26.0, watchOS 26.0, tvOS 26.0, visionOS 26.0, *)
 extension NIOHTTPServer {