diff --git a/composer.json b/composer.json
index 920903c..2862374 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "php-http/httplug": "1.0.0-beta",
         "php-http/message-factory": "^1.0",
         "php-http/promise": "^0.1.1",
-        "php-http/client-common": "^0.2@dev",
+        "php-http/client-common": "^0.1.1",
         "symfony/options-resolver": "^2.6|^3.0"
     },
     "require-dev": {
diff --git a/spec/HistoryPluginSpec.php b/spec/HistoryPluginSpec.php
index 91c5b8b..aab28ec 100644
--- a/spec/HistoryPluginSpec.php
+++ b/spec/HistoryPluginSpec.php
@@ -3,7 +3,7 @@
 namespace spec\Http\Client\Plugin;
 
 use Http\Client\Exception\TransferException;
-use Http\Client\Plugin\Journal\Journal;
+use Http\Client\Plugin\Journal;
 use Http\Promise\FulfilledPromise;
 use Http\Promise\RejectedPromise;
 use Psr\Http\Message\RequestInterface;
diff --git a/src/HistoryPlugin.php b/src/HistoryPlugin.php
index 830e049..798b32e 100644
--- a/src/HistoryPlugin.php
+++ b/src/HistoryPlugin.php
@@ -3,7 +3,6 @@
 namespace Http\Client\Plugin;
 
 use Http\Client\Exception;
-use Http\Client\Plugin\Journal\Journal;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
@@ -13,12 +12,14 @@
 class HistoryPlugin implements Plugin
 {
     /**
-     * @var Journal Journal use to store request / responses / exception.
+     * Journal use to store request / responses / exception.
+     *
+     * @var Journal
      */
     private $journal;
 
     /**
-     * @param Journal $journal Journal use to store request / responses / exception.
+     * @param Journal $journal
      */
     public function __construct(Journal $journal)
     {
diff --git a/src/Journal/Journal.php b/src/Journal.php
similarity index 90%
rename from src/Journal/Journal.php
rename to src/Journal.php
index 58dc484..711ed43 100644
--- a/src/Journal/Journal.php
+++ b/src/Journal.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Http\Client\Plugin\Journal;
+namespace Http\Client\Plugin;
 
 use Http\Client\Exception;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
 /**
- * Journal.
- *
  * Records history of http calls.
+ *
+ * @author Joel Wurtz <joel.wurtz@gmail.com>
  */
 interface Journal
 {