diff --git a/README.md b/README.md
index 41de433..b0a4f08 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,7 @@ Every header line must end with `\r\n`, also the last one.
 ```php
 <?php
 
-use Amp\Http\Rfc7230;
+use Amp\Http\Http1\Rfc7230;
 
 require __DIR__ . "/../vendor/autoload.php";
 
@@ -162,8 +162,7 @@ It protects against header injections and other non-compliant header names and v
 ```php
 <?php
 
-use Amp\Http\Cookie\ResponseCookie;
-use Amp\Http\Rfc7230;
+use Amp\Http\Cookie\ResponseCookie;use Amp\Http\Http1\Rfc7230;
 
 require __DIR__ . "/../vendor/autoload.php";
 
diff --git a/composer.json b/composer.json
index 3d6f723..f3461f3 100644
--- a/composer.json
+++ b/composer.json
@@ -22,6 +22,11 @@
             "src/Internal/constants.php"
         ]
     },
+    "autoload-dev": {
+        "psr-4": {
+          "Amp\\Http\\": "test"
+        }
+    },
     "require": {
         "php": ">=8.1",
         "amphp/hpack": "^3",
diff --git a/examples/benchmark/format-rfc7230.php b/examples/benchmark/format-rfc7230.php
index b09bfce..b92e0a0 100644
--- a/examples/benchmark/format-rfc7230.php
+++ b/examples/benchmark/format-rfc7230.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Amp\Http\Rfc7230;
+use Amp\Http\Http1\Rfc7230;
 
 require __DIR__ . "/../../vendor/autoload.php";
 
@@ -11,7 +11,7 @@
 Content-Length: 0
 X-No-Value:
 X-No-Whitespace: Test
-X-Trailing-Whitespace:  	Foobar		  
+X-Trailing-Whitespace:  	Foobar
 ";
 
 // Normalize line endings, which might be broken by Git otherwise
diff --git a/examples/benchmark/parser-rfc7230.php b/examples/benchmark/parser-rfc7230.php
index e8c4bed..f2b90ba 100644
--- a/examples/benchmark/parser-rfc7230.php
+++ b/examples/benchmark/parser-rfc7230.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Amp\Http\Rfc7230;
+use Amp\Http\Http1\Rfc7230;
 
 require __DIR__ . "/../../vendor/autoload.php";
 
@@ -11,7 +11,7 @@
 Content-Length: 0
 X-No-Value:
 X-No-Whitespace: Test
-X-Trailing-Whitespace:  	Foobar		  
+X-Trailing-Whitespace:  	Foobar
 ";
 
 // Normalize line endings, which might be broken by Git otherwise
diff --git a/examples/header-format.php b/examples/header-format.php
index 7aa96e6..ad9aaf8 100644
--- a/examples/header-format.php
+++ b/examples/header-format.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 use Amp\Http\Cookie\ResponseCookie;
-use Amp\Http\Rfc7230;
+use Amp\Http\Http1\Rfc7230;
 
 require __DIR__ . "/../vendor/autoload.php";
 
diff --git a/examples/header-parsing.php b/examples/header-parsing.php
index 196c97b..6b8f527 100644
--- a/examples/header-parsing.php
+++ b/examples/header-parsing.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Amp\Http\Rfc7230;
+use Amp\Http\Http1\Rfc7230;
 
 require __DIR__ . "/../vendor/autoload.php";
 
diff --git a/src/Rfc7230.php b/src/Http1/Rfc7230.php
similarity index 99%
rename from src/Rfc7230.php
rename to src/Http1/Rfc7230.php
index 7fa1742..7a2eb18 100644
--- a/src/Rfc7230.php
+++ b/src/Http1/Rfc7230.php
@@ -1,7 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace Amp\Http;
+namespace Amp\Http\Http1;
 
+use Amp\Http\InvalidHeaderException;
 use const Amp\Http\Internal\HEADER_LOWERCASE_MAP;
 
 /**
diff --git a/test/Rfc7230Test.php b/test/Http1/Rfc7230Test.php
similarity index 98%
rename from test/Rfc7230Test.php
rename to test/Http1/Rfc7230Test.php
index 944f638..559ed2f 100644
--- a/test/Rfc7230Test.php
+++ b/test/Http1/Rfc7230Test.php
@@ -1,7 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace Amp\Http;
+namespace Amp\Http\Http1;
 
+use Amp\Http\InvalidHeaderException;
 use PHPUnit\Framework\TestCase;
 
 class Rfc7230Test extends TestCase