diff --git a/src/ClientInterface.php b/src/ClientInterface.php
index 4d0150a..5a5b41d 100644
--- a/src/ClientInterface.php
+++ b/src/ClientInterface.php
@@ -10,13 +10,13 @@ interface ClientInterface
     /**
      * Sends a PSR-7 request and returns a PSR-7 response.
      *
-     * Every technically correct HTTP response MUST be returned as is, even if it represents an HTTP
+     * Every technically correct HTTP response MUST be returned as-is, even if it represents an HTTP
      * error response or a redirect instruction. The only special case is 1xx responses, which MUST
      * be assembled in the HTTP client.
      *
      * The client MAY do modifications to the Request before sending it. Because PSR-7 objects are
      * immutable, one cannot assume that the object passed to ClientInterface::sendRequest() will be the same
-     * object that is actually sent. For example the Request object that is returned by an exception MAY
+     * object that is actually sent. For example, the Request object that is returned by an exception MAY
      * be a different object than the one passed to sendRequest, so comparison by reference (===) is not possible.
      *
      * {@link https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-7-http-message-meta.md#why-value-objects}
@@ -25,7 +25,7 @@ interface ClientInterface
      *
      * @return ResponseInterface
      *
-     * @throws \Psr\Http\Client\ClientException If an error happens during processing the request.
+     * @throws \Psr\Http\Client\ClientException If an error happens while processing the request.
      */
     public function sendRequest(RequestInterface $request): ResponseInterface;
 }
diff --git a/src/Exception/NetworkException.php b/src/NetworkException.php
similarity index 89%
rename from src/Exception/NetworkException.php
rename to src/NetworkException.php
index 3b24090..86c5cd9 100644
--- a/src/Exception/NetworkException.php
+++ b/src/NetworkException.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace Psr\Http\Client\Exception;
+namespace Psr\Http\Client;
 
-use Psr\Http\Client\ClientException;
 use Psr\Http\Message\RequestInterface;
 
 /**
diff --git a/src/Exception/RequestException.php b/src/RequestException.php
similarity index 87%
rename from src/Exception/RequestException.php
rename to src/RequestException.php
index 4c392bd..d758bc8 100644
--- a/src/Exception/RequestException.php
+++ b/src/RequestException.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace Psr\Http\Client\Exception;
+namespace Psr\Http\Client;
 
-use Psr\Http\Client\ClientException;
 use Psr\Http\Message\RequestInterface;
 
 /**