diff --git a/README.md b/README.md
index 92877f5a..e4dc0e81 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,18 @@
-# Http
+# HTTP
 
 [![Build Status](https://travis-ci.org/reactphp/http.svg?branch=master)](https://travis-ci.org/reactphp/http)
 
-Event-driven, streaming plaintext HTTP and secure HTTPS server for [ReactPHP](https://reactphp.org/).
+Event-driven, streaming HTTP client and server implementation for [ReactPHP](https://reactphp.org/).
+
+This HTTP library provides re-usable implementations for an HTTP client and
+server based on ReactPHP's [`Socket`](https://github.com/reactphp/socket) and
+[`EventLoop`](https://github.com/reactphp/event-loop) components.
+Its client component allows you to send any number of async HTTP/HTTPS requests
+concurrently.
+Its server component allows you to build plaintext HTTP and secure HTTPS servers
+that accept incoming HTTP requests from HTTP clients (such as web browsers).
+This library provides async, streaming means for all of this, so you can handle
+multiple concurrent HTTP requests without blocking.
 
 **Table of contents**
 
@@ -91,8 +101,8 @@ This is an HTTP server which responds with `Hello World!` to every request.
 ```php
 $loop = React\EventLoop\Factory::create();
 
-$server = new Server(function (ServerRequestInterface $request) {
-    return new Response(
+$server = new React\Http\Server(function (Psr\Http\Message\ServerRequestInterface $request) {
+    return new React\Http\Response(
         200,
         array(
             'Content-Type' => 'text/plain'
@@ -107,7 +117,7 @@ $server->listen($socket);
 $loop->run();
 ```
 
-See also the [examples](examples).
+See also the [examples](examples/).
 
 ## Client Usage
 
@@ -487,8 +497,8 @@ $browser->requestStreaming('GET', $url)->then(function (Psr\Http\Message\Respons
 });
 ```
 
-See also the [stream download example](examples/91-benchmark-download.php) and
-the [stream forwarding example](examples/21-stream-forwarding.php).
+See also the [stream download benchmark example](examples/91-client-benchmark-download.php) and
+the [stream forwarding example](examples/21-client-request-streaming-to-stdout.php).
 
 You can invoke the following methods on the message body:
 
@@ -607,7 +617,7 @@ $connector = new React\Socket\Connector($loop, array(
 $browser = new React\Http\Browser($loop, $connector);
 ```
 
-See also the [HTTP CONNECT proxy example](examples/11-http-proxy.php).
+See also the [HTTP CONNECT proxy example](examples/11-http-connect-proxy.php).
 
 ### SOCKS proxy
 
@@ -738,7 +748,8 @@ $socket = new React\Socket\Server('0.0.0.0:8080', $loop);
 $server->listen($socket);
 ```
 
-See also the [`listen()`](#listen) method and the [first example](../examples/)
+See also the [`listen()`](#listen) method and the
+[hello world server example](examples/51-server-hello-world.php)
 for more details.
 
 By default, the `Server` buffers and parses the complete incoming HTTP
@@ -846,7 +857,8 @@ $socket = new React\Socket\Server('0.0.0.0:8080', $loop);
 $server->listen($socket);
 ```
 
-See also [example #1](examples) for more details.
+See also [hello world server example](examples/51-server-hello-world.php)
+for more details.
 
 This example will start listening for HTTP requests on the alternative
 HTTP port `8080` on all interfaces (publicly). As an alternative, it is
@@ -873,7 +885,8 @@ $socket = new React\Socket\Server('tls://0.0.0.0:8443', $loop, array(
 $server->listen($socket);
 ```
 
-See also [example #11](examples) for more details.
+See also [hello world HTTPS example](examples/61-server-hello-world-https.php)
+for more details.
 
 ### Server Request
 
@@ -945,7 +958,7 @@ $server = new Server(function (ServerRequestInterface $request) {
 });
 ```
 
-See also [example #3](examples).
+See also [whatsmyip server example](examples/53-server-whatsmyip.php).
 
 > Advanced: Note that address parameters will not be set if you're listening on
   a Unix domain socket (UDS) path as this protocol lacks the concept of
@@ -983,7 +996,7 @@ Use [`htmlentities`](https://www.php.net/manual/en/function.htmlentities.php)
 like in this example to prevent
 [Cross-Site Scripting (abbreviated as XSS)](https://en.wikipedia.org/wiki/Cross-site_scripting).
 
-See also [example #4](examples).
+See also [server query parameters example](examples/54-server-query-parameter.php).
 
 #### Request body
 
@@ -1022,7 +1035,7 @@ $server = new Server(function (ServerRequestInterface $request) {
 });
 ```
 
-See also [example #12](examples) for more details.
+See also [form upload example](examples/62-server-form-upload.php) for more details.
 
 The `getBody(): StreamInterface` method can be used to
 get the raw data from this request body, similar to
@@ -1047,7 +1060,7 @@ $server = new Server(function (ServerRequestInterface $request) {
 });
 ```
 
-See also [example #9](examples) for more details.
+See also [JSON API server example](examples/59-server-json-api.php) for more details.
 
 The `getUploadedFiles(): array` method can be used to
 get the uploaded files in this request, similar to
@@ -1070,7 +1083,7 @@ $server = new Server(function (ServerRequestInterface $request) {
 });
 ```
 
-See also [example #12](examples) for more details.
+See also [form upload server example](examples/62-server-form-upload.php) for more details.
 
 The `getSize(): ?int` method can be used to
 get the size of the request body, similar to PHP's `$_SERVER['CONTENT_LENGTH']` variable.
@@ -1169,7 +1182,7 @@ $server = new React\Http\Server(array(
 The above example simply counts the number of bytes received in the request body.
 This can be used as a skeleton for buffering or processing the request body.
 
-See also [example #13](examples) for more details.
+See also [streaming request server example](examples/63-server-streaming-request.php) for more details.
 
 The `data` event will be emitted whenever new data is available on the request
 body stream.
@@ -1307,7 +1320,7 @@ non-alphanumeric characters.
 This encoding is also used internally when decoding the name and value of cookies
 (which is in line with other implementations, such as PHP's cookie functions).
 
-See also [example #5](examples) for more details.
+See also [cookie server example](examples/55-server-cookie-handling.php) for more details.
 
 #### Invalid request
 
@@ -1467,7 +1480,7 @@ in this case (if applicable).
   to look into using [Ratchet](http://socketo.me/) instead.
   If you want to handle a custom protocol, you will likely want to look into the
   [HTTP specs](https://tools.ietf.org/html/rfc7230#section-6.7) and also see
-  [examples #31 and #32](examples) for more details.
+  [examples #81 and #82](examples/) for more details.
   In particular, the `101` (Switching Protocols) response code MUST NOT be used
   unless you send an `Upgrade` response header value that is also present in
   the corresponding HTTP/1.1 `Upgrade` request header value.
@@ -1488,7 +1501,7 @@ in this case (if applicable).
   requests, one may still be present. Normal request body processing applies
   here and the connection will only turn to "tunneling mode" after the request
   body has been processed (which should be empty in most cases).
-  See also [example #22](examples) for more details.
+  See also [HTTP CONNECT server example](examples/72-server-http-connect-proxy.php) for more details.
 
 #### Response length
 
@@ -1851,7 +1864,7 @@ $browser->get($url)->then(function (Psr\Http\Message\ResponseInterface $response
 });
 ```
 
-See also [example 01](examples/01-google.php).
+See also [GET request client example](examples/01-client-get-request.php).
 
 #### post()
 
@@ -1870,7 +1883,7 @@ $browser->post(
 });
 ```
 
-See also [example 04](examples/04-post-json.php).
+See also [POST JSON client example](examples/04-client-post-json.php).
 
 This method is also commonly used to submit HTML form data:
 
@@ -1964,7 +1977,7 @@ $browser->put(
 });
 ```
 
-See also [example 05](examples/05-put-xml.php).
+See also [PUT XML client example](examples/05-client-put-xml.php).
 
 This method will automatically add a matching `Content-Length` request
 header if the outgoing request body is a `string`. If you're using a
@@ -2538,7 +2551,7 @@ $server = new Server(array(
 ));
 ```
 
-See also [example #12](examples) for more details.
+See also [form upload server example](examples/62-server-form-upload.php) for more details.
 
 By default, this middleware respects the
 [`upload_max_filesize`](https://www.php.net/manual/en/ini.core.php#ini.upload-max-filesize)
diff --git a/composer.json b/composer.json
index 5c6ed3df..2935d498 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "react/http",
-    "description": "Event-driven, streaming plaintext HTTP and secure HTTPS server for ReactPHP",
-    "keywords": ["event-driven", "streaming", "HTTP", "HTTPS", "server", "ReactPHP"],
+    "description": "Event-driven, streaming HTTP client and server implementation for ReactPHP",
+    "keywords": ["HTTP client", "HTTP server", "HTTP", "HTTPS", "event-driven", "streaming", "client", "server", "PSR-7", "async", "ReactPHP"],
     "license": "MIT",
     "require": {
         "php": ">=5.3.0",
diff --git a/examples/01-google.php b/examples/01-client-get-request.php
similarity index 100%
rename from examples/01-google.php
rename to examples/01-client-get-request.php
diff --git a/examples/02-concurrent.php b/examples/02-client-concurrent-requests.php
similarity index 100%
rename from examples/02-concurrent.php
rename to examples/02-client-concurrent-requests.php
diff --git a/examples/03-any.php b/examples/03-client-request-any.php
similarity index 100%
rename from examples/03-any.php
rename to examples/03-client-request-any.php
diff --git a/examples/04-post-json.php b/examples/04-client-post-json.php
similarity index 100%
rename from examples/04-post-json.php
rename to examples/04-client-post-json.php
diff --git a/examples/05-put-xml.php b/examples/05-client-put-xml.php
similarity index 100%
rename from examples/05-put-xml.php
rename to examples/05-client-put-xml.php
diff --git a/examples/11-http-proxy.php b/examples/11-client-http-connect-proxy.php
similarity index 82%
rename from examples/11-http-proxy.php
rename to examples/11-client-http-connect-proxy.php
index d1ad9cf5..53d2e91a 100644
--- a/examples/11-http-proxy.php
+++ b/examples/11-client-http-connect-proxy.php
@@ -1,5 +1,11 @@
 <?php
 
+// not already running a HTTP CONNECT proxy server?
+// Try LeProxy.org or this:
+//
+// $ php examples/72-server-http-connect-proxy.php 8080
+// $ php examples/11-client-http-connect-proxy.php
+
 use React\Http\Browser;
 use Clue\React\HttpProxy\ProxyConnector as HttpConnectClient;
 use Psr\Http\Message\ResponseInterface;
@@ -11,7 +17,6 @@
 $loop = LoopFactory::create();
 
 // create a new HTTP CONNECT proxy client which connects to a HTTP CONNECT proxy server listening on localhost:8080
-// not already running a HTTP CONNECT proxy server? Try LeProxy.org!
 $proxy = new HttpConnectClient('127.0.0.1:8080', new Connector($loop));
 
 // create a Browser object that uses the HTTP CONNECT proxy client for connections
diff --git a/examples/12-socks-proxy.php b/examples/12-client-socks-proxy.php
similarity index 89%
rename from examples/12-socks-proxy.php
rename to examples/12-client-socks-proxy.php
index 3b694804..49827fa2 100644
--- a/examples/12-socks-proxy.php
+++ b/examples/12-client-socks-proxy.php
@@ -1,5 +1,8 @@
 <?php
 
+// not already running a SOCKS proxy server?
+// Try LeProxy.org or this: `ssh -D 1080 localhost`
+
 use React\Http\Browser;
 use Clue\React\Socks\Client as SocksClient;
 use Psr\Http\Message\ResponseInterface;
@@ -11,7 +14,6 @@
 $loop = LoopFactory::create();
 
 // create a new SOCKS proxy client which connects to a SOCKS proxy server listening on localhost:1080
-// not already running a SOCKS proxy server? Try LeProxy.org or this: `ssh -D 1080 localhost`
 $proxy = new SocksClient('127.0.0.1:1080', new Connector($loop));
 
 // create a Browser object that uses the SOCKS proxy client for connections
diff --git a/examples/13-ssh-proxy.php b/examples/13-client-ssh-proxy.php
similarity index 100%
rename from examples/13-ssh-proxy.php
rename to examples/13-client-ssh-proxy.php
diff --git a/examples/14-unix-domain-sockets.php b/examples/14-client-unix-domain-sockets.php
similarity index 100%
rename from examples/14-unix-domain-sockets.php
rename to examples/14-client-unix-domain-sockets.php
diff --git a/examples/21-stream-forwarding.php b/examples/21-client-request-streaming-to-stdout.php
similarity index 100%
rename from examples/21-stream-forwarding.php
rename to examples/21-client-request-streaming-to-stdout.php
diff --git a/examples/22-stream-stdin.php b/examples/22-client-stream-upload-from-stdin.php
similarity index 100%
rename from examples/22-stream-stdin.php
rename to examples/22-client-stream-upload-from-stdin.php
diff --git a/examples/01-hello-world.php b/examples/51-server-hello-world.php
similarity index 100%
rename from examples/01-hello-world.php
rename to examples/51-server-hello-world.php
diff --git a/examples/02-count-visitors.php b/examples/52-server-count-visitors.php
similarity index 100%
rename from examples/02-count-visitors.php
rename to examples/52-server-count-visitors.php
diff --git a/examples/03-client-ip.php b/examples/53-server-whatsmyip.php
similarity index 100%
rename from examples/03-client-ip.php
rename to examples/53-server-whatsmyip.php
diff --git a/examples/04-query-parameter.php b/examples/54-server-query-parameter.php
similarity index 100%
rename from examples/04-query-parameter.php
rename to examples/54-server-query-parameter.php
diff --git a/examples/05-cookie-handling.php b/examples/55-server-cookie-handling.php
similarity index 100%
rename from examples/05-cookie-handling.php
rename to examples/55-server-cookie-handling.php
diff --git a/examples/06-sleep.php b/examples/56-server-sleep.php
similarity index 100%
rename from examples/06-sleep.php
rename to examples/56-server-sleep.php
diff --git a/examples/07-error-handling.php b/examples/57-server-error-handling.php
similarity index 100%
rename from examples/07-error-handling.php
rename to examples/57-server-error-handling.php
diff --git a/examples/08-stream-response.php b/examples/58-server-stream-response.php
similarity index 100%
rename from examples/08-stream-response.php
rename to examples/58-server-stream-response.php
diff --git a/examples/09-json-api.php b/examples/59-server-json-api.php
similarity index 97%
rename from examples/09-json-api.php
rename to examples/59-server-json-api.php
index a3b50d2b..3702c69c 100644
--- a/examples/09-json-api.php
+++ b/examples/59-server-json-api.php
@@ -3,7 +3,7 @@
 // Simple JSON-based HTTP API example as a base to build RESTful/RESTish APIs
 // Launch demo and use your favorite CLI tool to test API requests
 //
-// $ php examples/09-json-api.php 8080
+// $ php examples/59-server-json-api.php 8080
 // $ curl -v http://localhost:8080/ -H 'Content-Type: application/json' -d '{"name":"Alice"}'
 
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/examples/11-hello-world-https.php b/examples/61-server-hello-world-https.php
similarity index 100%
rename from examples/11-hello-world-https.php
rename to examples/61-server-hello-world-https.php
diff --git a/examples/12-upload.php b/examples/62-server-form-upload.php
similarity index 98%
rename from examples/12-upload.php
rename to examples/62-server-form-upload.php
index 38d8c708..4290fb4c 100644
--- a/examples/12-upload.php
+++ b/examples/62-server-form-upload.php
@@ -3,7 +3,7 @@
 // Simple HTML form with file upload
 // Launch demo and use your favorite browser or CLI tool to test form submissions
 //
-// $ php examples/12-upload.php 8080
+// $ php examples/62-server-form-upload.php 8080
 // $ curl --form name=test --form age=30 http://localhost:8080/
 // $ curl --form name=hi --form avatar=@avatar.png http://localhost:8080/
 
diff --git a/examples/13-stream-request.php b/examples/63-server-streaming-request.php
similarity index 100%
rename from examples/13-stream-request.php
rename to examples/63-server-streaming-request.php
diff --git a/examples/21-http-proxy.php b/examples/71-server-http-proxy.php
similarity index 94%
rename from examples/21-http-proxy.php
rename to examples/71-server-http-proxy.php
index 1fe32e36..57ed8e50 100644
--- a/examples/21-http-proxy.php
+++ b/examples/71-server-http-proxy.php
@@ -1,5 +1,8 @@
 <?php
 
+// $ php examples/71-server-http-proxy.php 8080
+// $ curl -v --proxy http://localhost:8080 http://reactphp.org/
+
 use Psr\Http\Message\RequestInterface;
 use React\EventLoop\Factory;
 use React\Http\Response;
diff --git a/examples/22-connect-proxy.php b/examples/72-server-http-connect-proxy.php
similarity index 93%
rename from examples/22-connect-proxy.php
rename to examples/72-server-http-connect-proxy.php
index 85b1a7c9..e2fa42a4 100644
--- a/examples/22-connect-proxy.php
+++ b/examples/72-server-http-connect-proxy.php
@@ -1,5 +1,8 @@
 <?php
 
+// $ php examples/72-server-http-connect-proxy.php 8080
+// $ curl -v --proxy http://localhost:8080 https://reactphp.org/
+
 use Psr\Http\Message\ServerRequestInterface;
 use React\EventLoop\Factory;
 use React\Http\Response;
diff --git a/examples/31-upgrade-echo.php b/examples/81-server-upgrade-echo.php
similarity index 100%
rename from examples/31-upgrade-echo.php
rename to examples/81-server-upgrade-echo.php
diff --git a/examples/32-upgrade-chat.php b/examples/82-server-upgrade-chat.php
similarity index 100%
rename from examples/32-upgrade-chat.php
rename to examples/82-server-upgrade-chat.php
diff --git a/examples/91-benchmark-download.php b/examples/91-client-benchmark-download.php
similarity index 85%
rename from examples/91-benchmark-download.php
rename to examples/91-client-benchmark-download.php
index 10ad8e00..4fd39b9d 100644
--- a/examples/91-benchmark-download.php
+++ b/examples/91-client-benchmark-download.php
@@ -1,16 +1,15 @@
 <?php
 
 // a) simple download benchmark against public HTTP endpoint:
-// $ php examples/91-benchmark-download.php http://httpbin.org/get
+// $ php examples/91-client-benchmark-download.php http://httpbin.org/get
 
 // b) local 10 GB download benchmark against localhost address to avoid network overhead
 //
-// b1) first run example HTTP server, e.g. from react/http:
-// $ cd workspace/reactphp-http
-// $ php examples/99-benchmark-download.php 8080
+// b1) first run example HTTP server:
+// $ php examples/99-server-benchmark-download.php 8080
 //
 // b2) run HTTP client receiving a 10 GB download:
-// $ php examples/91-benchmark-download.php http://localhost:8080/10g.bin
+// $ php examples/91-client-benchmark-download.php http://localhost:8080/10g.bin
 
 use React\Http\Browser;
 use Psr\Http\Message\ResponseInterface;
diff --git a/examples/92-benchmark-upload.php b/examples/92-client-benchmark-upload.php
similarity index 92%
rename from examples/92-benchmark-upload.php
rename to examples/92-client-benchmark-upload.php
index 2b4e7ed6..cc2cf0c0 100644
--- a/examples/92-benchmark-upload.php
+++ b/examples/92-client-benchmark-upload.php
@@ -1,16 +1,15 @@
 <?php
 
 // a) simple 1 MB upload benchmark against public HTTP endpoint
-// $ php examples/92-benchmark-upload.php http://httpbin.org/post 1
+// $ php examples/92-client-benchmark-upload.php http://httpbin.org/post 1
 //
 // b) local 10 GB upload benchmark against localhost address to avoid network overhead
 //
-// b1) first run example HTTP server, e.g. from react/http
-// $ cd workspace/reactphp-http
-// $ php examples/13-stream-request.php 8080
+// b1) first run example HTTP server:
+// $ php examples/63-server-streaming-request.php 8080
 //
 // b2) run HTTP client sending a 10 GB upload
-// $ php examples/92-benchmark-upload.php http://localhost:8080/ 10000
+// $ php examples/92-client-benchmark-upload.php http://localhost:8080/ 10000
 
 use React\Http\Browser;
 use Evenement\EventEmitter;
diff --git a/examples/99-benchmark-download.php b/examples/99-server-benchmark-download.php
similarity index 91%
rename from examples/99-benchmark-download.php
rename to examples/99-server-benchmark-download.php
index 393f87b1..5b5a5abe 100644
--- a/examples/99-benchmark-download.php
+++ b/examples/99-server-benchmark-download.php
@@ -1,10 +1,11 @@
 <?php
 
-// $ php examples/99-benchmark-download.php 8080
+// $ php examples/99-server-benchmark-download.php 8080
 // $ curl http://localhost:8080/10g.bin > /dev/null
 // $ wget http://localhost:8080/10g.bin -O /dev/null
 // $ ab -n10 -c10 http://localhost:8080/1g.bin
-// $ docker run -it --rm --net=host jordi/ab ab -n10 -c10 http://localhost:8080/1g.bin
+// $ docker run -it --rm --net=host jordi/ab -n100000 -c10 http://localhost:8080/
+// $ docker run -it --rm --net=host jordi/ab -n10 -c10 http://localhost:8080/1g.bin
 
 use Evenement\EventEmitter;
 use Psr\Http\Message\ServerRequestInterface;
@@ -118,7 +119,7 @@ public function getSize()
     );
 });
 
-$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0', $loop);
+$socket = new \React\Socket\Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0', $loop, array('tcp' => array('backlog' => 511)));
 $server->listen($socket);
 
 echo 'Listening on ' . str_replace('tcp:', 'http:', $socket->getAddress()) . PHP_EOL;
diff --git a/src/Browser.php b/src/Browser.php
index 38479c86..28f90f87 100644
--- a/src/Browser.php
+++ b/src/Browser.php
@@ -73,7 +73,7 @@ public function __construct(LoopInterface $loop, ConnectorInterface $connector =
      * });
      * ```
      *
-     * See also [example 01](../examples/01-google.php).
+     * See also [GET request client example](../examples/01-client-get-request.php).
      *
      * @param string $url     URL for the request.
      * @param array  $headers
@@ -99,7 +99,7 @@ public function get($url, array $headers = array())
      * });
      * ```
      *
-     * See also [example 04](../examples/04-post-json.php).
+     * See also [POST JSON client example](../examples/04-client-post-json.php).
      *
      * This method is also commonly used to submit HTML form data:
      *
@@ -216,7 +216,7 @@ public function patch($url, array $headers = array(), $contents = '')
      * });
      * ```
      *
-     * See also [example 05](../examples/05-put-xml.php).
+     * See also [PUT XML client example](../examples/05-client-put-xml.php).
      *
      * This method will automatically add a matching `Content-Length` request
      * header if the outgoing request body is a `string`. If you're using a
diff --git a/src/Server.php b/src/Server.php
index 3fe942c9..81b6bd0a 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -55,7 +55,8 @@
  * $server->listen($socket);
  * ```
  *
- * See also the [`listen()`](#listen) method and the [first example](../examples/)
+ * See also the [`listen()`](#listen) method and
+ * [hello world server example](../examples/51-server-hello-world.php)
  * for more details.
  *
  * By default, the `Server` buffers and parses the complete incoming HTTP
@@ -229,7 +230,8 @@ public function __construct($requestHandler)
      * $server->listen($socket);
      * ```
      *
-     * See also [example #1](examples) for more details.
+     * See also [hello world server example](../examples/51-server-hello-world.php)
+     * for more details.
      *
      * This example will start listening for HTTP requests on the alternative
      * HTTP port `8080` on all interfaces (publicly). As an alternative, it is
@@ -256,7 +258,8 @@ public function __construct($requestHandler)
      * $server->listen($socket);
      * ```
      *
-     * See also [example #11](examples) for more details.
+     * See also [hello world HTTPS example](../examples/61-server-hello-world-https.php)
+     * for more details.
      *
      * @param ServerInterface $socket
      */