diff --git a/src/Potter/Request/ParsedBodyInterface.php b/src/Potter/Request/Contracts/ParsedBodyInterface.php
similarity index 87%
rename from src/Potter/Request/ParsedBodyInterface.php
rename to src/Potter/Request/Contracts/ParsedBodyInterface.php
index edd08ee..88aebe3 100644
--- a/src/Potter/Request/ParsedBodyInterface.php
+++ b/src/Potter/Request/Contracts/ParsedBodyInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Potter\Request;
+namespace Potter\Request\Contracts;
 
 use \Psr\Http\Message\ServerRequestInterface as PsrServerRequestInterface;
 
diff --git a/src/Potter/Request/RequestAttributeInterface.php b/src/Potter/Request/Contracts/RequestAttributeInterface.php
similarity index 92%
rename from src/Potter/Request/RequestAttributeInterface.php
rename to src/Potter/Request/Contracts/RequestAttributeInterface.php
index 794bfb9..0f2d8cd 100644
--- a/src/Potter/Request/RequestAttributeInterface.php
+++ b/src/Potter/Request/Contracts/RequestAttributeInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Potter\Request;
+namespace Potter\Request\Contracts;
 
 use \Psr\Http\Message\ServerRequestInterface as PsrServerRequestInterface;
 
diff --git a/src/Potter/Request/RequestMethodInterface.php b/src/Potter/Request/Contracts/RequestMethodInterface.php
similarity index 87%
rename from src/Potter/Request/RequestMethodInterface.php
rename to src/Potter/Request/Contracts/RequestMethodInterface.php
index d130165..18505cf 100644
--- a/src/Potter/Request/RequestMethodInterface.php
+++ b/src/Potter/Request/Contracts/RequestMethodInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Potter\Request;
+namespace Potter\Request\Contracts;
 
 use \Psr\Http\Message\RequestInterface as PsrRequestInterface;
 
diff --git a/src/Potter/Request/RequestParameterInterface.php b/src/Potter/Request/Contracts/RequestParameterInterface.php
similarity index 92%
rename from src/Potter/Request/RequestParameterInterface.php
rename to src/Potter/Request/Contracts/RequestParameterInterface.php
index e43ae93..106e385 100644
--- a/src/Potter/Request/RequestParameterInterface.php
+++ b/src/Potter/Request/Contracts/RequestParameterInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Potter\Request;
+namespace Potter\Request\Contracts;
 
 use \Psr\Http\Message\ServerRequestInterface as PsrServerRequestInterface;
 
diff --git a/src/Potter/Request/RequestTargetInterface.php b/src/Potter/Request/Contracts/RequestTargetInterface.php
similarity index 88%
rename from src/Potter/Request/RequestTargetInterface.php
rename to src/Potter/Request/Contracts/RequestTargetInterface.php
index 405bb60..0a96d62 100644
--- a/src/Potter/Request/RequestTargetInterface.php
+++ b/src/Potter/Request/Contracts/RequestTargetInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Potter\Request;
+namespace Potter\Request\Contracts;
 
 use \Psr\Http\Message\RequestInterface as PsrRequestInterface;
 
diff --git a/src/Potter/Request/RequestUploadInterface.php b/src/Potter/Request/Contracts/RequestUploadInterface.php
similarity index 88%
rename from src/Potter/Request/RequestUploadInterface.php
rename to src/Potter/Request/Contracts/RequestUploadInterface.php
index 6591ac6..f72f26c 100644
--- a/src/Potter/Request/RequestUploadInterface.php
+++ b/src/Potter/Request/Contracts/RequestUploadInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Potter\Request;
+namespace Potter\Request\Contracts;
 
 use \Psr\Http\Message\ServerRequestInterface as PsrServerRequestInterface;
 
diff --git a/src/Potter/Request/RequestUriInterface.php b/src/Potter/Request/Contracts/RequestUriInterface.php
similarity index 88%
rename from src/Potter/Request/RequestUriInterface.php
rename to src/Potter/Request/Contracts/RequestUriInterface.php
index 9a6500a..a88d048 100644
--- a/src/Potter/Request/RequestUriInterface.php
+++ b/src/Potter/Request/Contracts/RequestUriInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Potter\Request;
+namespace Potter\Request\Contracts;
 
 use \Psr\Http\Message\RequestInterface as PsrRequestInterface;
 
diff --git a/src/Potter/Request/RequestInterface.php b/src/Potter/Request/RequestInterface.php
index af719d0..472353b 100644
--- a/src/Potter/Request/RequestInterface.php
+++ b/src/Potter/Request/RequestInterface.php
@@ -5,6 +5,9 @@ declare(strict_types=1);
 namespace Potter\Request;
 
 use \Psr\Http\Message\RequestInterface as PsrRequestInterface;
+use \Potter\Request\Contracts\RequestMethodInterface;
+use \Potter\Request\Contracts\RequestTargetInterface;
+use \Potter\Request\Contracts\RequestUriInterface;
 
 interface RequestInterface extends PsrRequestInterface,
     RequestMethodInterface, RequestTargetInterface, RequestUriInterface
diff --git a/src/Potter/Request/ServerRequestInterface.php b/src/Potter/Request/ServerRequestInterface.php
index d94165c..ca1e106 100644
--- a/src/Potter/Request/ServerRequestInterface.php
+++ b/src/Potter/Request/ServerRequestInterface.php
@@ -5,9 +5,12 @@ declare(strict_types=1);
 namespace Potter\Request;
 
 use \Psr\Http\Message\ServerRequestInterface as PsrServerRequestInterface;
+use \Potter\Request\Contracts\ParsedBodyInterface;
+use \Potter\Request\Contracts\RequestAttributeInterface;
+use \Potter\Request\Contracts\RequestParameterInterface;
+use \Potter\Request\Contracts\RequestUploadInterface;
 
 interface ServerRequestInterface extends PsrServerRequestInterface, 
-    RequestInterface, RequestAttributeInterface, 
-    RequestParameterInterface, RequestUploadInterface,
-    ParsedBodyInterface
+    RequestInterface, ParsedBodyInterface, RequestAttributeInterface, 
+    RequestParameterInterface, RequestUploadInterface
 { }