diff --git a/ChainOfResponsibilities/Handler.php b/Behavioral/ChainOfResponsibilities/Handler.php
similarity index 97%
rename from ChainOfResponsibilities/Handler.php
rename to Behavioral/ChainOfResponsibilities/Handler.php
index 35ec769..74a89f8 100644
--- a/ChainOfResponsibilities/Handler.php
+++ b/Behavioral/ChainOfResponsibilities/Handler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\ChainOfResponsibilities;
+namespace DesignPatterns\Behavioral\ChainOfResponsibilities;
 
 /**
  * Handler is a generic handler in the chain of responsibilities
diff --git a/ChainOfResponsibilities/README.md b/Behavioral/ChainOfResponsibilities/README.md
similarity index 100%
rename from ChainOfResponsibilities/README.md
rename to Behavioral/ChainOfResponsibilities/README.md
diff --git a/ChainOfResponsibilities/Request.php b/Behavioral/ChainOfResponsibilities/Request.php
similarity index 91%
rename from ChainOfResponsibilities/Request.php
rename to Behavioral/ChainOfResponsibilities/Request.php
index f4bc782..dc955e4 100644
--- a/ChainOfResponsibilities/Request.php
+++ b/Behavioral/ChainOfResponsibilities/Request.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\ChainOfResponsibilities;
+namespace DesignPatterns\Behavioral\ChainOfResponsibilities;
 
 /**
  * Request is a request which goes through the chain of responsibilities.
diff --git a/ChainOfResponsibilities/Responsible/FastStorage.php b/Behavioral/ChainOfResponsibilities/Responsible/FastStorage.php
similarity index 79%
rename from ChainOfResponsibilities/Responsible/FastStorage.php
rename to Behavioral/ChainOfResponsibilities/Responsible/FastStorage.php
index d02fb5a..4a74642 100644
--- a/ChainOfResponsibilities/Responsible/FastStorage.php
+++ b/Behavioral/ChainOfResponsibilities/Responsible/FastStorage.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DesignPatterns\ChainOfResponsibilities\Responsible;
+namespace DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible;
 
-use DesignPatterns\ChainOfResponsibilities\Handler;
-use DesignPatterns\ChainOfResponsibilities\Request;
+use DesignPatterns\Behavioral\ChainOfResponsibilities\Handler;
+use DesignPatterns\Behavioral\ChainOfResponsibilities\Request;
 
 /**
  * Class FastStorage
diff --git a/ChainOfResponsibilities/Responsible/SlowStorage.php b/Behavioral/ChainOfResponsibilities/Responsible/SlowStorage.php
similarity index 83%
rename from ChainOfResponsibilities/Responsible/SlowStorage.php
rename to Behavioral/ChainOfResponsibilities/Responsible/SlowStorage.php
index 8d64484..4f19301 100644
--- a/ChainOfResponsibilities/Responsible/SlowStorage.php
+++ b/Behavioral/ChainOfResponsibilities/Responsible/SlowStorage.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DesignPatterns\ChainOfResponsibilities\Responsible;
+namespace DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible;
 
-use DesignPatterns\ChainOfResponsibilities\Handler;
-use DesignPatterns\ChainOfResponsibilities\Request;
+use DesignPatterns\Behavioral\ChainOfResponsibilities\Handler;
+use DesignPatterns\Behavioral\ChainOfResponsibilities\Request;
 
 /**
  * This is mostly the same code as FastStorage but in fact, it may greatly differs
diff --git a/Tests/ChainOfResponsibilities/ChainTest.php b/Behavioral/ChainOfResponsibilities/Tests/ChainTest.php
similarity index 58%
rename from Tests/ChainOfResponsibilities/ChainTest.php
rename to Behavioral/ChainOfResponsibilities/Tests/ChainTest.php
index 73669b8..4733d6f 100644
--- a/Tests/ChainOfResponsibilities/ChainTest.php
+++ b/Behavioral/ChainOfResponsibilities/Tests/ChainTest.php
@@ -1,9 +1,11 @@
 <?php
 
-namespace DesignPatterns\Tests\ChainOfResponsibilities;
+namespace DesignPatterns\Behavioral\ChainOfResponsibilities\Tests;
 
-use DesignPatterns\ChainOfResponsibilities\Request;
-use DesignPatterns\ChainOfResponsibilities\Responsible;
+use DesignPatterns\Behavioral\ChainOfResponsibilities\Request;
+use DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\FastStorage;
+use DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\SlowStorage;
+use DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible;
 
 /**
  * ChainTest tests the CoR
@@ -11,12 +13,15 @@ use DesignPatterns\ChainOfResponsibilities\Responsible;
 class ChainTest extends \PHPUnit_Framework_TestCase
 {
 
+    /**
+     * @var FastStorage
+     */
     protected $chain;
 
     protected function setUp()
     {
-        $this->chain = new Responsible\FastStorage(array('bar' => 'baz'));
-        $this->chain->append(new Responsible\SlowStorage(array('bar' => 'baz', 'foo' => 'bar')));
+        $this->chain = new FastStorage(array('bar' => 'baz'));
+        $this->chain->append(new SlowStorage(array('bar' => 'baz', 'foo' => 'bar')));
     }
 
     public function makeRequest()
@@ -40,7 +45,8 @@ class ChainTest extends \PHPUnit_Framework_TestCase
         $this->assertObjectHasAttribute('response', $request);
         $this->assertEquals('baz', $request->response);
         // despite both handle owns the 'bar' key, the FastStorage is responding first
-        $this->assertEquals('DesignPatterns\ChainOfResponsibilities\Responsible\FastStorage', $request->forDebugOnly);
+        $className = 'DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\FastStorage';
+        $this->assertEquals($className, $request->forDebugOnly);
     }
 
     /**
@@ -55,7 +61,8 @@ class ChainTest extends \PHPUnit_Framework_TestCase
         $this->assertObjectHasAttribute('response', $request);
         $this->assertEquals('bar', $request->response);
         // FastStorage has no 'foo' key, the SlowStorage is responding
-        $this->assertEquals('DesignPatterns\ChainOfResponsibilities\Responsible\SlowStorage', $request->forDebugOnly);
+        $className = 'DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\SlowStorage';
+        $this->assertEquals($className, $request->forDebugOnly);
     }
 
     /**
@@ -68,6 +75,7 @@ class ChainTest extends \PHPUnit_Framework_TestCase
 
         $this->assertFalse($ret);
         // the last responsible :
-        $this->assertEquals('DesignPatterns\ChainOfResponsibilities\Responsible\SlowStorage', $request->forDebugOnly);
+        $className = 'DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\SlowStorage';
+        $this->assertEquals($className, $request->forDebugOnly);
     }
 }
diff --git a/Command/CommandInterface.php b/Behavioral/Command/CommandInterface.php
similarity index 83%
rename from Command/CommandInterface.php
rename to Behavioral/Command/CommandInterface.php
index ebdbb85..ad9117b 100644
--- a/Command/CommandInterface.php
+++ b/Behavioral/Command/CommandInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Command;
+namespace DesignPatterns\Behavioral\Command;
 
 /**
  * class CommandInterface
diff --git a/Command/HelloCommand.php b/Behavioral/Command/HelloCommand.php
similarity index 94%
rename from Command/HelloCommand.php
rename to Behavioral/Command/HelloCommand.php
index 9bb0956..3dd55b1 100644
--- a/Command/HelloCommand.php
+++ b/Behavioral/Command/HelloCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Command;
+namespace DesignPatterns\Behavioral\Command;
 
 /**
  * This concrete command calls "print" on the Receiver, but an external
diff --git a/Command/Invoker.php b/Behavioral/Command/Invoker.php
similarity index 93%
rename from Command/Invoker.php
rename to Behavioral/Command/Invoker.php
index 6f857ec..4461ee2 100644
--- a/Command/Invoker.php
+++ b/Behavioral/Command/Invoker.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Command;
+namespace DesignPatterns\Behavioral\Command;
 
 /**
  * Invoker is using the command given to it.
diff --git a/Command/README.md b/Behavioral/Command/README.md
similarity index 100%
rename from Command/README.md
rename to Behavioral/Command/README.md
diff --git a/Command/Receiver.php b/Behavioral/Command/Receiver.php
similarity index 82%
rename from Command/Receiver.php
rename to Behavioral/Command/Receiver.php
index f52accb..9289369 100644
--- a/Command/Receiver.php
+++ b/Behavioral/Command/Receiver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Command;
+namespace DesignPatterns\Behavioral\Command;
 
 /**
  * Receiver is specific service with its own contract and can be only concrete
diff --git a/Tests/Command/CommandTest.php b/Behavioral/Command/Tests/CommandTest.php
similarity index 65%
rename from Tests/Command/CommandTest.php
rename to Behavioral/Command/Tests/CommandTest.php
index 7400139..abf7317 100644
--- a/Tests/Command/CommandTest.php
+++ b/Behavioral/Command/Tests/CommandTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace DesignPatterns\Tests\Command;
+namespace DesignPatterns\Behavioral\Command\Tests;
 
-use DesignPatterns\Command\Invoker;
-use DesignPatterns\Command\Receiver;
-use DesignPatterns\Command\HelloCommand;
+use DesignPatterns\Behavioral\Command\Invoker;
+use DesignPatterns\Behavioral\Command\Receiver;
+use DesignPatterns\Behavioral\Command\HelloCommand;
 
 /**
  * CommandTest has the role of the Client in the Command Pattern
@@ -12,12 +12,18 @@ use DesignPatterns\Command\HelloCommand;
 class CommandTest extends \PHPUnit_Framework_TestCase
 {
 
+    /**
+     * @var Invoker
+     */
     protected $invoker;
+
+    /**
+     * @var Receiver
+     */
     protected $receiver;
 
     protected function setUp()
     {
-        // this is the context of the application
         $this->invoker = new Invoker();
         $this->receiver = new Receiver();
     }
diff --git a/Behavioral/Iterator/Book.php b/Behavioral/Iterator/Book.php
new file mode 100644
index 0000000..a0d1114
--- /dev/null
+++ b/Behavioral/Iterator/Book.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace DesignPatterns\Behavioral\Iterator;
+
+class Book
+{
+
+    private $author;
+
+    private $title;
+
+    public function __construct($title, $author)
+    {
+        $this->author = $author;
+        $this->title = $title;
+    }
+
+    public function getAuthor()
+    {
+        return $this->author;
+    }
+
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    public function getAuthorAndTitle()
+    {
+        return $this->getTitle() . ' by ' . $this->getAuthor();
+    }
+}
diff --git a/Behavioral/Iterator/BookList.php b/Behavioral/Iterator/BookList.php
new file mode 100644
index 0000000..0dda925
--- /dev/null
+++ b/Behavioral/Iterator/BookList.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace DesignPatterns\Behavioral\Iterator;
+
+class BookList implements \Countable
+{
+
+    private $books;
+
+    public function getBook($bookNumberToGet)
+    {
+        if ((int)$bookNumberToGet <= $this->count()) {
+            return $this->books[$bookNumberToGet];
+        }
+
+        return null;
+    }
+
+    public function addBook(Book $book)
+    {
+        $this->books[] = $book;
+
+        return $this->count();
+    }
+
+    public function removeBook(Book $bookToRemove)
+    {
+        foreach ($this as $key => $book) {
+            /** @var Book $book */
+            if ($book->getAuthorAndTitle() === $bookToRemove->getAuthorAndTitle()) {
+                unset($this->books[$key]);
+            }
+        }
+
+        return $this->count();
+    }
+
+    public function count()
+    {
+        return count($this->books);
+    }
+}
diff --git a/Behavioral/Iterator/BookListIterator.php b/Behavioral/Iterator/BookListIterator.php
new file mode 100644
index 0000000..bc15ffb
--- /dev/null
+++ b/Behavioral/Iterator/BookListIterator.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace DesignPatterns\Behavioral\Iterator;
+
+class BookListIterator implements \Iterator
+{
+
+    /**
+     * @var BookList
+     */
+    protected $bookList;
+
+    /**
+     * @var int
+     */
+    protected $currentBook = 0;
+
+    public function __construct(BookList $bookList)
+    {
+        $this->bookList = $bookList;
+    }
+
+    /**
+     * Return the current book
+     * @link http://php.net/manual/en/iterator.current.php
+     * @return Book Can return any type.
+     */
+    public function current()
+    {
+        return $this->bookList->getBook($this->currentBook);
+    }
+
+    /**
+     * (PHP 5 &gt;= 5.0.0)<br/>
+     * Move forward to next element
+     * @link http://php.net/manual/en/iterator.next.php
+     * @return void Any returned value is ignored.
+     */
+    public function next()
+    {
+        $this->currentBook++;
+    }
+
+    /**
+     * (PHP 5 &gt;= 5.0.0)<br/>
+     * Return the key of the current element
+     * @link http://php.net/manual/en/iterator.key.php
+     * @return mixed scalar on success, or null on failure.
+     */
+    public function key()
+    {
+        return $this->currentBook;
+    }
+
+    /**
+     * (PHP 5 &gt;= 5.0.0)<br/>
+     * Checks if current position is valid
+     * @link http://php.net/manual/en/iterator.valid.php
+     * @return boolean The return value will be casted to boolean and then evaluated.
+     *       Returns true on success or false on failure.
+     */
+    public function valid()
+    {
+        return $this->currentBook < $this->bookList->count();
+    }
+
+    /**
+     * (PHP 5 &gt;= 5.0.0)<br/>
+     * Rewind the Iterator to the first element
+     * @link http://php.net/manual/en/iterator.rewind.php
+     * @return void Any returned value is ignored.
+     */
+    public function rewind()
+    {
+        $this->currentBook = 0;
+    }
+}
diff --git a/Behavioral/Iterator/BookListReverseIterator.php b/Behavioral/Iterator/BookListReverseIterator.php
new file mode 100644
index 0000000..973bd0b
--- /dev/null
+++ b/Behavioral/Iterator/BookListReverseIterator.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace DesignPatterns\Behavioral\Iterator;
+
+class BookListReverseIterator extends BookListIterator
+{
+
+    public function __construct(BookList $bookList)
+    {
+        $this->bookList = $bookList;
+        $this->currentBook = $this->bookList->count() - 1;
+    }
+
+    public function next()
+    {
+        $this->currentBook--;
+    }
+
+    public function valid()
+    {
+        return 0 <= $this->currentBook;
+    }
+}
diff --git a/Iterator/README.md b/Behavioral/Iterator/README.md
similarity index 100%
rename from Iterator/README.md
rename to Behavioral/Iterator/README.md
diff --git a/Behavioral/Iterator/Tests/IteratorTest.php b/Behavioral/Iterator/Tests/IteratorTest.php
new file mode 100644
index 0000000..2e117d8
--- /dev/null
+++ b/Behavioral/Iterator/Tests/IteratorTest.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace DesignPatterns\Behavioral\Iterator\Tests;
+
+use DesignPatterns\Behavioral\Iterator\Book;
+use DesignPatterns\Behavioral\Iterator\BookList;
+use DesignPatterns\Behavioral\Iterator\BookListIterator;
+use DesignPatterns\Behavioral\Iterator\BookListReverseIterator;
+
+class IteratorTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * @var BookList
+     */
+    protected $bookList;
+
+    protected function setUp()
+    {
+        $this->bookList = new BookList();
+        $this->bookList->addBook(new Book('Learning PHP Design Patterns', 'William Sanders'));
+        $this->bookList->addBook(new Book('Professional Php Design Patterns', 'Aaron Saray'));
+        $this->bookList->addBook(new Book('Clean Code', 'Robert C. Martin'));
+    }
+
+    public function expectedAuthors()
+    {
+        return array(
+            array(
+                array(
+                    'Learning PHP Design Patterns by William Sanders',
+                    'Professional Php Design Patterns by Aaron Saray',
+                    'Clean Code by Robert C. Martin'
+                )
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider expectedAuthors
+     */
+    public function testUseAIteratorAndValidateAuthors($expected)
+    {
+        $iterator = new BookListIterator($this->bookList);
+
+        while ($iterator->valid()) {
+            $expectedBook = array_shift($expected);
+            $this->assertEquals($expectedBook, $iterator->current()->getAuthorAndTitle());
+            $iterator->next();
+        }
+    }
+
+    /**
+     * @dataProvider expectedAuthors
+     */
+    public function testUseAReverseIteratorAndValidateAuthors($expected)
+    {
+        $iterator = new BookListReverseIterator($this->bookList);
+
+        while ($iterator->valid()) {
+            $expectedBook = array_pop($expected);
+            $this->assertEquals($expectedBook, $iterator->current()->getAuthorAndTitle());
+            $iterator->next();
+        }
+    }
+}
diff --git a/Mediator/Colleague.php b/Behavioral/Mediator/Colleague.php
similarity index 93%
rename from Mediator/Colleague.php
rename to Behavioral/Mediator/Colleague.php
index c6aae18..36dea5d 100644
--- a/Mediator/Colleague.php
+++ b/Behavioral/Mediator/Colleague.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Mediator;
+namespace DesignPatterns\Behavioral\Mediator;
 
 /**
  * Colleague is an abstract colleague who works together but he only knows
diff --git a/Mediator/Mediator.php b/Behavioral/Mediator/Mediator.php
similarity index 81%
rename from Mediator/Mediator.php
rename to Behavioral/Mediator/Mediator.php
index d501573..ba1407e 100644
--- a/Mediator/Mediator.php
+++ b/Behavioral/Mediator/Mediator.php
@@ -1,20 +1,29 @@
 <?php
 
-namespace DesignPatterns\Mediator;
+namespace DesignPatterns\Behavioral\Mediator;
 
-use DesignPatterns\Mediator\Subsystem;
+use DesignPatterns\Behavioral\Mediator\Subsystem;
 
 /**
  * Mediator is the concrete Mediator for this design pattern.
- *
  * In this example, I have made a "Hello World" with the Mediator Pattern.
  */
 class Mediator implements MediatorInterface
 {
 
-    // you could have an array
+    /**
+     * @var Subsystem\Server
+     */
     protected $server;
+
+    /**
+     * @var Subsystem\Database
+     */
     protected $database;
+
+    /**
+     * @var Subsystem\Client
+     */
     protected $client;
 
     /**
@@ -39,7 +48,6 @@ class Mediator implements MediatorInterface
 
     /**
      * query db
-     *
      * @return mixed
      */
     public function queryDb()
diff --git a/Mediator/MediatorInterface.php b/Behavioral/Mediator/MediatorInterface.php
similarity index 90%
rename from Mediator/MediatorInterface.php
rename to Behavioral/Mediator/MediatorInterface.php
index d7e6a41..b289cea 100644
--- a/Mediator/MediatorInterface.php
+++ b/Behavioral/Mediator/MediatorInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Mediator;
+namespace DesignPatterns\Behavioral\Mediator;
 
 /**
  * MediatorInterface is a contract for the Mediator
diff --git a/Mediator/README.md b/Behavioral/Mediator/README.md
similarity index 100%
rename from Mediator/README.md
rename to Behavioral/Mediator/README.md
diff --git a/Mediator/Subsystem/Client.php b/Behavioral/Mediator/Subsystem/Client.php
similarity index 77%
rename from Mediator/Subsystem/Client.php
rename to Behavioral/Mediator/Subsystem/Client.php
index ef00aa0..cb4b020 100644
--- a/Mediator/Subsystem/Client.php
+++ b/Behavioral/Mediator/Subsystem/Client.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Mediator\Subsystem;
+namespace DesignPatterns\Behavioral\Mediator\Subsystem;
 
-use DesignPatterns\Mediator\Colleague;
+use DesignPatterns\Behavioral\Mediator\Colleague;
 
 /**
  * Client is a client that make request et get response
diff --git a/Mediator/Subsystem/Database.php b/Behavioral/Mediator/Subsystem/Database.php
similarity index 64%
rename from Mediator/Subsystem/Database.php
rename to Behavioral/Mediator/Subsystem/Database.php
index 80acf28..7cc9bc4 100644
--- a/Mediator/Subsystem/Database.php
+++ b/Behavioral/Mediator/Subsystem/Database.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Mediator\Subsystem;
+namespace DesignPatterns\Behavioral\Mediator\Subsystem;
 
-use DesignPatterns\Mediator\Colleague;
+use DesignPatterns\Behavioral\Mediator\Colleague;
 
 /**
  * Database is a database service
diff --git a/Mediator/Subsystem/Server.php b/Behavioral/Mediator/Subsystem/Server.php
similarity index 71%
rename from Mediator/Subsystem/Server.php
rename to Behavioral/Mediator/Subsystem/Server.php
index 34b7400..1638301 100644
--- a/Mediator/Subsystem/Server.php
+++ b/Behavioral/Mediator/Subsystem/Server.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Mediator\Subsystem;
+namespace DesignPatterns\Behavioral\Mediator\Subsystem;
 
-use DesignPatterns\Mediator\Colleague;
+use DesignPatterns\Behavioral\Mediator\Colleague;
 
 /**
  * Server serves responses
diff --git a/Tests/Mediator/MediatorTest.php b/Behavioral/Mediator/Tests/MediatorTest.php
similarity index 73%
rename from Tests/Mediator/MediatorTest.php
rename to Behavioral/Mediator/Tests/MediatorTest.php
index 77db09f..13abe48 100644
--- a/Tests/Mediator/MediatorTest.php
+++ b/Behavioral/Mediator/Tests/MediatorTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace DesignPatterns\Tests\Mediator;
+namespace DesignPatterns\Tests\Mediator\Tests;
 
-use DesignPatterns\Mediator\Mediator;
-use DesignPatterns\Mediator\Subsystem\Database;
-use DesignPatterns\Mediator\Subsystem\Client;
-use DesignPatterns\Mediator\Subsystem\Server;
+use DesignPatterns\Behavioral\Mediator\Mediator;
+use DesignPatterns\Behavioral\Mediator\Subsystem\Database;
+use DesignPatterns\Behavioral\Mediator\Subsystem\Client;
+use DesignPatterns\Behavioral\Mediator\Subsystem\Server;
 
 /**
  * MediatorTest tests hello world
diff --git a/Behavioral/Memento/Caretaker.php b/Behavioral/Memento/Caretaker.php
new file mode 100644
index 0000000..340bb97
--- /dev/null
+++ b/Behavioral/Memento/Caretaker.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace DesignPatterns\Behavioral\Memento;
+
+class Caretaker
+{
+    public static function run()
+    {
+        /* @var $savedStates Memento[] */
+
+        $savedStates = array();
+
+        $originator = new Originator();
+
+        //Setting state to State1
+        $originator->setState("State1");
+        //Setting state to State2
+        $originator->setState("State2");
+        //Saving State2 to Memento
+        $savedStates[] = $originator->saveToMemento();
+        //Setting state to State3
+        $originator->setState("State3");
+
+        // We can request multiple mementos, and choose which one to roll back to.
+        // Saving State3 to Memento
+        $savedStates[] = $originator->saveToMemento();
+        //Setting state to State4
+        $originator->setState("State4");
+
+        $originator->restoreFromMemento($savedStates[1]);
+        //State after restoring from Memento: State3
+    }
+}
diff --git a/Behavioral/Memento/Memento.php b/Behavioral/Memento/Memento.php
new file mode 100644
index 0000000..4dd2fc8
--- /dev/null
+++ b/Behavioral/Memento/Memento.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace DesignPatterns\Behavioral\Memento;
+
+class Memento
+{
+    /* @var mixed */
+    private $state;
+
+    /**
+     * @param mixed $stateToSave
+     */
+    public function __construct($stateToSave)
+    {
+        $this->state = $stateToSave;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getState()
+    {
+        return $this->state;
+    }
+}
diff --git a/Behavioral/Memento/Originator.php b/Behavioral/Memento/Originator.php
new file mode 100644
index 0000000..fec4e45
--- /dev/null
+++ b/Behavioral/Memento/Originator.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace DesignPatterns\Behavioral\Memento;
+
+class Originator
+{
+    /* @var mixed */
+    private $state;
+
+    // The class could also contain additional data that is not part of the
+    // state saved in the memento..
+
+    /**
+     * @param mixed $state
+     */
+    public function setState($state)
+    {
+        $this->state = $state;
+    }
+
+    /**
+     * @return Memento
+     */
+    public function saveToMemento()
+    {
+        $state = is_object($this->state) ? clone $this->state : $this->state;
+
+        return new Memento($state);
+    }
+
+    public function restoreFromMemento(Memento $memento)
+    {
+        $this->state = $memento->getState();
+    }
+}
diff --git a/Behavioral/Memento/README.md b/Behavioral/Memento/README.md
new file mode 100644
index 0000000..83ca2c0
--- /dev/null
+++ b/Behavioral/Memento/README.md
@@ -0,0 +1,18 @@
+# Memento
+
+## Purpose
+
+Provide the ability to restore an object to its previous state (undo via rollback).
+
+The memento pattern is implemented with three objects: the originator, a caretaker and a memento.
+The originator is some object that has an internal state.
+The caretaker is going to do something to the originator, but wants to be able to undo the change.
+The caretaker first asks the originator for a memento object. Then it does whatever operation (or sequence of operations) it was going to do.
+To roll back to the state before the operations, it returns the memento object to the originator.
+The memento object itself is an opaque object (one which the caretaker cannot, or should not, change).
+When using this pattern, care should be taken if the originator may change other objects or resources - the memento pattern operates on a single object.
+
+## Examples
+
+* The seed of a pseudorandom number generator
+* The state in a finite state machine
diff --git a/Behavioral/Memento/Tests/MementoTest.php b/Behavioral/Memento/Tests/MementoTest.php
new file mode 100644
index 0000000..88110a6
--- /dev/null
+++ b/Behavioral/Memento/Tests/MementoTest.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace DesignPatterns\Behavioral\Memento\Tests;
+
+use DesignPatterns\Behavioral\Memento\Originator;
+
+/**
+ * MementoTest tests the memento pattern
+ */
+class MementoTest extends \PHPUnit_Framework_TestCase
+{
+
+    public function testStringState()
+    {
+        $originator = new Originator();
+        $originator->setState("State1");
+
+        $this->assertAttributeEquals("State1", "state", $originator);
+
+        $originator->setState("State2");
+
+        $this->assertAttributeEquals("State2", "state", $originator);
+
+        $savedState = $originator->saveToMemento();
+
+        $this->assertAttributeEquals("State2", "state", $savedState);
+
+        $originator->setState("State3");
+
+        $this->assertAttributeEquals("State3", "state", $originator);
+
+        $originator->restoreFromMemento($savedState);
+
+        $this->assertAttributeEquals("State2", "state", $originator);
+    }
+
+    public function testObjectState()
+    {
+        $originator = new Originator();
+
+        $foo       = new \stdClass();
+        $foo->data = "foo";
+
+        $originator->setState($foo);
+
+        $this->assertAttributeEquals($foo, "state", $originator);
+
+        $savedState = $originator->saveToMemento();
+
+        $this->assertAttributeEquals($foo, "state", $savedState);
+
+        $bar       = new \stdClass();
+        $bar->data = "bar";
+
+        $originator->setState($bar);
+
+        $this->assertAttributeEquals($bar, "state", $originator);
+
+        $originator->restoreFromMemento($savedState);
+
+        $this->assertAttributeEquals($foo, "state", $originator);
+
+        $foo->data = null;
+
+        $this->assertAttributeNotEquals($foo, "state", $savedState);
+
+        $this->assertAttributeNotEquals($foo, "state", $originator);
+    }
+}
diff --git a/NullObject/LoggerInterface.php b/Behavioral/NullObject/LoggerInterface.php
similarity index 85%
rename from NullObject/LoggerInterface.php
rename to Behavioral/NullObject/LoggerInterface.php
index 9acf855..250c5a3 100644
--- a/NullObject/LoggerInterface.php
+++ b/Behavioral/NullObject/LoggerInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\NullObject;
+namespace DesignPatterns\Behavioral\NullObject;
 
 /**
  * LoggerInterface is a contract for logging something
diff --git a/NullObject/NullLogger.php b/Behavioral/NullObject/NullLogger.php
similarity index 89%
rename from NullObject/NullLogger.php
rename to Behavioral/NullObject/NullLogger.php
index 7f013dc..49ff51e 100644
--- a/NullObject/NullLogger.php
+++ b/Behavioral/NullObject/NullLogger.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\NullObject;
+namespace DesignPatterns\Behavioral\NullObject;
 
 /**
  * Performance concerns : ok there is a call for nothing but we spare an "if is_null"
diff --git a/NullObject/PrintLogger.php b/Behavioral/NullObject/PrintLogger.php
similarity index 83%
rename from NullObject/PrintLogger.php
rename to Behavioral/NullObject/PrintLogger.php
index 67df5ad..a088145 100644
--- a/NullObject/PrintLogger.php
+++ b/Behavioral/NullObject/PrintLogger.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\NullObject;
+namespace DesignPatterns\Behavioral\NullObject;
 
 /**
  * PrintLogger is a logger that prints the log entry to standard output
diff --git a/NullObject/README.md b/Behavioral/NullObject/README.md
similarity index 100%
rename from NullObject/README.md
rename to Behavioral/NullObject/README.md
diff --git a/NullObject/Service.php b/Behavioral/NullObject/Service.php
similarity index 92%
rename from NullObject/Service.php
rename to Behavioral/NullObject/Service.php
index df46e34..ae6d96d 100644
--- a/NullObject/Service.php
+++ b/Behavioral/NullObject/Service.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\NullObject;
+namespace DesignPatterns\Behavioral\NullObject;
 
 /**
  * Service is dummy service that uses a logger
diff --git a/Tests/NullObject/LoggerTest.php b/Behavioral/NullObject/Tests/LoggerTest.php
similarity index 65%
rename from Tests/NullObject/LoggerTest.php
rename to Behavioral/NullObject/Tests/LoggerTest.php
index d19e144..a8e7bf5 100644
--- a/Tests/NullObject/LoggerTest.php
+++ b/Behavioral/NullObject/Tests/LoggerTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace DesignPatterns\Tests\NullObject;
+namespace DesignPatterns\Behavioral\NullObject\Tests;
 
-use DesignPatterns\NullObject\NullLogger;
-use DesignPatterns\NullObject\Service;
-use DesignPatterns\NullObject\PrintLogger;
+use DesignPatterns\Behavioral\NullObject\NullLogger;
+use DesignPatterns\Behavioral\NullObject\Service;
+use DesignPatterns\Behavioral\NullObject\PrintLogger;
 
 /**
  * LoggerTest tests for different loggers
@@ -24,7 +24,7 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
     public function testStandardLogger()
     {
         $service = new Service(new PrintLogger());
-        $this->expectOutputString('We are in DesignPatterns\NullObject\Service::doSomething');
+        $this->expectOutputString('We are in DesignPatterns\Behavioral\NullObject\Service::doSomething');
         $service->doSomething();
     }
 }
diff --git a/Observer/README.md b/Behavioral/Observer/README.md
similarity index 100%
rename from Observer/README.md
rename to Behavioral/Observer/README.md
diff --git a/Tests/Observer/ObserverTest.php b/Behavioral/Observer/Tests/ObserverTest.php
similarity index 78%
rename from Tests/Observer/ObserverTest.php
rename to Behavioral/Observer/Tests/ObserverTest.php
index 9508ac9..233de28 100644
--- a/Tests/Observer/ObserverTest.php
+++ b/Behavioral/Observer/Tests/ObserverTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DesignPatterns\Tests\Observer;
+namespace DesignPatterns\Behavioral\Observer\Tests;
 
-use DesignPatterns\Observer\UserObserver;
-use DesignPatterns\Observer\User;
+use DesignPatterns\Behavioral\Observer\UserObserver;
+use DesignPatterns\Behavioral\Observer\User;
 
 /**
  * ObserverTest tests the Observer pattern
@@ -23,7 +23,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
      */
     public function testNotify()
     {
-        $this->expectOutputString('DesignPatterns\Observer\User has been updated');
+        $this->expectOutputString('DesignPatterns\Behavioral\Observer\User has been updated');
         $subject = new User();
 
         $subject->attach($this->observer);
@@ -53,10 +53,9 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
         $subject->attach($observer);
 
         $observer->expects($this->once())
-                ->method('update')
-                ->with($subject);
+            ->method('update')
+            ->with($subject);
 
         $subject->notify();
     }
-
-}
\ No newline at end of file
+}
diff --git a/Observer/User.php b/Behavioral/Observer/User.php
similarity index 97%
rename from Observer/User.php
rename to Behavioral/Observer/User.php
index 3ee3fba..5b6fb4c 100644
--- a/Observer/User.php
+++ b/Behavioral/Observer/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Observer;
+namespace DesignPatterns\Behavioral\Observer;
 
 /**
  * Observer pattern : The observed object (the subject)
diff --git a/Observer/UserObserver.php b/Behavioral/Observer/UserObserver.php
similarity index 89%
rename from Observer/UserObserver.php
rename to Behavioral/Observer/UserObserver.php
index 20bdf71..444a0eb 100644
--- a/Observer/UserObserver.php
+++ b/Behavioral/Observer/UserObserver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Observer;
+namespace DesignPatterns\Behavioral\Observer;
 
 /**
  * class UserObserver
diff --git a/Behavioral/README.md b/Behavioral/README.md
new file mode 100644
index 0000000..d9c264e
--- /dev/null
+++ b/Behavioral/README.md
@@ -0,0 +1,18 @@
+# Behavioral
+
+In software engineering, behavioral design patterns are design patterns that
+identify common communication patterns between objects and realize these
+patterns. By doing so, these patterns increase flexibility in carrying out this
+communication.
+
+* [ChainOfResponsibilities](ChainOfResponsibilities) [:notebook:](http://en.wikipedia.org/wiki/Chain_of_responsibility_pattern)
+* [Command](Command) [:notebook:](http://en.wikipedia.org/wiki/Command_pattern)
+* [Iterator](Iterator) [:notebook:](http://en.wikipedia.org/wiki/Iterator_pattern)
+* [Mediator](Mediator) [:notebook:](http://en.wikipedia.org/wiki/Mediator_pattern)
+* [NullObject](NullObject) [:notebook:](http://en.wikipedia.org/wiki/Null_Object_pattern)
+* [Observer](Observer) [:notebook:](http://en.wikipedia.org/wiki/Observer_pattern)
+* [Specification](Specification) [:notebook:](http://en.wikipedia.org/wiki/Specification_pattern)
+* [State](State) [:notebook:](http://en.wikipedia.org/wiki/State_pattern)
+* [Strategy](Strategy) [:notebook:](http://en.wikipedia.org/wiki/Strategy_pattern)
+* [TemplateMethod](TemplateMethod) [:notebook:](http://en.wikipedia.org/wiki/Template_method_pattern)
+* [Visitor](Visitor) [:notebook:](http://en.wikipedia.org/wiki/Visitor_pattern)
diff --git a/Specification/AbstractSpecification.php b/Behavioral/Specification/AbstractSpecification.php
old mode 100755
new mode 100644
similarity index 90%
rename from Specification/AbstractSpecification.php
rename to Behavioral/Specification/AbstractSpecification.php
index 95c0152..f297539
--- a/Specification/AbstractSpecification.php
+++ b/Behavioral/Specification/AbstractSpecification.php
@@ -1,5 +1,5 @@
 <?php
-namespace DesignPatterns\Specification;
+namespace DesignPatterns\Behavioral\Specification;
 
 /**
  * An abstract specification allows the creation of wrapped specifications
@@ -8,18 +8,18 @@ abstract class AbstractSpecification implements SpecificationInterface
 {
     /**
      * Checks if given item meets all criteria
-     * 
+     *
      * @param Item $item
-     * 
+     *
      * @return bool
      */
     abstract public function isSatisfiedBy(Item $item);
 
     /**
      * Creates a new logical AND specification
-     * 
+     *
      * @param SpecificationInterface $spec
-     * 
+     *
      * @return SpecificationInterface
      */
     public function plus(SpecificationInterface $spec)
@@ -29,9 +29,9 @@ abstract class AbstractSpecification implements SpecificationInterface
 
     /**
      * Creates a new logical OR composite specification
-     * 
+     *
      * @param SpecificationInterface $spec
-     * 
+     *
      * @return SpecificationInterface
      */
     public function either(SpecificationInterface $spec)
@@ -41,11 +41,11 @@ abstract class AbstractSpecification implements SpecificationInterface
 
     /**
      * Creates a new logical NOT specification
-     * 
+     *
      * @return SpecificationInterface
      */
     public function not()
     {
         return new Not($this);
     }
-}
\ No newline at end of file
+}
diff --git a/Specification/Either.php b/Behavioral/Specification/Either.php
old mode 100755
new mode 100644
similarity index 93%
rename from Specification/Either.php
rename to Behavioral/Specification/Either.php
index bcd256b..10eff4f
--- a/Specification/Either.php
+++ b/Behavioral/Specification/Either.php
@@ -1,5 +1,5 @@
 <?php
-namespace DesignPatterns\Specification;
+namespace DesignPatterns\Behavioral\Specification;
 
 /**
  * A logical OR specification
diff --git a/Specification/Item.php b/Behavioral/Specification/Item.php
similarity index 88%
rename from Specification/Item.php
rename to Behavioral/Specification/Item.php
index 0d46575..53d9ac2 100644
--- a/Specification/Item.php
+++ b/Behavioral/Specification/Item.php
@@ -1,5 +1,5 @@
 <?php
-namespace DesignPatterns\Specification;
+namespace DesignPatterns\Behavioral\Specification;
 
 /**
  * An trivial item
diff --git a/Specification/Not.php b/Behavioral/Specification/Not.php
old mode 100755
new mode 100644
similarity index 91%
rename from Specification/Not.php
rename to Behavioral/Specification/Not.php
index 3e79cad..f46999d
--- a/Specification/Not.php
+++ b/Behavioral/Specification/Not.php
@@ -1,5 +1,5 @@
 <?php
-namespace DesignPatterns\Specification;
+namespace DesignPatterns\Behavioral\Specification;
 
 /**
  * A logical Not specification
@@ -31,4 +31,4 @@ class Not extends AbstractSpecification
     {
         return !$this->spec->isSatisfiedBy($item);
     }
-}
\ No newline at end of file
+}
diff --git a/Specification/Plus.php b/Behavioral/Specification/Plus.php
old mode 100755
new mode 100644
similarity index 90%
rename from Specification/Plus.php
rename to Behavioral/Specification/Plus.php
index 32c3801..c4ad546
--- a/Specification/Plus.php
+++ b/Behavioral/Specification/Plus.php
@@ -1,5 +1,5 @@
 <?php
-namespace DesignPatterns\Specification;
+namespace DesignPatterns\Behavioral\Specification;
 
 /**
  * A logical AND specification
@@ -12,10 +12,9 @@ class Plus extends AbstractSpecification
 
     /**
      * Creation of a locical AND of two specifications
-     * 
+     *
      * @param SpecificationInterface $left
      * @param SpecificationInterface $right
-
      */
     public function __construct(SpecificationInterface $left, SpecificationInterface $right)
     {
@@ -25,13 +24,13 @@ class Plus extends AbstractSpecification
 
     /**
      * Checks if the composite AND of specifications passes
-     * 
+     *
      * @param Item $item
-     * 
+     *
      * @return bool
      */
     public function isSatisfiedBy(Item $item)
     {
         return $this->left->isSatisfiedBy($item) && $this->right->isSatisfiedBy($item);
     }
-}
\ No newline at end of file
+}
diff --git a/Specification/PriceSpecification.php b/Behavioral/Specification/PriceSpecification.php
similarity index 78%
rename from Specification/PriceSpecification.php
rename to Behavioral/Specification/PriceSpecification.php
index fd8387f..747efdf 100644
--- a/Specification/PriceSpecification.php
+++ b/Behavioral/Specification/PriceSpecification.php
@@ -1,5 +1,5 @@
 <?php
-namespace DesignPatterns\Specification;
+namespace DesignPatterns\Behavioral\Specification;
 
 /**
  * A specification to check an Item is priced between min and max
@@ -31,17 +31,17 @@ class PriceSpecification extends AbstractSpecification
 
     /**
      * Checks if Item price falls between bounds
-     * 
+     *
      * @param Item $item
-     * 
+     *
      * @return bool
      */
     public function isSatisfiedBy(Item $item)
     {
-        if ( !empty($this->maxPrice) && $item->getPrice() > $this->maxPrice) {
+        if (!empty($this->maxPrice) && $item->getPrice() > $this->maxPrice) {
             return false;
         }
-        if ( !empty($this->minPrice) && $item->getPrice() < $this->minPrice) {
+        if (!empty($this->minPrice) && $item->getPrice() < $this->minPrice) {
             return false;
         }
 
diff --git a/Specification/README.md b/Behavioral/Specification/README.md
similarity index 100%
rename from Specification/README.md
rename to Behavioral/Specification/README.md
diff --git a/Specification/SpecificationInterface.php b/Behavioral/Specification/SpecificationInterface.php
old mode 100755
new mode 100644
similarity index 89%
rename from Specification/SpecificationInterface.php
rename to Behavioral/Specification/SpecificationInterface.php
index b8c1e7c..e4e15a2
--- a/Specification/SpecificationInterface.php
+++ b/Behavioral/Specification/SpecificationInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace DesignPatterns\Specification;
+namespace DesignPatterns\Behavioral\Specification;
 
 /**
  * An interface for a specification
@@ -8,26 +8,24 @@ interface SpecificationInterface
 {
     /**
      * A boolean evaluation indicating if the object meets the specification
-     * 
+     *
      * @param Item $item
-     * 
+     *
      * @return bool
      */
     public function isSatisfiedBy(Item $item);
 
     /**
      * Creates a logical AND specification
-     * 
+     *
      * @param SpecificationInterface $spec
-
      */
     public function plus(SpecificationInterface $spec);
 
     /**
      * Creates a logical OR specification
-     * 
+     *
      * @param SpecificationInterface $spec
-
      */
     public function either(SpecificationInterface $spec);
 
@@ -35,4 +33,4 @@ interface SpecificationInterface
      * Creates a logical not specification
      */
     public function not();
-}
\ No newline at end of file
+}
diff --git a/Tests/Specification/SpecificationTest.php b/Behavioral/Specification/Tests/SpecificationTest.php
similarity index 94%
rename from Tests/Specification/SpecificationTest.php
rename to Behavioral/Specification/Tests/SpecificationTest.php
index ab60eae..2677cad 100644
--- a/Tests/Specification/SpecificationTest.php
+++ b/Behavioral/Specification/Tests/SpecificationTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DesignPatterns\Tests\Specification;
+namespace DesignPatterns\Behavioral\Specification\Tests;
 
-use DesignPatterns\Specification\PriceSpecification;
-use DesignPatterns\Specification\Item;
+use DesignPatterns\Behavioral\Specification\PriceSpecification;
+use DesignPatterns\Behavioral\Specification\Item;
 
 /**
  * SpecificationTest tests the specification pattern
diff --git a/State/CreateOrder.php b/Behavioral/State/CreateOrder.php
similarity index 95%
rename from State/CreateOrder.php
rename to Behavioral/State/CreateOrder.php
index 416514f..caf9f29 100644
--- a/State/CreateOrder.php
+++ b/Behavioral/State/CreateOrder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Status;
+namespace DesignPatterns\Behavioral\State;
 
 /**
  * Class CreateOrder
diff --git a/State/OrderController.php b/Behavioral/State/OrderController.php
similarity index 93%
rename from State/OrderController.php
rename to Behavioral/State/OrderController.php
index 3c95782..74ec3c0 100644
--- a/State/OrderController.php
+++ b/Behavioral/State/OrderController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Status;
+namespace DesignPatterns\Behavioral\State;
 
 /**
  * Class OrderController
diff --git a/State/OrderFactory.php b/Behavioral/State/OrderFactory.php
similarity index 84%
rename from State/OrderFactory.php
rename to Behavioral/State/OrderFactory.php
index 0e61758..a5a4167 100644
--- a/State/OrderFactory.php
+++ b/Behavioral/State/OrderFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Status;
+namespace DesignPatterns\Behavioral\State;
 
 /**
  * Class OrderFactory
@@ -9,7 +9,7 @@ class OrderFactory
 {
     private function __construct()
     {
-        throw Exception('Can not instance the OrderFactory class!');
+        throw new \Exception('Can not instance the OrderFactory class!');
     }
 
     /**
diff --git a/State/OrderInterface.php b/Behavioral/State/OrderInterface.php
similarity index 83%
rename from State/OrderInterface.php
rename to Behavioral/State/OrderInterface.php
index 35c92e4..ccc4952 100644
--- a/State/OrderInterface.php
+++ b/Behavioral/State/OrderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Status;
+namespace DesignPatterns\Behavioral\State;
 
 /**
  * Class OrderInterface
diff --git a/State/README.md b/Behavioral/State/README.md
similarity index 100%
rename from State/README.md
rename to Behavioral/State/README.md
diff --git a/State/ShippingOrder.php b/Behavioral/State/ShippingOrder.php
similarity index 95%
rename from State/ShippingOrder.php
rename to Behavioral/State/ShippingOrder.php
index cbd8f93..025ac32 100644
--- a/State/ShippingOrder.php
+++ b/Behavioral/State/ShippingOrder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Status;
+namespace DesignPatterns\Behavioral\State;
 
 /**
  * Class ShippingOrder
diff --git a/Strategy/ComparatorInterface.php b/Behavioral/Strategy/ComparatorInterface.php
similarity index 81%
rename from Strategy/ComparatorInterface.php
rename to Behavioral/Strategy/ComparatorInterface.php
index 468a614..8e7de18 100644
--- a/Strategy/ComparatorInterface.php
+++ b/Behavioral/Strategy/ComparatorInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Strategy;
+namespace DesignPatterns\Behavioral\Strategy;
 
 /**
  * Class ComparatorInterface
diff --git a/Strategy/DateComparator.php b/Behavioral/Strategy/DateComparator.php
similarity index 89%
rename from Strategy/DateComparator.php
rename to Behavioral/Strategy/DateComparator.php
index 199716b..bc7ffea 100644
--- a/Strategy/DateComparator.php
+++ b/Behavioral/Strategy/DateComparator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Strategy;
+namespace DesignPatterns\Behavioral\Strategy;
 
 /**
  * Class DateComparator
diff --git a/Strategy/IdComparator.php b/Behavioral/Strategy/IdComparator.php
similarity index 87%
rename from Strategy/IdComparator.php
rename to Behavioral/Strategy/IdComparator.php
index c3bc9a7..9076989 100644
--- a/Strategy/IdComparator.php
+++ b/Behavioral/Strategy/IdComparator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Strategy;
+namespace DesignPatterns\Behavioral\Strategy;
 
 /**
  * Class IdComparator
diff --git a/Strategy/ObjectCollection.php b/Behavioral/Strategy/ObjectCollection.php
similarity index 84%
rename from Strategy/ObjectCollection.php
rename to Behavioral/Strategy/ObjectCollection.php
index 57836ad..1b4fa88 100644
--- a/Strategy/ObjectCollection.php
+++ b/Behavioral/Strategy/ObjectCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Strategy;
+namespace DesignPatterns\Behavioral\Strategy;
 
 /**
  * Class ObjectCollection
@@ -30,10 +30,10 @@ class ObjectCollection
      */
     public function sort()
     {
-        if (!$this->comparator){ 
-            throw new \LogicException("Comparator is not set");    
+        if (!$this->comparator) {
+            throw new \LogicException("Comparator is not set");
         }
-        
+
         $callback = array($this->comparator, 'compare');
         uasort($this->elements, $callback);
 
diff --git a/Strategy/README.md b/Behavioral/Strategy/README.md
similarity index 100%
rename from Strategy/README.md
rename to Behavioral/Strategy/README.md
diff --git a/Tests/Strategy/StrategyTest.php b/Behavioral/Strategy/Tests/StrategyTest.php
similarity index 86%
rename from Tests/Strategy/StrategyTest.php
rename to Behavioral/Strategy/Tests/StrategyTest.php
index 7e587b1..927ae19 100644
--- a/Tests/Strategy/StrategyTest.php
+++ b/Behavioral/Strategy/Tests/StrategyTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace DesignPatterns\Tests\Strategy;
+namespace DesignPatterns\Behavioral\Strategy\Tests;
 
-use DesignPatterns\Strategy\DateComparator;
-use DesignPatterns\Strategy\IdComparator;
-use DesignPatterns\Strategy\ObjectCollection;
-use DesignPatterns\Strategy\Strategy;
+use DesignPatterns\Behavioral\Strategy\DateComparator;
+use DesignPatterns\Behavioral\Strategy\IdComparator;
+use DesignPatterns\Behavioral\Strategy\ObjectCollection;
+use DesignPatterns\Behavioral\Strategy\Strategy;
 
 /**
  * Tests for Static Factory pattern
diff --git a/TemplateMethod/BeachJourney.php b/Behavioral/TemplateMethod/BeachJourney.php
similarity index 83%
rename from TemplateMethod/BeachJourney.php
rename to Behavioral/TemplateMethod/BeachJourney.php
index 6370ef2..94018f3 100644
--- a/TemplateMethod/BeachJourney.php
+++ b/Behavioral/TemplateMethod/BeachJourney.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\TemplateMethod;
+namespace DesignPatterns\Behavioral\TemplateMethod;
 
 /**
  * BeachJourney is vacation at the beach
diff --git a/TemplateMethod/CityJourney.php b/Behavioral/TemplateMethod/CityJourney.php
similarity index 83%
rename from TemplateMethod/CityJourney.php
rename to Behavioral/TemplateMethod/CityJourney.php
index e29e4ba..89c2ef0 100644
--- a/TemplateMethod/CityJourney.php
+++ b/Behavioral/TemplateMethod/CityJourney.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\TemplateMethod;
+namespace DesignPatterns\Behavioral\TemplateMethod;
 
 /**
  * CityJourney is a journey in a city
diff --git a/TemplateMethod/Journey.php b/Behavioral/TemplateMethod/Journey.php
similarity index 96%
rename from TemplateMethod/Journey.php
rename to Behavioral/TemplateMethod/Journey.php
index 54985d9..c891072 100644
--- a/TemplateMethod/Journey.php
+++ b/Behavioral/TemplateMethod/Journey.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\TemplateMethod;
+namespace DesignPatterns\Behavioral\TemplateMethod;
 
 /**
  *
diff --git a/TemplateMethod/README.md b/Behavioral/TemplateMethod/README.md
similarity index 100%
rename from TemplateMethod/README.md
rename to Behavioral/TemplateMethod/README.md
diff --git a/Tests/TemplateMethod/JourneyTest.php b/Behavioral/TemplateMethod/Tests/JourneyTest.php
similarity index 77%
rename from Tests/TemplateMethod/JourneyTest.php
rename to Behavioral/TemplateMethod/Tests/JourneyTest.php
index f592363..d0b134c 100644
--- a/Tests/TemplateMethod/JourneyTest.php
+++ b/Behavioral/TemplateMethod/Tests/JourneyTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Tests\TemplateMethod;
+namespace DesignPatterns\Behavioral\TemplateMethod\Tests;
 
-use DesignPatterns\TemplateMethod;
+use DesignPatterns\Behavioral\TemplateMethod;
 
 /**
  * JourneyTest tests all journeys
@@ -29,10 +29,10 @@ class JourneyTest extends \PHPUnit_Framework_TestCase
      */
     public function testLasVegas()
     {
-        $journey = $this->getMockForAbstractClass('DesignPatterns\TemplateMethod\Journey');
+        $journey = $this->getMockForAbstractClass('DesignPatterns\Behavioral\TemplateMethod\Journey');
         $journey->expects($this->once())
-                ->method('enjoyVacation')
-                ->will($this->returnCallback(array($this, 'mockUpVacation')));
+            ->method('enjoyVacation')
+            ->will($this->returnCallback(array($this, 'mockUpVacation')));
         $this->expectOutputRegex('#Las Vegas#');
         $journey->takeATrip();
     }
@@ -41,5 +41,4 @@ class JourneyTest extends \PHPUnit_Framework_TestCase
     {
         echo "Fear and loathing in Las Vegas\n";
     }
-
-}
\ No newline at end of file
+}
diff --git a/Visitor/Group.php b/Behavioral/Visitor/Group.php
similarity index 89%
rename from Visitor/Group.php
rename to Behavioral/Visitor/Group.php
index 5d47d6a..3990f9c 100644
--- a/Visitor/Group.php
+++ b/Behavioral/Visitor/Group.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Visitor;
+namespace DesignPatterns\Behavioral\Visitor;
 
 /**
  * An example of a Visitor: Group
diff --git a/Visitor/README.md b/Behavioral/Visitor/README.md
similarity index 100%
rename from Visitor/README.md
rename to Behavioral/Visitor/README.md
diff --git a/Visitor/Role.php b/Behavioral/Visitor/Role.php
similarity index 88%
rename from Visitor/Role.php
rename to Behavioral/Visitor/Role.php
index b4873ce..fd0d0a4 100644
--- a/Visitor/Role.php
+++ b/Behavioral/Visitor/Role.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Visitor;
+namespace DesignPatterns\Behavioral\Visitor;
 
 /**
  * class Role
@@ -12,7 +12,7 @@ abstract class Role
      *
      * Feel free to override it if your object must call another visiting behavior
      *
-     * @param \DesignPatterns\Visitor\RoleVisitorInterface $visitor
+     * @param \DesignPatterns\Behavioral\Visitor\RoleVisitorInterface $visitor
      *
      * @throws \InvalidArgumentException
      */
diff --git a/Visitor/RolePrintVisitor.php b/Behavioral/Visitor/RolePrintVisitor.php
similarity index 90%
rename from Visitor/RolePrintVisitor.php
rename to Behavioral/Visitor/RolePrintVisitor.php
index 40d447f..5f07d5c 100644
--- a/Visitor/RolePrintVisitor.php
+++ b/Behavioral/Visitor/RolePrintVisitor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Visitor;
+namespace DesignPatterns\Behavioral\Visitor;
 
 /**
  * Visitor Pattern
diff --git a/Visitor/RoleVisitorInterface.php b/Behavioral/Visitor/RoleVisitorInterface.php
similarity index 77%
rename from Visitor/RoleVisitorInterface.php
rename to Behavioral/Visitor/RoleVisitorInterface.php
index 8c1852a..3c9e24a 100644
--- a/Visitor/RoleVisitorInterface.php
+++ b/Behavioral/Visitor/RoleVisitorInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Visitor;
+namespace DesignPatterns\Behavioral\Visitor;
 
 /**
  * Visitor Pattern
@@ -18,14 +18,14 @@ interface RoleVisitorInterface
     /**
      * Visit a User object
      * 
-     * @param \DesignPatterns\Visitor\User $role
+     * @param \DesignPatterns\Behavioral\Visitor\User $role
      */
     public function visitUser(User $role);
 
     /**
      * Visit a Group object
      * 
-     * @param \DesignPatterns\Visitor\Group $role
+     * @param \DesignPatterns\Behavioral\Visitor\Group $role
      */
     public function visitGroup(Group $role);
 }
diff --git a/Tests/Visitor/VisitorTest.php b/Behavioral/Visitor/Tests/VisitorTest.php
similarity index 83%
rename from Tests/Visitor/VisitorTest.php
rename to Behavioral/Visitor/Tests/VisitorTest.php
index c7b911e..6d71658 100644
--- a/Tests/Visitor/VisitorTest.php
+++ b/Behavioral/Visitor/Tests/VisitorTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Tests\Visitor;
+namespace DesignPatterns\Tests\Visitor\Tests;
 
-use DesignPatterns\Visitor;
+use DesignPatterns\Behavioral\Visitor;
 
 /**
  * VisitorTest tests the visitor pattern
@@ -40,8 +40,7 @@ class VisitorTest extends \PHPUnit_Framework_TestCase
      */
     public function testUnknownObject()
     {
-        $mock = $this->getMockForAbstractClass('DesignPatterns\Visitor\Role');
+        $mock = $this->getMockForAbstractClass('DesignPatterns\Behavioral\Visitor\Role');
         $mock->accept($this->visitor);
     }
-
-}
\ No newline at end of file
+}
diff --git a/Visitor/User.php b/Behavioral/Visitor/User.php
similarity index 90%
rename from Visitor/User.php
rename to Behavioral/Visitor/User.php
index f9291fa..e0cc4c7 100644
--- a/Visitor/User.php
+++ b/Behavioral/Visitor/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Visitor;
+namespace DesignPatterns\Behavioral\Visitor;
 
 /**
  * Visitor Pattern
diff --git a/Builder/Parts/Door.php b/Builder/Parts/Door.php
deleted file mode 100644
index ccad7ac..0000000
--- a/Builder/Parts/Door.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace DesignPatterns\Builder\Parts;
-
-/**
- * Class Door
- */
-class Door
-{
-
-}
diff --git a/Builder/Parts/Engine.php b/Builder/Parts/Engine.php
deleted file mode 100644
index 20410b1..0000000
--- a/Builder/Parts/Engine.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace DesignPatterns\Builder\Parts;
-
-/**
- * Class Engine
- */
-class Engine
-{
-
-}
diff --git a/Builder/Parts/Wheel.php b/Builder/Parts/Wheel.php
deleted file mode 100644
index 71337e4..0000000
--- a/Builder/Parts/Wheel.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace DesignPatterns\Builder\Parts;
-
-/**
- * Class Wheel
- */
-class Wheel
-{
-
-}
diff --git a/AbstractFactory/AbstractFactory.php b/Creational/AbstractFactory/AbstractFactory.php
similarity index 94%
rename from AbstractFactory/AbstractFactory.php
rename to Creational/AbstractFactory/AbstractFactory.php
index 481e14e..84b4203 100644
--- a/AbstractFactory/AbstractFactory.php
+++ b/Creational/AbstractFactory/AbstractFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\AbstractFactory;
+namespace DesignPatterns\Creational\AbstractFactory;
 
 /**
  * class AbstractFactory
diff --git a/AbstractFactory/Html/Picture.php b/Creational/AbstractFactory/Html/Picture.php
similarity index 72%
rename from AbstractFactory/Html/Picture.php
rename to Creational/AbstractFactory/Html/Picture.php
index 843f216..9d7f440 100644
--- a/AbstractFactory/Html/Picture.php
+++ b/Creational/AbstractFactory/Html/Picture.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\AbstractFactory\Html;
+namespace DesignPatterns\Creational\AbstractFactory\Html;
 
-use DesignPatterns\AbstractFactory\Picture as BasePicture;
+use DesignPatterns\Creational\AbstractFactory\Picture as BasePicture;
 
 /**
  * Class Picture
diff --git a/AbstractFactory/Html/Text.php b/Creational/AbstractFactory/Html/Text.php
similarity index 71%
rename from AbstractFactory/Html/Text.php
rename to Creational/AbstractFactory/Html/Text.php
index 8ea6d4f..120c043 100644
--- a/AbstractFactory/Html/Text.php
+++ b/Creational/AbstractFactory/Html/Text.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\AbstractFactory\Html;
+namespace DesignPatterns\Creational\AbstractFactory\Html;
 
-use DesignPatterns\AbstractFactory\Text as BaseText;
+use DesignPatterns\Creational\AbstractFactory\Text as BaseText;
 
 /**
  * Class Text
diff --git a/AbstractFactory/HtmlFactory.php b/Creational/AbstractFactory/HtmlFactory.php
similarity index 92%
rename from AbstractFactory/HtmlFactory.php
rename to Creational/AbstractFactory/HtmlFactory.php
index 3606374..7982a24 100644
--- a/AbstractFactory/HtmlFactory.php
+++ b/Creational/AbstractFactory/HtmlFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\AbstractFactory;
+namespace DesignPatterns\Creational\AbstractFactory;
 
 /**
  * Class HtmlFactory
diff --git a/AbstractFactory/Json/Picture.php b/Creational/AbstractFactory/Json/Picture.php
similarity index 72%
rename from AbstractFactory/Json/Picture.php
rename to Creational/AbstractFactory/Json/Picture.php
index 4684191..13d191b 100644
--- a/AbstractFactory/Json/Picture.php
+++ b/Creational/AbstractFactory/Json/Picture.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\AbstractFactory\Json;
+namespace DesignPatterns\Creational\AbstractFactory\Json;
 
-use DesignPatterns\AbstractFactory\Picture as BasePicture;
+use DesignPatterns\Creational\AbstractFactory\Picture as BasePicture;
 
 /**
  * Class Picture
diff --git a/AbstractFactory/Json/Text.php b/Creational/AbstractFactory/Json/Text.php
similarity index 71%
rename from AbstractFactory/Json/Text.php
rename to Creational/AbstractFactory/Json/Text.php
index 83d0877..699fff3 100644
--- a/AbstractFactory/Json/Text.php
+++ b/Creational/AbstractFactory/Json/Text.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\AbstractFactory\Json;
+namespace DesignPatterns\Creational\AbstractFactory\Json;
 
-use DesignPatterns\AbstractFactory\Text as BaseText;
+use DesignPatterns\Creational\AbstractFactory\Text as BaseText;
 
 /**
  * Class Text
diff --git a/AbstractFactory/JsonFactory.php b/Creational/AbstractFactory/JsonFactory.php
similarity index 92%
rename from AbstractFactory/JsonFactory.php
rename to Creational/AbstractFactory/JsonFactory.php
index 6cf15d2..ab2bb6f 100644
--- a/AbstractFactory/JsonFactory.php
+++ b/Creational/AbstractFactory/JsonFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\AbstractFactory;
+namespace DesignPatterns\Creational\AbstractFactory;
 
 /**
  * Class JsonFactory
diff --git a/AbstractFactory/MediaInterface.php b/Creational/AbstractFactory/MediaInterface.php
similarity index 86%
rename from AbstractFactory/MediaInterface.php
rename to Creational/AbstractFactory/MediaInterface.php
index 92d0089..6bb5d3a 100644
--- a/AbstractFactory/MediaInterface.php
+++ b/Creational/AbstractFactory/MediaInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\AbstractFactory;
+namespace DesignPatterns\Creational\AbstractFactory;
 
 /**
  * Interface MediaInterface
diff --git a/AbstractFactory/Picture.php b/Creational/AbstractFactory/Picture.php
similarity index 88%
rename from AbstractFactory/Picture.php
rename to Creational/AbstractFactory/Picture.php
index 264bfb6..8a4f720 100644
--- a/AbstractFactory/Picture.php
+++ b/Creational/AbstractFactory/Picture.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\AbstractFactory;
+namespace DesignPatterns\Creational\AbstractFactory;
 
 /**
  * Class Picture
diff --git a/AbstractFactory/README.md b/Creational/AbstractFactory/README.md
similarity index 100%
rename from AbstractFactory/README.md
rename to Creational/AbstractFactory/README.md
diff --git a/Tests/AbstractFactory/AbstractFactoryTest.php b/Creational/AbstractFactory/Tests/AbstractFactoryTest.php
similarity index 74%
rename from Tests/AbstractFactory/AbstractFactoryTest.php
rename to Creational/AbstractFactory/Tests/AbstractFactoryTest.php
index 581c068..9c61f96 100644
--- a/Tests/AbstractFactory/AbstractFactoryTest.php
+++ b/Creational/AbstractFactory/Tests/AbstractFactoryTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace DesignPatterns\Tests\AbstractFactory;
+namespace DesignPatterns\Creational\AbstractFactory\Tests;
 
-use DesignPatterns\AbstractFactory\AbstractFactory;
-use DesignPatterns\AbstractFactory\HtmlFactory;
-use DesignPatterns\AbstractFactory\JsonFactory;
+use DesignPatterns\Creational\AbstractFactory\AbstractFactory;
+use DesignPatterns\Creational\AbstractFactory\HtmlFactory;
+use DesignPatterns\Creational\AbstractFactory\JsonFactory;
 
 /**
  * AbstractFactoryTest tests concrete factories
@@ -34,7 +34,7 @@ class AbstractFactoryTest extends \PHPUnit_Framework_TestCase
             $factory->createText('footnotes')
         );
 
-        $this->assertContainsOnly('DesignPatterns\AbstractFactory\MediaInterface', $article);
+        $this->assertContainsOnly('DesignPatterns\Creational\AbstractFactory\MediaInterface', $article);
 
         /* this is the time to look at the Builder pattern. This pattern
          * helps you to create complex object like that article above with
diff --git a/AbstractFactory/Text.php b/Creational/AbstractFactory/Text.php
similarity index 83%
rename from AbstractFactory/Text.php
rename to Creational/AbstractFactory/Text.php
index 248f5c6..5d2da89 100644
--- a/AbstractFactory/Text.php
+++ b/Creational/AbstractFactory/Text.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\AbstractFactory;
+namespace DesignPatterns\Creational\AbstractFactory;
 
 /**
  * Class Text
diff --git a/Builder/BikeBuilder.php b/Creational/Builder/BikeBuilder.php
similarity index 94%
rename from Builder/BikeBuilder.php
rename to Creational/Builder/BikeBuilder.php
index a6f1a30..477e1ad 100644
--- a/Builder/BikeBuilder.php
+++ b/Creational/Builder/BikeBuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Builder;
+namespace DesignPatterns\Creational\Builder;
 
 /**
  * BikeBuilder builds bike
diff --git a/Builder/BuilderInterface.php b/Creational/Builder/BuilderInterface.php
similarity index 90%
rename from Builder/BuilderInterface.php
rename to Creational/Builder/BuilderInterface.php
index 89b4b8f..f682656 100644
--- a/Builder/BuilderInterface.php
+++ b/Creational/Builder/BuilderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Builder;
+namespace DesignPatterns\Creational\Builder;
 
 /**
  *
diff --git a/Builder/CarBuilder.php b/Creational/Builder/CarBuilder.php
similarity index 95%
rename from Builder/CarBuilder.php
rename to Creational/Builder/CarBuilder.php
index b89ee20..7725176 100644
--- a/Builder/CarBuilder.php
+++ b/Creational/Builder/CarBuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Builder;
+namespace DesignPatterns\Creational\Builder;
 
 /**
  * CarBuilder builds car
diff --git a/Builder/Director.php b/Creational/Builder/Director.php
similarity index 93%
rename from Builder/Director.php
rename to Creational/Builder/Director.php
index 99317f5..0c11877 100644
--- a/Builder/Director.php
+++ b/Creational/Builder/Director.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Builder;
+namespace DesignPatterns\Creational\Builder;
 
 /**
  * Director is part of the builder pattern. It knows the interface of the builder
diff --git a/Builder/Parts/Bike.php b/Creational/Builder/Parts/Bike.php
similarity index 56%
rename from Builder/Parts/Bike.php
rename to Creational/Builder/Parts/Bike.php
index 6ffa4e2..307b3e0 100644
--- a/Builder/Parts/Bike.php
+++ b/Creational/Builder/Parts/Bike.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Builder\Parts;
+namespace DesignPatterns\Creational\Builder\Parts;
 
 /**
  * Bike is a bike
diff --git a/Builder/Parts/Car.php b/Creational/Builder/Parts/Car.php
similarity index 55%
rename from Builder/Parts/Car.php
rename to Creational/Builder/Parts/Car.php
index e3bc455..a18b301 100644
--- a/Builder/Parts/Car.php
+++ b/Creational/Builder/Parts/Car.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Builder\Parts;
+namespace DesignPatterns\Creational\Builder\Parts;
 
 /**
  * Car is a car
diff --git a/Creational/Builder/Parts/Door.php b/Creational/Builder/Parts/Door.php
new file mode 100644
index 0000000..aa08772
--- /dev/null
+++ b/Creational/Builder/Parts/Door.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace DesignPatterns\Creational\Builder\Parts;
+
+/**
+ * Class Door
+ */
+class Door
+{
+
+}
diff --git a/Creational/Builder/Parts/Engine.php b/Creational/Builder/Parts/Engine.php
new file mode 100644
index 0000000..08d5bd0
--- /dev/null
+++ b/Creational/Builder/Parts/Engine.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace DesignPatterns\Creational\Builder\Parts;
+
+/**
+ * Class Engine
+ */
+class Engine
+{
+
+}
diff --git a/Builder/Parts/README.md b/Creational/Builder/Parts/README.md
similarity index 100%
rename from Builder/Parts/README.md
rename to Creational/Builder/Parts/README.md
diff --git a/Builder/Parts/Vehicle.php b/Creational/Builder/Parts/Vehicle.php
similarity index 85%
rename from Builder/Parts/Vehicle.php
rename to Creational/Builder/Parts/Vehicle.php
index 88f266f..492eade 100644
--- a/Builder/Parts/Vehicle.php
+++ b/Creational/Builder/Parts/Vehicle.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Builder\Parts;
+namespace DesignPatterns\Creational\Builder\Parts;
 
 /**
  * VehicleInterface is a contract for a vehicle
diff --git a/Creational/Builder/Parts/Wheel.php b/Creational/Builder/Parts/Wheel.php
new file mode 100644
index 0000000..19ef7c3
--- /dev/null
+++ b/Creational/Builder/Parts/Wheel.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace DesignPatterns\Creational\Builder\Parts;
+
+/**
+ * Class Wheel
+ */
+class Wheel
+{
+
+}
diff --git a/Builder/README.md b/Creational/Builder/README.md
similarity index 100%
rename from Builder/README.md
rename to Creational/Builder/README.md
diff --git a/Tests/Builder/DirectorTest.php b/Creational/Builder/Tests/DirectorTest.php
similarity index 65%
rename from Tests/Builder/DirectorTest.php
rename to Creational/Builder/Tests/DirectorTest.php
index 2f26248..90cdb39 100644
--- a/Tests/Builder/DirectorTest.php
+++ b/Creational/Builder/Tests/DirectorTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace DesignPatterns\Tests\Builder;
+namespace DesignPatterns\Creational\Builder\Tests;
 
-use DesignPatterns\Builder\Director;
-use DesignPatterns\Builder\CarBuilder;
-use DesignPatterns\Builder\BikeBuilder;
-use DesignPatterns\Builder\BuilderInterface;
+use DesignPatterns\Creational\Builder\Director;
+use DesignPatterns\Creational\Builder\CarBuilder;
+use DesignPatterns\Creational\Builder\BikeBuilder;
+use DesignPatterns\Creational\Builder\BuilderInterface;
 
 /**
  * DirectorTest tests the builder pattern
@@ -37,6 +37,6 @@ class DirectorTest extends \PHPUnit_Framework_TestCase
     public function testBuild(BuilderInterface $builder)
     {
         $newVehicle = $this->director->build($builder);
-        $this->assertInstanceOf('DesignPatterns\Builder\Parts\Vehicle', $newVehicle);
+        $this->assertInstanceOf('DesignPatterns\Creational\Builder\Parts\Vehicle', $newVehicle);
     }
 }
diff --git a/FactoryMethod/Bicycle.php b/Creational/FactoryMethod/Bicycle.php
similarity index 85%
rename from FactoryMethod/Bicycle.php
rename to Creational/FactoryMethod/Bicycle.php
index 76b4a53..01fa8a0 100644
--- a/FactoryMethod/Bicycle.php
+++ b/Creational/FactoryMethod/Bicycle.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\FactoryMethod;
+namespace DesignPatterns\Creational\FactoryMethod;
 
 /**
  * Bicycle is a bicycle
diff --git a/FactoryMethod/FactoryMethod.php b/Creational/FactoryMethod/FactoryMethod.php
similarity index 93%
rename from FactoryMethod/FactoryMethod.php
rename to Creational/FactoryMethod/FactoryMethod.php
index 677e6a6..e4f3771 100644
--- a/FactoryMethod/FactoryMethod.php
+++ b/Creational/FactoryMethod/FactoryMethod.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\FactoryMethod;
+namespace DesignPatterns\Creational\FactoryMethod;
 
 /**
  * class FactoryMethod
diff --git a/FactoryMethod/Ferrari.php b/Creational/FactoryMethod/Ferrari.php
similarity index 83%
rename from FactoryMethod/Ferrari.php
rename to Creational/FactoryMethod/Ferrari.php
index f221e42..c905f91 100644
--- a/FactoryMethod/Ferrari.php
+++ b/Creational/FactoryMethod/Ferrari.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\FactoryMethod;
+namespace DesignPatterns\Creational\FactoryMethod;
 
 /**
  * Ferrari is a italian car
diff --git a/FactoryMethod/GermanFactory.php b/Creational/FactoryMethod/GermanFactory.php
similarity index 93%
rename from FactoryMethod/GermanFactory.php
rename to Creational/FactoryMethod/GermanFactory.php
index 36e7f04..67306e9 100644
--- a/FactoryMethod/GermanFactory.php
+++ b/Creational/FactoryMethod/GermanFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\FactoryMethod;
+namespace DesignPatterns\Creational\FactoryMethod;
 
 /**
  * GermanFactory is a vehicle factory in Germany
diff --git a/FactoryMethod/ItalianFactory.php b/Creational/FactoryMethod/ItalianFactory.php
similarity index 91%
rename from FactoryMethod/ItalianFactory.php
rename to Creational/FactoryMethod/ItalianFactory.php
index 17a1233..c7010e0 100644
--- a/FactoryMethod/ItalianFactory.php
+++ b/Creational/FactoryMethod/ItalianFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\FactoryMethod;
+namespace DesignPatterns\Creational\FactoryMethod;
 
 /**
  * ItalianFactory is vehicle factory in Italy
diff --git a/FactoryMethod/Porsche.php b/Creational/FactoryMethod/Porsche.php
similarity index 89%
rename from FactoryMethod/Porsche.php
rename to Creational/FactoryMethod/Porsche.php
index f4824fe..818a082 100644
--- a/FactoryMethod/Porsche.php
+++ b/Creational/FactoryMethod/Porsche.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\FactoryMethod;
+namespace DesignPatterns\Creational\FactoryMethod;
 
 /**
  * Porsche is a german car
diff --git a/FactoryMethod/README.md b/Creational/FactoryMethod/README.md
similarity index 100%
rename from FactoryMethod/README.md
rename to Creational/FactoryMethod/README.md
diff --git a/Tests/FactoryMethod/FactoryMethodTest.php b/Creational/FactoryMethod/Tests/FactoryMethodTest.php
similarity index 74%
rename from Tests/FactoryMethod/FactoryMethodTest.php
rename to Creational/FactoryMethod/Tests/FactoryMethodTest.php
index 0796a98..acbe0c6 100644
--- a/Tests/FactoryMethod/FactoryMethodTest.php
+++ b/Creational/FactoryMethod/Tests/FactoryMethodTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace DesignPatterns\Tests\FactoryMethod;
+namespace DesignPatterns\Creational\FactoryMethod\Tests;
 
-use DesignPatterns\FactoryMethod\FactoryMethod;
-use DesignPatterns\FactoryMethod\GermanFactory;
-use DesignPatterns\FactoryMethod\ItalianFactory;
+use DesignPatterns\Creational\FactoryMethod\FactoryMethod;
+use DesignPatterns\Creational\FactoryMethod\GermanFactory;
+use DesignPatterns\Creational\FactoryMethod\ItalianFactory;
 
 /**
  * FactoryMethodTest tests the factory method pattern
@@ -34,7 +34,7 @@ class FactoryMethodTest extends \PHPUnit_Framework_TestCase
         // about the factory, all we know is it can produce vehicle
         foreach ($this->type as $oneType) {
             $vehicle = $shop->create($oneType);
-            $this->assertInstanceOf('DesignPatterns\FactoryMethod\VehicleInterface', $vehicle);
+            $this->assertInstanceOf('DesignPatterns\Creational\FactoryMethod\VehicleInterface', $vehicle);
         }
     }
 
diff --git a/FactoryMethod/VehicleInterface.php b/Creational/FactoryMethod/VehicleInterface.php
similarity index 80%
rename from FactoryMethod/VehicleInterface.php
rename to Creational/FactoryMethod/VehicleInterface.php
index 5f6d756..a734b61 100644
--- a/FactoryMethod/VehicleInterface.php
+++ b/Creational/FactoryMethod/VehicleInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\FactoryMethod;
+namespace DesignPatterns\Creational\FactoryMethod;
 
 /**
  * VehicleInterface is a contract for a vehicle
diff --git a/Multiton/Multiton.php b/Creational/Multiton/Multiton.php
similarity index 96%
rename from Multiton/Multiton.php
rename to Creational/Multiton/Multiton.php
index cacc79b..e10c513 100644
--- a/Multiton/Multiton.php
+++ b/Creational/Multiton/Multiton.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns;
+namespace DesignPatterns\Creational\Multiton;
 
 /**
  * class Multiton
diff --git a/Multiton/README.md b/Creational/Multiton/README.md
similarity index 100%
rename from Multiton/README.md
rename to Creational/Multiton/README.md
diff --git a/Pool/Pool.php b/Creational/Pool/Pool.php
similarity index 91%
rename from Pool/Pool.php
rename to Creational/Pool/Pool.php
index 32de053..e3a809b 100644
--- a/Pool/Pool.php
+++ b/Creational/Pool/Pool.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace DesignPatterns\Pool;
+namespace DesignPatterns\Creational\Pool;
 
 class Pool
 {
 
     private $instances = array();
     private $class;
-    
+
     public function __construct($class)
     {
         $this->class = $class;
@@ -26,5 +26,4 @@ class Pool
     {
         $this->instances[] = $instance;
     }
-
 }
diff --git a/Pool/Processor.php b/Creational/Pool/Processor.php
similarity index 96%
rename from Pool/Processor.php
rename to Creational/Pool/Processor.php
index eabd51d..0bb5e67 100644
--- a/Pool/Processor.php
+++ b/Creational/Pool/Processor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Pool;
+namespace DesignPatterns\Creational\Pool;
 
 class Processor
 {
@@ -49,5 +49,4 @@ class Processor
     {
         return array_pop($this->waitingQueue);
     }
-
 }
diff --git a/Pool/README.md b/Creational/Pool/README.md
similarity index 100%
rename from Pool/README.md
rename to Creational/Pool/README.md
diff --git a/Tests/Pool/PoolTest.php b/Creational/Pool/Tests/PoolTest.php
similarity index 70%
rename from Tests/Pool/PoolTest.php
rename to Creational/Pool/Tests/PoolTest.php
index 0b86c5b..91fde01 100644
--- a/Tests/Pool/PoolTest.php
+++ b/Creational/Pool/Tests/PoolTest.php
@@ -1,14 +1,13 @@
 <?php
 
-namespace DesignPatterns\Tests\Pool;
+namespace DesignPatterns\Creational\Pool\Tests;
 
-use DesignPatterns\Pool\Pool;
+use DesignPatterns\Creational\Pool\Pool;
 
 class TestWorker
 {
 
     public $id = 1;
-
 }
 
 class PoolTest extends \PHPUnit_Framework_TestCase
@@ -16,7 +15,7 @@ class PoolTest extends \PHPUnit_Framework_TestCase
 
     public function testPool()
     {
-        $pool = new Pool('DesignPatterns\Tests\Pool\TestWorker');
+        $pool = new Pool('DesignPatterns\Creational\Pool\Tests\TestWorker');
         $worker = $pool->get();
 
         $this->assertEquals(1, $worker->id);
@@ -27,6 +26,4 @@ class PoolTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(5, $pool->get()->id);
         $this->assertEquals(1, $pool->get()->id);
     }
-
 }
-
diff --git a/Pool/Worker.php b/Creational/Pool/Worker.php
similarity index 89%
rename from Pool/Worker.php
rename to Creational/Pool/Worker.php
index 4d34a0d..acdc1ba 100644
--- a/Pool/Worker.php
+++ b/Creational/Pool/Worker.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Pool;
+namespace DesignPatterns\Creational\Pool;
 
 class Worker
 {
@@ -17,5 +17,4 @@ class Worker
         // and when it's done, execute callback
         call_user_func($callback, $this);
     }
-
 }
diff --git a/Prototype/BarBookPrototype.php b/Creational/Prototype/BarBookPrototype.php
similarity index 83%
rename from Prototype/BarBookPrototype.php
rename to Creational/Prototype/BarBookPrototype.php
index c254496..971d00e 100644
--- a/Prototype/BarBookPrototype.php
+++ b/Creational/Prototype/BarBookPrototype.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Prototype;
+namespace DesignPatterns\Creational\Prototype;
 
 /**
  * Class BarBookPrototype
diff --git a/Prototype/BookPrototype.php b/Creational/Prototype/BookPrototype.php
similarity index 91%
rename from Prototype/BookPrototype.php
rename to Creational/Prototype/BookPrototype.php
index 79ddf36..18d4871 100644
--- a/Prototype/BookPrototype.php
+++ b/Creational/Prototype/BookPrototype.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Prototype;
+namespace DesignPatterns\Creational\Prototype;
 
 /**
  * class BookPrototype
diff --git a/Prototype/FooBookPrototype.php b/Creational/Prototype/FooBookPrototype.php
similarity index 81%
rename from Prototype/FooBookPrototype.php
rename to Creational/Prototype/FooBookPrototype.php
index ed2f250..9eb19d3 100644
--- a/Prototype/FooBookPrototype.php
+++ b/Creational/Prototype/FooBookPrototype.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Prototype;
+namespace DesignPatterns\Creational\Prototype;
 
 /**
  * Class FooBookPrototype
diff --git a/Prototype/README.md b/Creational/Prototype/README.md
similarity index 100%
rename from Prototype/README.md
rename to Creational/Prototype/README.md
diff --git a/Prototype/index.php b/Creational/Prototype/index.php
similarity index 88%
rename from Prototype/index.php
rename to Creational/Prototype/index.php
index 84f813d..f268e5c 100644
--- a/Prototype/index.php
+++ b/Creational/Prototype/index.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Prototype;
+namespace DesignPatterns\Creational\Prototype;
 
 $fooPrototype = new FooBookPrototype();
 $barPrototype = new BarBookPrototype();
diff --git a/Creational/README.md b/Creational/README.md
new file mode 100644
index 0000000..a201713
--- /dev/null
+++ b/Creational/README.md
@@ -0,0 +1,17 @@
+# Creational
+
+In software engineering, creational design patterns are design patterns that
+deal with object creation mechanisms, trying to create objects in a manner
+suitable to the situation. The basic form of object creation could result in
+design problems or added complexity to the design. Creational design patterns
+solve this problem by somehow controlling this object creation.
+
+* [AbstractFactory](AbstractFactory) [:notebook:](http://en.wikipedia.org/wiki/Abstract_factory_pattern)
+* [Builder](Builder) [:notebook:](http://en.wikipedia.org/wiki/Builder_pattern)
+* [FactoryMethod](FactoryMethod) [:notebook:](http://en.wikipedia.org/wiki/Factory_method_pattern)
+* [Multiton](Multiton) (is considered an anti-pattern! :no_entry:)
+* [Pool](Pool) [:notebook:](http://en.wikipedia.org/wiki/Object_pool_pattern)
+* [Prototype](Prototype) [:notebook:](http://en.wikipedia.org/wiki/Prototype_pattern)
+* [SimpleFactory](SimpleFactory)
+* [Singleton](Singleton) [:notebook:](http://en.wikipedia.org/wiki/Singleton_pattern) (is considered an anti-pattern! :no_entry:)
+* [StaticFactory](StaticFactory)
diff --git a/SimpleFactory/Bicycle.php b/Creational/SimpleFactory/Bicycle.php
similarity index 81%
rename from SimpleFactory/Bicycle.php
rename to Creational/SimpleFactory/Bicycle.php
index fbe605d..75cb413 100644
--- a/SimpleFactory/Bicycle.php
+++ b/Creational/SimpleFactory/Bicycle.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\SimpleFactory;
+namespace DesignPatterns\Creational\SimpleFactory;
 
 /**
  * Bicycle is a bicycle
diff --git a/SimpleFactory/ConcreteFactory.php b/Creational/SimpleFactory/ConcreteFactory.php
similarity index 94%
rename from SimpleFactory/ConcreteFactory.php
rename to Creational/SimpleFactory/ConcreteFactory.php
index fba685f..177290c 100644
--- a/SimpleFactory/ConcreteFactory.php
+++ b/Creational/SimpleFactory/ConcreteFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\SimpleFactory;
+namespace DesignPatterns\Creational\SimpleFactory;
 
 /**
  * class ConcreteFactory
diff --git a/SimpleFactory/README.md b/Creational/SimpleFactory/README.md
similarity index 100%
rename from SimpleFactory/README.md
rename to Creational/SimpleFactory/README.md
diff --git a/SimpleFactory/Scooter.php b/Creational/SimpleFactory/Scooter.php
similarity index 78%
rename from SimpleFactory/Scooter.php
rename to Creational/SimpleFactory/Scooter.php
index 2e386b7..710c8cd 100644
--- a/SimpleFactory/Scooter.php
+++ b/Creational/SimpleFactory/Scooter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\SimpleFactory;
+namespace DesignPatterns\Creational\SimpleFactory;
 
 /**
  * Scooter is a Scooter
diff --git a/Tests/SimpleFactory/SimpleFactoryTest.php b/Creational/SimpleFactory/Tests/SimpleFactoryTest.php
similarity index 76%
rename from Tests/SimpleFactory/SimpleFactoryTest.php
rename to Creational/SimpleFactory/Tests/SimpleFactoryTest.php
index 48c949c..1fffda3 100644
--- a/Tests/SimpleFactory/SimpleFactoryTest.php
+++ b/Creational/SimpleFactory/Tests/SimpleFactoryTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Tests\SimpleFactory;
+namespace DesignPatterns\Creational\SimpleFactory\Tests;
 
-use DesignPatterns\SimpleFactory\ConcreteFactory;
+use DesignPatterns\Creational\SimpleFactory\ConcreteFactory;
 
 /**
  * SimpleFactoryTest tests the Simple Factory pattern
@@ -31,7 +31,7 @@ class SimpleFactoryTest extends \PHPUnit_Framework_TestCase
     public function testCreation($type)
     {
         $obj = $this->factory->createVehicle($type);
-        $this->assertInstanceOf('DesignPatterns\SimpleFactory\VehicleInterface', $obj);
+        $this->assertInstanceOf('DesignPatterns\Creational\SimpleFactory\VehicleInterface', $obj);
     }
 
     /**
@@ -41,5 +41,4 @@ class SimpleFactoryTest extends \PHPUnit_Framework_TestCase
     {
         $this->factory->createVehicle('car');
     }
-
-}
\ No newline at end of file
+}
diff --git a/SimpleFactory/VehicleInterface.php b/Creational/SimpleFactory/VehicleInterface.php
similarity index 80%
rename from SimpleFactory/VehicleInterface.php
rename to Creational/SimpleFactory/VehicleInterface.php
index 66dc3fd..eb13a66 100644
--- a/SimpleFactory/VehicleInterface.php
+++ b/Creational/SimpleFactory/VehicleInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\SimpleFactory;
+namespace DesignPatterns\Creational\SimpleFactory;
 
 /**
  * VehicleInterface is a contract for a vehicle
diff --git a/Singleton/README.md b/Creational/Singleton/README.md
similarity index 100%
rename from Singleton/README.md
rename to Creational/Singleton/README.md
diff --git a/Singleton/Singleton.php b/Creational/Singleton/Singleton.php
similarity index 88%
rename from Singleton/Singleton.php
rename to Creational/Singleton/Singleton.php
index 0aee908..00f0440 100644
--- a/Singleton/Singleton.php
+++ b/Creational/Singleton/Singleton.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Singleton;
+namespace DesignPatterns\Creational\Singleton;
 
 /**
  * class Singleton
@@ -8,7 +8,7 @@ namespace DesignPatterns\Singleton;
 class Singleton
 {
     /**
-     * @var cached reference to singleton instance 
+     * @var Singleton reference to singleton instance
      */
     private static $instance;
     
diff --git a/Tests/Singleton/SingletonTest.php b/Creational/Singleton/Tests/SingletonTest.php
similarity index 73%
rename from Tests/Singleton/SingletonTest.php
rename to Creational/Singleton/Tests/SingletonTest.php
index 8d1405e..07abf7c 100644
--- a/Tests/Singleton/SingletonTest.php
+++ b/Creational/Singleton/Tests/SingletonTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Tests\Singleton;
+namespace DesignPatterns\Creational\Singleton\Tests;
 
-use DesignPatterns\Singleton\Singleton;
+use DesignPatterns\Creational\Singleton\Singleton;
 
 /**
  * SingletonTest tests the singleton pattern
@@ -13,7 +13,7 @@ class SingletonTest extends \PHPUnit_Framework_TestCase
     public function testUniqueness()
     {
         $firstCall = Singleton::getInstance();
-        $this->assertInstanceOf('DesignPatterns\Singleton\Singleton', $firstCall);
+        $this->assertInstanceOf('DesignPatterns\Creational\Singleton\Singleton', $firstCall);
         $secondCall = Singleton::getInstance();
         $this->assertSame($firstCall, $secondCall);
     }
diff --git a/StaticFactory/FormatNumber.php b/Creational/StaticFactory/FormatNumber.php
similarity index 64%
rename from StaticFactory/FormatNumber.php
rename to Creational/StaticFactory/FormatNumber.php
index 8b20db2..93ac7c7 100644
--- a/StaticFactory/FormatNumber.php
+++ b/Creational/StaticFactory/FormatNumber.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\StaticFactory;
+namespace DesignPatterns\Creational\StaticFactory;
 
 /**
  * Class FormatNumber
diff --git a/StaticFactory/FormatString.php b/Creational/StaticFactory/FormatString.php
similarity index 64%
rename from StaticFactory/FormatString.php
rename to Creational/StaticFactory/FormatString.php
index 9f48fde..6578b68 100644
--- a/StaticFactory/FormatString.php
+++ b/Creational/StaticFactory/FormatString.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\StaticFactory;
+namespace DesignPatterns\Creational\StaticFactory;
 
 /**
  * Class FormatString
diff --git a/StaticFactory/FormatterInterface.php b/Creational/StaticFactory/FormatterInterface.php
similarity index 60%
rename from StaticFactory/FormatterInterface.php
rename to Creational/StaticFactory/FormatterInterface.php
index b5220cd..969f047 100644
--- a/StaticFactory/FormatterInterface.php
+++ b/Creational/StaticFactory/FormatterInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\StaticFactory;
+namespace DesignPatterns\Creational\StaticFactory;
 
 /**
  * Class FormatterInterface
diff --git a/StaticFactory/README.md b/Creational/StaticFactory/README.md
similarity index 100%
rename from StaticFactory/README.md
rename to Creational/StaticFactory/README.md
diff --git a/StaticFactory/StaticFactory.php b/Creational/StaticFactory/StaticFactory.php
similarity index 92%
rename from StaticFactory/StaticFactory.php
rename to Creational/StaticFactory/StaticFactory.php
index 2010416..e4f2f96 100644
--- a/StaticFactory/StaticFactory.php
+++ b/Creational/StaticFactory/StaticFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\StaticFactory;
+namespace DesignPatterns\Creational\StaticFactory;
 
 /**
  * Note1: Remember, static => global => evil
diff --git a/Tests/StaticFactory/StaticFactoryTest.php b/Creational/StaticFactory/Tests/StaticFactoryTest.php
similarity index 65%
rename from Tests/StaticFactory/StaticFactoryTest.php
rename to Creational/StaticFactory/Tests/StaticFactoryTest.php
index d85f266..e8bb7a5 100644
--- a/Tests/StaticFactory/StaticFactoryTest.php
+++ b/Creational/StaticFactory/Tests/StaticFactoryTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Tests\StaticFactory;
+namespace DesignPatterns\Creational\StaticFactory\Tests;
 
-use DesignPatterns\StaticFactory\StaticFactory;
+use DesignPatterns\Creational\StaticFactory\StaticFactory;
 
 /**
  * Tests for Static Factory pattern
@@ -25,6 +25,6 @@ class StaticFactoryTest extends \PHPUnit_Framework_TestCase
     public function testCreation($type)
     {
         $obj = StaticFactory::factory($type);
-        $this->assertInstanceOf('DesignPatterns\StaticFactory\FormatterInterface', $obj);
+        $this->assertInstanceOf('DesignPatterns\Creational\StaticFactory\FormatterInterface', $obj);
     }
 }
diff --git a/Iterator/File.php b/Iterator/File.php
deleted file mode 100644
index e2e6a3d..0000000
--- a/Iterator/File.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace DesignPatterns\Iterator;
-
-/**
- * class File
- *
- * THIS EXAMPLE ALSO APPLIES THE COMPOSITE PATTERN
- */
-class File
-{
-    /**
-     * @var RowSet
-     */
-    protected $rowSet;
-
-    /**
-     * @var string
-     */
-    protected $pathName;
-
-    /**
-     * @param string $pathName
-     */
-    public function __construct($pathName)
-    {
-        $this->rowSet = new Rowset($this);
-    }
-
-    /**
-     * processes the rowSet
-     */
-    public function process()
-    {
-        // this is the place to show how using an iterator, with foreach
-        // See the CardGame.php file
-        $this->rowSet->process();
-    }
-}
diff --git a/Iterator/Row.php b/Iterator/Row.php
deleted file mode 100644
index df4002d..0000000
--- a/Iterator/Row.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace DesignPatterns\Iterator;
-
-/**
- * Class Row
- */
-class Row
-{
-    protected $data;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($data)
-    {
-        $this->data = $data;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function process()
-    {
-        // do some fancy things here ...
-    }
-}
diff --git a/Iterator/RowSet.php b/Iterator/RowSet.php
deleted file mode 100644
index f1ef5d7..0000000
--- a/Iterator/RowSet.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-namespace DesignPatterns\Iterator;
-
-/**
- * Class RowSet
- */
-class RowSet implements \Iterator
-{
-    /**
-     * @var
-     */
-    protected $currentRow;
-
-    /**
-     * @var string
-     */
-    protected $file;
-
-    /**
-     * @var int
-     */
-    protected $lineNumber;
-
-    /**
-     * @param string $file
-     */
-    public function __construct($file)
-    {
-        $this->file = $file;
-    }
-
-    /**
-     * composite pattern: run through all rows and process them
-     *
-     * @return void
-     */
-    public function process()
-    {
-        // this actually calls rewind(), { next(), valid(), key() and current() :}
-        /**
-         * THE key feature of the Iterator Pattern is to provide a *public contract*
-         * to iterate on a collection without knowing how items are handled inside
-         * the collection. It is not just an easy way to use "foreach"
-         *
-         * One cannot see the point of iterator pattern if you iterate on $this.
-         * This example is unclear and mixed with some Composite pattern ideas.
-         */
-        foreach ($this as $line => $row) {
-            $row->process();
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function rewind()
-    {
-        // seek to first line from $this->file
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function next()
-    {
-        // read the next line from $this->file
-        if (!$eof) {
-            $data = ''; // get the line
-            $this->currentRow = new Row($data);
-        } else {
-            $this->currentRow = null;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function current()
-    {
-        return $this->currentRow;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function valid()
-    {
-        return null !== $this->currentRow;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function key()
-    {
-        // you would want to increment this in next() or whatsoever
-        return $this->lineNumber;
-    }
-}
diff --git a/Delegation/JuniorDeveloper.php b/More/Delegation/JuniorDeveloper.php
similarity index 83%
rename from Delegation/JuniorDeveloper.php
rename to More/Delegation/JuniorDeveloper.php
index ca80033..7506181 100644
--- a/Delegation/JuniorDeveloper.php
+++ b/More/Delegation/JuniorDeveloper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Delegation;
+namespace DesignPatterns\More\Delegation;
 
 /**
  * Class JuniorDeveloper
diff --git a/Delegation/TeamLead.php b/More/Delegation/TeamLead.php
similarity index 93%
rename from Delegation/TeamLead.php
rename to More/Delegation/TeamLead.php
index f5ba323..315bd3b 100644
--- a/Delegation/TeamLead.php
+++ b/More/Delegation/TeamLead.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Delegation;
+namespace DesignPatterns\More\Delegation;
 
 /**
  * Class TeamLead
diff --git a/Tests/Delegation/DelegationTest.php b/More/Delegation/Tests/DelegationTest.php
similarity index 81%
rename from Tests/Delegation/DelegationTest.php
rename to More/Delegation/Tests/DelegationTest.php
index f9265a7..b19f871 100644
--- a/Tests/Delegation/DelegationTest.php
+++ b/More/Delegation/Tests/DelegationTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Tests\Delegation;
+namespace DesignPatterns\More\Delegation\Tests;
 
-use DesignPatterns\Delegation;
+use DesignPatterns\More\Delegation;
 
 /**
  * DelegationTest tests the delegation pattern
diff --git a/Delegation/Usage.php b/More/Delegation/Usage.php
similarity index 83%
rename from Delegation/Usage.php
rename to More/Delegation/Usage.php
index 0de2589..a1d9837 100644
--- a/Delegation/Usage.php
+++ b/More/Delegation/Usage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Delegation;
+namespace DesignPatterns\More\Delegation;
 
 // instantiate TeamLead and appoint to assistants JuniorDeveloper
 $teamLead = new TeamLead(new JuniorDeveloper());
diff --git a/More/README.md b/More/README.md
new file mode 100644
index 0000000..bea0cf5
--- /dev/null
+++ b/More/README.md
@@ -0,0 +1,4 @@
+# More
+
+* [Delegation](Delegation) [:notebook:](http://en.wikipedia.org/wiki/Delegation_pattern)
+* [ServiceLocator](ServiceLocator) [:notebook:](http://en.wikipedia.org/wiki/Service_locator_pattern)
\ No newline at end of file
diff --git a/ServiceLocator/DatabaseService.php b/More/ServiceLocator/DatabaseService.php
similarity index 58%
rename from ServiceLocator/DatabaseService.php
rename to More/ServiceLocator/DatabaseService.php
index 1ce34f9..776ba2d 100644
--- a/ServiceLocator/DatabaseService.php
+++ b/More/ServiceLocator/DatabaseService.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace DesignPatterns\ServiceLocator;
+namespace DesignPatterns\More\ServiceLocator;
 
 class DatabaseService implements DatabaseServiceInterface
 {
-
-} 
\ No newline at end of file
+}
diff --git a/More/ServiceLocator/DatabaseServiceInterface.php b/More/ServiceLocator/DatabaseServiceInterface.php
new file mode 100644
index 0000000..2f9310b
--- /dev/null
+++ b/More/ServiceLocator/DatabaseServiceInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace DesignPatterns\More\ServiceLocator;
+
+interface DatabaseServiceInterface
+{
+}
diff --git a/ServiceLocator/LogService.php b/More/ServiceLocator/LogService.php
similarity index 54%
rename from ServiceLocator/LogService.php
rename to More/ServiceLocator/LogService.php
index 2a411ab..65eef47 100644
--- a/ServiceLocator/LogService.php
+++ b/More/ServiceLocator/LogService.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace DesignPatterns\ServiceLocator;
+namespace DesignPatterns\More\ServiceLocator;
 
 class LogService implements LogServiceInterface
 {
-
-} 
\ No newline at end of file
+}
diff --git a/More/ServiceLocator/LogServiceInterface.php b/More/ServiceLocator/LogServiceInterface.php
new file mode 100644
index 0000000..d81ddbf
--- /dev/null
+++ b/More/ServiceLocator/LogServiceInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace DesignPatterns\More\ServiceLocator;
+
+interface LogServiceInterface
+{
+}
diff --git a/ServiceLocator/README.md b/More/ServiceLocator/README.md
similarity index 100%
rename from ServiceLocator/README.md
rename to More/ServiceLocator/README.md
diff --git a/ServiceLocator/ServiceLocator.php b/More/ServiceLocator/ServiceLocator.php
similarity index 84%
rename from ServiceLocator/ServiceLocator.php
rename to More/ServiceLocator/ServiceLocator.php
index f0649a6..6699eca 100644
--- a/ServiceLocator/ServiceLocator.php
+++ b/More/ServiceLocator/ServiceLocator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\ServiceLocator;
+namespace DesignPatterns\More\ServiceLocator;
 
 class ServiceLocator implements ServiceLocatorInterface
 {
@@ -27,17 +27,17 @@ class ServiceLocator implements ServiceLocatorInterface
 
     public function __construct()
     {
-        $this->services = array();
+        $this->services     = array();
         $this->instantiated = array();
-        $this->shared = array();
+        $this->shared       = array();
     }
 
     /**
      * Registers a service with specific interface.
      *
-     * @param string        $interface
+     * @param string $interface
      * @param string|object $service
-     * @param bool          $share
+     * @param bool $share
      */
     public function add($interface, $service, $share = true)
     {
@@ -47,11 +47,11 @@ class ServiceLocator implements ServiceLocatorInterface
          * in the future even if you will change the service implementation.
          */
 
-        if(is_object($service) && $share)
+        if (is_object($service) && $share) {
             $this->instantiated[$interface] = $service;
-
+        }
         $this->services[$interface] = (is_object($service) ? get_class($service) : $service);
-        $this->shared[$interface] = $share;
+        $this->shared[$interface]   = $share;
     }
 
     /**
@@ -76,8 +76,9 @@ class ServiceLocator implements ServiceLocatorInterface
     public function get($interface)
     {
         // Retrieves the instance if it exists and it is shared
-        if(isset($this->instantiated[$interface]) && $this->shared[$interface])
+        if (isset($this->instantiated[$interface]) && $this->shared[$interface]) {
             return $this->instantiated[$interface];
+        }
 
         // otherwise gets the service registered.
         $service = $this->services[$interface];
@@ -97,9 +98,9 @@ class ServiceLocator implements ServiceLocatorInterface
         $object = new $service();
 
         // and saves it if the service must be shared.
-        if($this->shared[$interface])
+        if ($this->shared[$interface]) {
             $this->instantiated[$interface] = $object;
-
+        }
         return $object;
     }
-} 
\ No newline at end of file
+}
diff --git a/ServiceLocator/ServiceLocatorInterface.php b/More/ServiceLocator/ServiceLocatorInterface.php
similarity index 80%
rename from ServiceLocator/ServiceLocatorInterface.php
rename to More/ServiceLocator/ServiceLocatorInterface.php
index ffd4006..3738624 100644
--- a/ServiceLocator/ServiceLocatorInterface.php
+++ b/More/ServiceLocator/ServiceLocatorInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\ServiceLocator;
+namespace DesignPatterns\More\ServiceLocator;
 
-interface ServiceLocatorInterface 
+interface ServiceLocatorInterface
 {
     /**
      * Checks if a service is registered.
@@ -21,4 +21,4 @@ interface ServiceLocatorInterface
      * @return mixed
      */
     public function get($interface);
-} 
\ No newline at end of file
+}
diff --git a/More/ServiceLocator/Tests/ServiceLocatorTest.php b/More/ServiceLocator/Tests/ServiceLocatorTest.php
new file mode 100644
index 0000000..14e5974
--- /dev/null
+++ b/More/ServiceLocator/Tests/ServiceLocatorTest.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace DesignPatterns\More\ServiceLocator\Tests;
+
+use DesignPatterns\More\ServiceLocator\DatabaseService;
+use DesignPatterns\More\ServiceLocator\LogService;
+use DesignPatterns\More\ServiceLocator\ServiceLocator;
+use \PHPUnit_Framework_TestCase as TestCase;
+
+class ServiceLocatorTest extends TestCase
+{
+    /**
+     * @var LogService
+     */
+    private $logService;
+
+    /**
+     * @var DatabaseService
+     */
+    private $databaseService;
+
+    /**
+     * @var ServiceLocator
+     */
+    private $serviceLocator;
+
+    public function setUp()
+    {
+        $this->serviceLocator  = new ServiceLocator();
+        $this->logService      = new LogService();
+        $this->databaseService = new DatabaseService();
+    }
+
+    public function testHasServices()
+    {
+        $this->serviceLocator->add('DesignPatterns\More\ServiceLocator\LogServiceInterface', $this->logService);
+        $this->serviceLocator->add('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface', $this->databaseService);
+
+        $this->assertTrue($this->serviceLocator->has('DesignPatterns\More\ServiceLocator\LogServiceInterface'));
+        $this->assertTrue($this->serviceLocator->has('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface'));
+
+        $this->assertFalse($this->serviceLocator->has('DesignPatterns\More\ServiceLocator\FakeServiceInterface'));
+    }
+
+    public function testServicesWithObject()
+    {
+        $this->serviceLocator->add('DesignPatterns\More\ServiceLocator\LogServiceInterface', $this->logService);
+        $this->serviceLocator->add('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface', $this->databaseService);
+
+        $this->assertSame($this->logService, $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\LogServiceInterface'));
+        $this->assertSame($this->databaseService, $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface'));
+    }
+
+    public function testServicesWithClass()
+    {
+        $this->serviceLocator
+            ->add('DesignPatterns\More\ServiceLocator\LogServiceInterface', get_class($this->logService));
+        $this->serviceLocator->add('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface', get_class($this->databaseService));
+
+        $this->assertNotSame($this->logService, $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\LogServiceInterface'));
+        $this->assertInstanceOf('DesignPatterns\More\ServiceLocator\LogServiceInterface', $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\LogServiceInterface'));
+
+        $this->assertNotSame($this->databaseService, $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface'));
+        $this->assertInstanceOf('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface', $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface'));
+    }
+
+    public function testServicesNotShared()
+    {
+        $this->serviceLocator->add('DesignPatterns\More\ServiceLocator\LogServiceInterface', $this->logService, false);
+        $this->serviceLocator->add('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface', $this->databaseService, false);
+
+        $this->assertNotSame($this->logService, $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\LogServiceInterface'));
+        $this->assertInstanceOf('DesignPatterns\More\ServiceLocator\LogServiceInterface', $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\LogServiceInterface'));
+
+        $this->assertNotSame($this->databaseService, $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface'));
+        $this->assertInstanceOf('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface', $this->serviceLocator->get('DesignPatterns\More\ServiceLocator\DatabaseServiceInterface'));
+    }
+}
diff --git a/Pool/index.php b/Pool/index.php
deleted file mode 100644
index 3059efe..0000000
--- a/Pool/index.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-use DesignPatterns\Pool\Pool;
-use DesignPatterns\Pool\Processor;
-
-$pool = new Pool('DesignPatterns\Pool\Worker');
-$processor = new Processor($pool);
-
-$processor->process('image1.jpg');
-$processor->process('image2.jpg');
-$processor->process('image3.jpg');
-$processor->process('image4.jpg');
-$processor->process('image5.jpg');
-$processor->process('image6.jpg');
-$processor->process('image7.jpg');
-$processor->process('image8.jpg');
diff --git a/README.md b/README.md
index dc9c5eb..d835586 100755
--- a/README.md
+++ b/README.md
@@ -10,48 +10,49 @@ I think the problem with patterns is that often people do know them but don't kn
 
 The patterns can be structured in roughly three different categories. Please click on the [:notebook:](http://en.wikipedia.org/wiki/Software_design_pattern) for a full explanation of the pattern on Wikipedia.
 
-### Creational
+### [Creational](Creational)
 
-* [AbstractFactory](AbstractFactory) [:notebook:](http://en.wikipedia.org/wiki/Abstract_factory_pattern)
-* [Builder](Builder) [:notebook:](http://en.wikipedia.org/wiki/Builder_pattern)
-* [SimpleFactory](SimpleFactory)
-* [FactoryMethod](FactoryMethod) [:notebook:](http://en.wikipedia.org/wiki/Factory_method_pattern)
-* [StaticFactory](StaticFactory)
-* [Prototype](Prototype) [:notebook:](http://en.wikipedia.org/wiki/Prototype_pattern)
-* [Pool](Pool) [:notebook:](http://en.wikipedia.org/wiki/Object_pool_pattern)
-* [Singleton](Singleton) [:notebook:](http://en.wikipedia.org/wiki/Singleton_pattern) (is considered an anti-pattern! :no_entry:)
-* [Multiton](Multiton) (is considered an anti-pattern! :no_entry:)
+* [AbstractFactory](Creational/AbstractFactory) [:notebook:](http://en.wikipedia.org/wiki/Abstract_factory_pattern)
+* [Builder](Creational/Builder) [:notebook:](http://en.wikipedia.org/wiki/Builder_pattern)
+* [FactoryMethod](Creational/FactoryMethod) [:notebook:](http://en.wikipedia.org/wiki/Factory_method_pattern)
+* [Multiton](Creational/Multiton) (is considered an anti-pattern! :no_entry:)
+* [Pool](Creational/Pool) [:notebook:](http://en.wikipedia.org/wiki/Object_pool_pattern)
+* [Prototype](Creational/Prototype) [:notebook:](http://en.wikipedia.org/wiki/Prototype_pattern)
+* [SimpleFactory](Creational/SimpleFactory)
+* [Singleton](Creational/Singleton) [:notebook:](http://en.wikipedia.org/wiki/Singleton_pattern) (is considered an anti-pattern! :no_entry:)
+* [StaticFactory](Creational/StaticFactory)
 
-### Structural
+### [Structural](Structural)
 
-* [Adapter](Adapter) [:notebook:](http://en.wikipedia.org/wiki/Adapter_pattern)
-* [Bridge](Bridge) [:notebook:](http://en.wikipedia.org/wiki/Bridge_pattern)
-* [Composite](Composite) [:notebook:](http://en.wikipedia.org/wiki/Composite_pattern)
-* [Decorator](Decorator) [:notebook:](http://en.wikipedia.org/wiki/Decorator_pattern)
-* [Facade](Facade) [:notebook:](http://en.wikipedia.org/wiki/Facade_pattern)
-* [Proxy](Proxy) [:notebook:](http://en.wikipedia.org/wiki/Proxy_pattern)
-* [Registry](Registry) [:notebook:](http://en.wikipedia.org/wiki/Service_locator_pattern)
-* [FluentInterface](FluentInterface) [:notebook:](http://en.wikipedia.org/wiki/Fluent_interface)
-* [DataMapper](DataMapper) [:notebook:](http://en.wikipedia.org/wiki/Data_mapper_pattern)
-* [DependencyInjection](DependencyInjection) [:notebook:](http://en.wikipedia.org/wiki/Dependency_injection)
+* [Adapter](Structural/Adapter) [:notebook:](http://en.wikipedia.org/wiki/Adapter_pattern)
+* [Bridge](Structural/Bridge) [:notebook:](http://en.wikipedia.org/wiki/Bridge_pattern)
+* [Composite](Structural/Composite) [:notebook:](http://en.wikipedia.org/wiki/Composite_pattern)
+* [DataMapper](Structural/DataMapper) [:notebook:](http://en.wikipedia.org/wiki/Data_mapper_pattern)
+* [Decorator](Structural/Decorator) [:notebook:](http://en.wikipedia.org/wiki/Decorator_pattern)
+* [DependencyInjection](Structural/DependencyInjection) [:notebook:](http://en.wikipedia.org/wiki/Dependency_injection)
+* [Facade](Structural/Facade) [:notebook:](http://en.wikipedia.org/wiki/Facade_pattern)
+* [FluentInterface](Structural/FluentInterface) [:notebook:](http://en.wikipedia.org/wiki/Fluent_interface)
+* [Proxy](Structural/Proxy) [:notebook:](http://en.wikipedia.org/wiki/Proxy_pattern)
+* [Registry](Structural/Registry) [:notebook:](http://en.wikipedia.org/wiki/Service_locator_pattern)
 
-### Behavioral
+### [Behavioral](Behavioral)
 
-* [ChainOfResponsibilities](ChainOfResponsibilities) [:notebook:](http://en.wikipedia.org/wiki/Chain_of_responsibility_pattern)
-* [Command](Command) [:notebook:](http://en.wikipedia.org/wiki/Command_pattern)
-* [Iterator](Iterator) [:notebook:](http://en.wikipedia.org/wiki/Iterator_pattern)
-* [Mediator](Mediator) [:notebook:](http://en.wikipedia.org/wiki/Mediator_pattern)
+* [ChainOfResponsibilities](Behavioral/ChainOfResponsibilities) [:notebook:](http://en.wikipedia.org/wiki/Chain_of_responsibility_pattern)
+* [Command](Behavioral/Command) [:notebook:](http://en.wikipedia.org/wiki/Command_pattern)
+* [Iterator](Behavioral/Iterator) [:notebook:](http://en.wikipedia.org/wiki/Iterator_pattern)
+* [Mediator](Behavioral/Mediator) [:notebook:](http://en.wikipedia.org/wiki/Mediator_pattern)
 * [Memento](Memento) [:notebook:](http://en.wikipedia.org/wiki/Memento_pattern)
-* [NullObject](NullObject) [:notebook:](http://en.wikipedia.org/wiki/Null_Object_pattern)
-* [Observer](Observer) [:notebook:](http://en.wikipedia.org/wiki/Observer_pattern)
-* [Specification](Specification) [:notebook:](http://en.wikipedia.org/wiki/Specification_pattern)
-* [State](State) [:notebook:](http://en.wikipedia.org/wiki/State_pattern)
-* [Strategy](Strategy) [:notebook:](http://en.wikipedia.org/wiki/Strategy_pattern)
-* [TemplateMethod](TemplateMethod) [:notebook:](http://en.wikipedia.org/wiki/Template_method_pattern)
-* [Visitor](Visitor) [:notebook:](http://en.wikipedia.org/wiki/Visitor_pattern)
+* [NullObject](Behavioral/NullObject) [:notebook:](http://en.wikipedia.org/wiki/Null_Object_pattern)
+* [Observer](Behavioral/Observer) [:notebook:](http://en.wikipedia.org/wiki/Observer_pattern)
+* [Specification](Behavioral/Specification) [:notebook:](http://en.wikipedia.org/wiki/Specification_pattern)
+* [State](Behavioral/State) [:notebook:](http://en.wikipedia.org/wiki/State_pattern)
+* [Strategy](Behavioral/Strategy) [:notebook:](http://en.wikipedia.org/wiki/Strategy_pattern)
+* [TemplateMethod](Behavioral/TemplateMethod) [:notebook:](http://en.wikipedia.org/wiki/Template_method_pattern)
+* [Visitor](Behavioral/Visitor) [:notebook:](http://en.wikipedia.org/wiki/Visitor_pattern)
 
-### More
-* [Delegation](Delegation) [:notebook:](http://en.wikipedia.org/wiki/Delegation_pattern)
+### [More](More)
+* [Delegation](More/Delegation) [:notebook:](http://en.wikipedia.org/wiki/Delegation_pattern)
+* [ServiceLocator](More/ServiceLocator) [:notebook:](http://en.wikipedia.org/wiki/Service_locator_pattern)
 
 ## Contribute
 
@@ -82,4 +83,3 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
diff --git a/Registry/index.php b/Registry/index.php
deleted file mode 100644
index 2b0ecba..0000000
--- a/Registry/index.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-use DesignPatterns\Registry\Registry;
-
-// while bootstrapping the application
-Registry::set(Registry::LOGGER, new \StdClass());
-
-// throughout the application
-Registry::get(Registry::LOGGER)->log('foo');
diff --git a/ServiceLocator/DatabaseServiceInterface.php b/ServiceLocator/DatabaseServiceInterface.php
deleted file mode 100644
index 9c7d2d7..0000000
--- a/ServiceLocator/DatabaseServiceInterface.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace DesignPatterns\ServiceLocator;
-
-interface DatabaseServiceInterface
-{
-
-} 
\ No newline at end of file
diff --git a/ServiceLocator/LogServiceInterface.php b/ServiceLocator/LogServiceInterface.php
deleted file mode 100644
index a837a17..0000000
--- a/ServiceLocator/LogServiceInterface.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace DesignPatterns\ServiceLocator;
-
-interface LogServiceInterface
-{
-
-} 
\ No newline at end of file
diff --git a/Adapter/Book.php b/Structural/Adapter/Book.php
similarity index 85%
rename from Adapter/Book.php
rename to Structural/Adapter/Book.php
index d993891..f0ce83c 100644
--- a/Adapter/Book.php
+++ b/Structural/Adapter/Book.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Adapter;
+namespace DesignPatterns\Structural\Adapter;
 
 /**
  * Book is a concrete and standard paper book
diff --git a/Adapter/EBookAdapter.php b/Structural/Adapter/EBookAdapter.php
similarity index 95%
rename from Adapter/EBookAdapter.php
rename to Structural/Adapter/EBookAdapter.php
index 6240da1..ed0fb17 100644
--- a/Adapter/EBookAdapter.php
+++ b/Structural/Adapter/EBookAdapter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Adapter;
+namespace DesignPatterns\Structural\Adapter;
 
 /**
  * EBookAdapter is an adapter to fit an e-book like a paper book
diff --git a/Adapter/EBookInterface.php b/Structural/Adapter/EBookInterface.php
similarity index 86%
rename from Adapter/EBookInterface.php
rename to Structural/Adapter/EBookInterface.php
index 86eed82..15e0222 100644
--- a/Adapter/EBookInterface.php
+++ b/Structural/Adapter/EBookInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Adapter;
+namespace DesignPatterns\Structural\Adapter;
 
 /**
  * EBookInterface is a contract for an electronic book
diff --git a/Adapter/Kindle.php b/Structural/Adapter/Kindle.php
similarity index 85%
rename from Adapter/Kindle.php
rename to Structural/Adapter/Kindle.php
index 72d89e6..760e5f8 100644
--- a/Adapter/Kindle.php
+++ b/Structural/Adapter/Kindle.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Adapter;
+namespace DesignPatterns\Structural\Adapter;
 
 /**
  * Kindle is a concrete electronic book
diff --git a/Adapter/PaperBookInterface.php b/Structural/Adapter/PaperBookInterface.php
similarity index 87%
rename from Adapter/PaperBookInterface.php
rename to Structural/Adapter/PaperBookInterface.php
index be748eb..12f3103 100644
--- a/Adapter/PaperBookInterface.php
+++ b/Structural/Adapter/PaperBookInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Adapter;
+namespace DesignPatterns\Structural\Adapter;
 
 /**
  * PaperBookInterface is a contract for a book
diff --git a/Adapter/README.md b/Structural/Adapter/README.md
similarity index 100%
rename from Adapter/README.md
rename to Structural/Adapter/README.md
diff --git a/Tests/Adapter/AdapterTest.php b/Structural/Adapter/Tests/AdapterTest.php
similarity index 70%
rename from Tests/Adapter/AdapterTest.php
rename to Structural/Adapter/Tests/AdapterTest.php
index 370a6c3..258e755 100644
--- a/Tests/Adapter/AdapterTest.php
+++ b/Structural/Adapter/Tests/AdapterTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace DesignPatterns\Tests\Adapter;
+namespace DesignPatterns\Structural\Adapter\Tests;
 
-use DesignPatterns\Adapter\EBookAdapter;
-use DesignPatterns\Adapter\Kindle;
-use DesignPatterns\Adapter\PaperBookInterface;
-use DesignPatterns\Adapter\Book;
+use DesignPatterns\Structural\Adapter\EBookAdapter;
+use DesignPatterns\Structural\Adapter\Kindle;
+use DesignPatterns\Structural\Adapter\PaperBookInterface;
+use DesignPatterns\Structural\Adapter\Book;
 
 /**
  * AdapterTest shows the use of an adapted e-book that behave like a book
@@ -33,7 +33,7 @@ class AdapterTest extends \PHPUnit_Framework_TestCase
      *
      * @dataProvider getBook
      */
-    public function test_I_am_an_old_Client(PaperBookInterface $book)
+    public function testIAmAnOldClient(PaperBookInterface $book)
     {
         $book->open();
         $book->turnPage();
diff --git a/Structural/Bridge/Assemble.php b/Structural/Bridge/Assemble.php
new file mode 100644
index 0000000..2b60889
--- /dev/null
+++ b/Structural/Bridge/Assemble.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace DesignPatterns\Structural\Bridge;
+
+class Assemble implements Workshop
+{
+
+    public function work()
+    {
+        print 'Assembled';
+    }
+}
diff --git a/Structural/Bridge/Car.php b/Structural/Bridge/Car.php
new file mode 100644
index 0000000..2754199
--- /dev/null
+++ b/Structural/Bridge/Car.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace DesignPatterns\Structural\Bridge;
+
+/**
+ * Refined Abstraction
+ */
+class Car extends Vehicle
+{
+
+    public function __construct(Workshop $workShop1, Workshop $workShop2)
+    {
+        parent::__construct($workShop1, $workShop2);
+    }
+
+    public function manufacture()
+    {
+        print 'Car ';
+        $this->workShop1->work();
+        $this->workShop2->work();
+    }
+}
diff --git a/Structural/Bridge/Motorcycle.php b/Structural/Bridge/Motorcycle.php
new file mode 100644
index 0000000..b021ce6
--- /dev/null
+++ b/Structural/Bridge/Motorcycle.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace DesignPatterns\Structural\Bridge;
+
+/**
+ * Refined Abstraction
+ */
+class Motorcycle extends Vehicle
+{
+
+    public function __construct(Workshop $workShop1, Workshop $workShop2)
+    {
+        parent::__construct($workShop1, $workShop2);
+    }
+
+    public function manufacture()
+    {
+        print 'Motorcycle ';
+        $this->workShop1->work();
+        $this->workShop2->work();
+    }
+}
diff --git a/Structural/Bridge/Produce.php b/Structural/Bridge/Produce.php
new file mode 100644
index 0000000..b2b0505
--- /dev/null
+++ b/Structural/Bridge/Produce.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace DesignPatterns\Structural\Bridge;
+
+/**
+ * Concrete Implementation
+ */
+class Produce implements Workshop
+{
+
+    public function work()
+    {
+        print 'Produced ';
+    }
+}
diff --git a/Structural/Bridge/README.md b/Structural/Bridge/README.md
new file mode 100644
index 0000000..6ddc67e
--- /dev/null
+++ b/Structural/Bridge/README.md
@@ -0,0 +1,9 @@
+## Purpose
+
+Decouple an abstraction from its implementation so that the two can vary
+independently. (http://en.wikipedia.org/wiki/Bridge_pattern)
+
+#### Sample:
+
+* [Symfony DoctrineBridge](https://github.com/symfony/DoctrineBridge)
+
diff --git a/Structural/Bridge/Tests/BridgeTest.php b/Structural/Bridge/Tests/BridgeTest.php
new file mode 100644
index 0000000..e07afe9
--- /dev/null
+++ b/Structural/Bridge/Tests/BridgeTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace DesignPatterns\Structural\Bridge\Tests;
+
+use DesignPatterns\Structural\Bridge\Assemble;
+use DesignPatterns\Structural\Bridge\Car;
+use DesignPatterns\Structural\Bridge\Motorcycle;
+use DesignPatterns\Structural\Bridge\Produce;
+
+class BridgeTest extends \PHPUnit_Framework_TestCase
+{
+
+    public function testCar()
+    {
+        $vehicle = new Car(new Produce(), new Assemble());
+        $this->expectOutputString('Car Produced Assembled');
+        $vehicle->manufacture();
+    }
+
+    public function testMotorcycle()
+    {
+        $vehicle = new Motorcycle(new Produce(), new Assemble());
+        $this->expectOutputString('Motorcycle Produced Assembled');
+        $vehicle->manufacture();
+    }
+}
diff --git a/Structural/Bridge/Vehicle.php b/Structural/Bridge/Vehicle.php
new file mode 100644
index 0000000..10b0d03
--- /dev/null
+++ b/Structural/Bridge/Vehicle.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace DesignPatterns\Structural\Bridge;
+
+/**
+ * Abstraction
+ */
+abstract class Vehicle
+{
+
+    protected $workShop1;
+    protected $workShop2;
+
+    protected function __construct(Workshop $workShop1, Workshop $workShop2)
+    {
+        $this->workShop1 = $workShop1;
+        $this->workShop2 = $workShop2;
+    }
+
+    public function manufacture()
+    {
+    }
+}
diff --git a/Structural/Bridge/Workshop.php b/Structural/Bridge/Workshop.php
new file mode 100644
index 0000000..dc62886
--- /dev/null
+++ b/Structural/Bridge/Workshop.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace DesignPatterns\Structural\Bridge;
+
+/**
+ * Implementer
+ */
+interface Workshop
+{
+
+    public function work();
+}
diff --git a/Composite/Form.php b/Structural/Composite/Form.php
similarity index 95%
rename from Composite/Form.php
rename to Structural/Composite/Form.php
index 66248c2..fbf3b50 100644
--- a/Composite/Form.php
+++ b/Structural/Composite/Form.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Composite;
+namespace DesignPatterns\Structural\Composite;
 
 /**
  * The composite node MUST extend the component contract. This is mandatory for building
diff --git a/Composite/FormElement.php b/Structural/Composite/FormElement.php
similarity index 82%
rename from Composite/FormElement.php
rename to Structural/Composite/FormElement.php
index ab95c67..8063c89 100644
--- a/Composite/FormElement.php
+++ b/Structural/Composite/FormElement.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Composite;
+namespace DesignPatterns\Structural\Composite;
 
 /**
  * Class FormElement
diff --git a/Composite/InputElement.php b/Structural/Composite/InputElement.php
similarity index 87%
rename from Composite/InputElement.php
rename to Structural/Composite/InputElement.php
index 7a65241..30d8615 100644
--- a/Composite/InputElement.php
+++ b/Structural/Composite/InputElement.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Composite;
+namespace DesignPatterns\Structural\Composite;
 
 /**
  * Class InputElement
diff --git a/Composite/README.md b/Structural/Composite/README.md
similarity index 100%
rename from Composite/README.md
rename to Structural/Composite/README.md
diff --git a/Tests/Composite/FormTest.php b/Structural/Composite/Tests/CompositeTest.php
similarity index 68%
rename from Tests/Composite/FormTest.php
rename to Structural/Composite/Tests/CompositeTest.php
index 8a2aae3..71aa98e 100644
--- a/Tests/Composite/FormTest.php
+++ b/Structural/Composite/Tests/CompositeTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace DesignPatterns\Test\Composite;
+namespace DesignPatterns\Test\Composite\Tests;
 
-use DesignPatterns\Composite;
+use DesignPatterns\Structural\Composite;
 
 /**
  * FormTest tests the composite pattern on Form
  */
-class FormTest extends \PHPUnit_Framework_TestCase
+class CompositeTest extends \PHPUnit_Framework_TestCase
 {
 
     public function testRender()
@@ -29,6 +29,8 @@ class FormTest extends \PHPUnit_Framework_TestCase
      */
     public function testFormImplementsFormEelement()
     {
-        $this->assertTrue(is_subclass_of('DesignPatterns\Composite\Form', 'DesignPatterns\Composite\FormElement'));
+        $className = 'DesignPatterns\Structural\Composite\Form';
+        $abstractName = 'DesignPatterns\Structural\Composite\FormElement';
+        $this->assertTrue(is_subclass_of($className, $abstractName));
     }
 }
diff --git a/Composite/TextElement.php b/Structural/Composite/TextElement.php
similarity index 87%
rename from Composite/TextElement.php
rename to Structural/Composite/TextElement.php
index 9ea4a4e..ed50294 100644
--- a/Composite/TextElement.php
+++ b/Structural/Composite/TextElement.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Composite;
+namespace DesignPatterns\Structural\Composite;
 
 /**
  * Class TextElement
diff --git a/DataMapper/README.md b/Structural/DataMapper/README.md
similarity index 100%
rename from DataMapper/README.md
rename to Structural/DataMapper/README.md
diff --git a/Tests/DataMapper/UserMapperTest.php b/Structural/DataMapper/Tests/DataMapperTest.php
similarity index 80%
rename from Tests/DataMapper/UserMapperTest.php
rename to Structural/DataMapper/Tests/DataMapperTest.php
index bd2d1c1..fb531e9 100644
--- a/Tests/DataMapper/UserMapperTest.php
+++ b/Structural/DataMapper/Tests/DataMapperTest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace DesignPatterns\Test\DataMapper;
+namespace DesignPatterns\Structural\DataMapper\Tests;
 
-use DesignPatterns\DataMapper\UserMapper;
-use DesignPatterns\DataMapper\User;
+use DesignPatterns\Structural\DataMapper\UserMapper;
+use DesignPatterns\Structural\DataMapper\User;
 
 /**
  * UserMapperTest tests the datamapper pattern
  */
-class UserMapperTest extends \PHPUnit_Framework_TestCase
+class DataMapperTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var UserMapper
@@ -22,7 +22,7 @@ class UserMapperTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->dbal = $this->getMockBuilder('DesignPatterns\DataMapper\DBAL')
+        $this->dbal = $this->getMockBuilder('DesignPatterns\Structural\DataMapper\DBAL')
                 ->disableAutoload()
                 ->setMethods(array('insert', 'update', 'find', 'findAll'))
                 ->getMock();
@@ -65,7 +65,12 @@ class UserMapperTest extends \PHPUnit_Framework_TestCase
      */
     public function testRestoreOne(User $existing)
     {
-        $rows = new \ArrayIterator(array(array('userid' => 1, 'username' => 'Odysseus', 'email' => 'Odysseus@ithaca.gr')));
+        $row = array(
+            'userid'   => 1,
+            'username' => 'Odysseus',
+            'email'    => 'Odysseus@ithaca.gr'
+        );
+        $rows = new \ArrayIterator(array($row));
         $this->dbal->expects($this->once())
                 ->method('find')
                 ->with(1)
@@ -90,7 +95,7 @@ class UserMapperTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage User #404 not found
      */
     public function testNotFound()
diff --git a/DataMapper/User.php b/Structural/DataMapper/User.php
similarity index 96%
rename from DataMapper/User.php
rename to Structural/DataMapper/User.php
index 12f8779..78e60a8 100644
--- a/DataMapper/User.php
+++ b/Structural/DataMapper/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\DataMapper;
+namespace DesignPatterns\Structural\DataMapper;
 
 /**
  * DataMapper pattern
diff --git a/DataMapper/UserMapper.php b/Structural/DataMapper/UserMapper.php
similarity index 97%
rename from DataMapper/UserMapper.php
rename to Structural/DataMapper/UserMapper.php
index a9d65e7..0ee5352 100644
--- a/DataMapper/UserMapper.php
+++ b/Structural/DataMapper/UserMapper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\DataMapper;
+namespace DesignPatterns\Structural\DataMapper;
 
 /**
  * class UserMapper
diff --git a/Decorator/Decorator.php b/Structural/Decorator/Decorator.php
similarity index 93%
rename from Decorator/Decorator.php
rename to Structural/Decorator/Decorator.php
index d7fb9ae..f6e377e 100644
--- a/Decorator/Decorator.php
+++ b/Structural/Decorator/Decorator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Decorator;
+namespace DesignPatterns\Structural\Decorator;
 
 /**
  * the Decorator MUST implement the RendererInterface contract, this is the key-feature
diff --git a/Decorator/README.md b/Structural/Decorator/README.md
similarity index 100%
rename from Decorator/README.md
rename to Structural/Decorator/README.md
diff --git a/Decorator/RenderInJson.php b/Structural/Decorator/RenderInJson.php
similarity index 85%
rename from Decorator/RenderInJson.php
rename to Structural/Decorator/RenderInJson.php
index 0edc7ea..ebcc577 100644
--- a/Decorator/RenderInJson.php
+++ b/Structural/Decorator/RenderInJson.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Decorator;
+namespace DesignPatterns\Structural\Decorator;
 
 /**
  * Class RenderInJson
diff --git a/Decorator/RenderInXml.php b/Structural/Decorator/RenderInXml.php
similarity index 91%
rename from Decorator/RenderInXml.php
rename to Structural/Decorator/RenderInXml.php
index 56b7e44..f8e92a0 100644
--- a/Decorator/RenderInXml.php
+++ b/Structural/Decorator/RenderInXml.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Decorator;
+namespace DesignPatterns\Structural\Decorator;
 
 /**
  * Class RenderInXml
diff --git a/Decorator/RendererInterface.php b/Structural/Decorator/RendererInterface.php
similarity index 78%
rename from Decorator/RendererInterface.php
rename to Structural/Decorator/RendererInterface.php
index f5f3e3f..2957970 100644
--- a/Decorator/RendererInterface.php
+++ b/Structural/Decorator/RendererInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Decorator;
+namespace DesignPatterns\Structural\Decorator;
 
 /**
  * Class RendererInterface
diff --git a/Tests/Decorator/DecoratorTest.php b/Structural/Decorator/Tests/DecoratorTest.php
similarity index 63%
rename from Tests/Decorator/DecoratorTest.php
rename to Structural/Decorator/Tests/DecoratorTest.php
index c6202dd..a824625 100644
--- a/Tests/Decorator/DecoratorTest.php
+++ b/Structural/Decorator/Tests/DecoratorTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Tests\Decorator;
+namespace DesignPatterns\Structural\Decorator\Tests;
 
-use DesignPatterns\Decorator;
+use DesignPatterns\Structural\Decorator;
 
 /**
  * DecoratorTest tests the decorator pattern
@@ -30,7 +30,8 @@ class DecoratorTest extends \PHPUnit_Framework_TestCase
         // Wrap service with a JSON decorator for renderers
         $service = new Decorator\RenderInXml($this->service);
         // Our Renderer will now output XML instead of an array
-        $this->assertXmlStringEqualsXmlString('<?xml version="1.0"?><foo>bar</foo>', $service->renderData());
+        $xml = '<?xml version="1.0"?><foo>bar</foo>';
+        $this->assertXmlStringEqualsXmlString($xml, $service->renderData());
     }
 
     /**
@@ -38,7 +39,9 @@ class DecoratorTest extends \PHPUnit_Framework_TestCase
      */
     public function testDecoratorMustImplementsRenderer()
     {
-        $this->assertTrue(is_subclass_of('DesignPatterns\Decorator\Decorator', 'DesignPatterns\Decorator\RendererInterface'));
+        $className = 'DesignPatterns\Structural\Decorator\Decorator';
+        $interfaceName = 'DesignPatterns\Structural\Decorator\RendererInterface';
+        $this->assertTrue(is_subclass_of($className, $interfaceName));
     }
 
     /**
@@ -48,7 +51,7 @@ class DecoratorTest extends \PHPUnit_Framework_TestCase
      */
     public function testDecoratorTypeHinted()
     {
-        $this->getMockForAbstractClass('DesignPatterns\Decorator\Decorator', array(new \stdClass()));
+        $this->getMockForAbstractClass('DesignPatterns\Structural\Decorator\Decorator', array(new \stdClass()));
     }
 
     /**
@@ -56,8 +59,8 @@ class DecoratorTest extends \PHPUnit_Framework_TestCase
      */
     public function testDecoratorOnlyAcceptRenderer()
     {
-        $mock = $this->getMock('DesignPatterns\Decorator\RendererInterface');
-        $dec = $this->getMockForAbstractClass('DesignPatterns\Decorator\Decorator', array($mock));
+        $mock = $this->getMock('DesignPatterns\Structural\Decorator\RendererInterface');
+        $dec = $this->getMockForAbstractClass('DesignPatterns\Structural\Decorator\Decorator', array($mock));
         $this->assertNotNull($dec);
     }
 }
diff --git a/Decorator/Webservice.php b/Structural/Decorator/Webservice.php
similarity index 88%
rename from Decorator/Webservice.php
rename to Structural/Decorator/Webservice.php
index a23f42c..e6bf306 100644
--- a/Decorator/Webservice.php
+++ b/Structural/Decorator/Webservice.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Decorator;
+namespace DesignPatterns\Structural\Decorator;
 
 /**
  * Class Webservice
diff --git a/DependencyInjection/AbstractConfig.php b/Structural/DependencyInjection/AbstractConfig.php
similarity index 80%
rename from DependencyInjection/AbstractConfig.php
rename to Structural/DependencyInjection/AbstractConfig.php
index 9b20882..85e5245 100644
--- a/DependencyInjection/AbstractConfig.php
+++ b/Structural/DependencyInjection/AbstractConfig.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\DependencyInjection;
+namespace DesignPatterns\Structural\DependencyInjection;
 
 /**
  * class AbstractConfig
diff --git a/DependencyInjection/ArrayConfig.php b/Structural/DependencyInjection/ArrayConfig.php
similarity index 75%
rename from DependencyInjection/ArrayConfig.php
rename to Structural/DependencyInjection/ArrayConfig.php
index e2dcc5e..91bca33 100644
--- a/DependencyInjection/ArrayConfig.php
+++ b/Structural/DependencyInjection/ArrayConfig.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\DependencyInjection;
+namespace DesignPatterns\Structural\DependencyInjection;
 
 /**
  * class ArrayConfig
@@ -13,10 +13,11 @@ class ArrayConfig extends AbstractConfig implements Parameters
      * Get parameter
      *
      * @param string|int $key
-     * 
+     * @param null $default
      * @return mixed
      */
-    public function get($key, $default = null) {
+    public function get($key, $default = null)
+    {
         if (isset($this->storage[$key])) {
             return $this->storage[$key];
         }
@@ -27,7 +28,7 @@ class ArrayConfig extends AbstractConfig implements Parameters
      * Set parameter
      *
      * @param string|int $key
-     * @param mixed      $value
+     * @param mixed $value
      */
     public function set($key, $value)
     {
diff --git a/DependencyInjection/Connection.php b/Structural/DependencyInjection/Connection.php
similarity index 93%
rename from DependencyInjection/Connection.php
rename to Structural/DependencyInjection/Connection.php
index 573de0a..9e131c2 100644
--- a/DependencyInjection/Connection.php
+++ b/Structural/DependencyInjection/Connection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\DependencyInjection;
+namespace DesignPatterns\Structural\DependencyInjection;
 
 /**
  * Class Connection
diff --git a/DependencyInjection/Parameters.php b/Structural/DependencyInjection/Parameters.php
similarity index 78%
rename from DependencyInjection/Parameters.php
rename to Structural/DependencyInjection/Parameters.php
index a30f1a9..dabe895 100644
--- a/DependencyInjection/Parameters.php
+++ b/Structural/DependencyInjection/Parameters.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace DesignPatterns\DependencyInjection;
+namespace DesignPatterns\Structural\DependencyInjection;
 
 /**
  * Parameters interface
  */
-interface Parameters 
+interface Parameters
 {
     /**
      * Get parameter
      *
      * @param string|int $key
-     * 
+     *
      * @return mixed
      */
     public function get($key);
diff --git a/DependencyInjection/README.md b/Structural/DependencyInjection/README.md
similarity index 100%
rename from DependencyInjection/README.md
rename to Structural/DependencyInjection/README.md
diff --git a/Tests/DependencyInjection/DependencyInjectionTest.php b/Structural/DependencyInjection/Tests/DependencyInjectionTest.php
similarity index 65%
rename from Tests/DependencyInjection/DependencyInjectionTest.php
rename to Structural/DependencyInjection/Tests/DependencyInjectionTest.php
index 34e9e76..6df82a7 100644
--- a/Tests/DependencyInjection/DependencyInjectionTest.php
+++ b/Structural/DependencyInjection/Tests/DependencyInjectionTest.php
@@ -1,11 +1,9 @@
 <?php
 
-namespace DesignPatterns\Tests\DependencyInjection;
+namespace DesignPatterns\Structural\DependencyInjection\Tests;
 
-use DesignPatterns\DependencyInjection\Parameters;
-use DesignPatterns\DependencyInjection\AbstractConfig;
-use DesignPatterns\DependencyInjection\ArrayConfig;
-use DesignPatterns\DependencyInjection\Connection;
+use DesignPatterns\Structural\DependencyInjection\ArrayConfig;
+use DesignPatterns\Structural\DependencyInjection\Connection;
 
 class DependencyInjectionTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/Tests/DependencyInjection/config.php b/Structural/DependencyInjection/Tests/config.php
similarity index 100%
rename from Tests/DependencyInjection/config.php
rename to Structural/DependencyInjection/Tests/config.php
diff --git a/Facade/BiosInterface.php b/Structural/Facade/BiosInterface.php
similarity index 90%
rename from Facade/BiosInterface.php
rename to Structural/Facade/BiosInterface.php
index 377651c..869dcd9 100644
--- a/Facade/BiosInterface.php
+++ b/Structural/Facade/BiosInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Facade;
+namespace DesignPatterns\Structural\Facade;
 
 /**
  * Class BiosInterface
diff --git a/Facade/Facade.php b/Structural/Facade/Facade.php
similarity index 95%
rename from Facade/Facade.php
rename to Structural/Facade/Facade.php
index 3d82332..d40d412 100644
--- a/Facade/Facade.php
+++ b/Structural/Facade/Facade.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Facade;
+namespace DesignPatterns\Structural\Facade;
 
 /**
  *
diff --git a/Facade/OsInterface.php b/Structural/Facade/OsInterface.php
similarity index 74%
rename from Facade/OsInterface.php
rename to Structural/Facade/OsInterface.php
index e81c7f1..3b09eb1 100644
--- a/Facade/OsInterface.php
+++ b/Structural/Facade/OsInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Facade;
+namespace DesignPatterns\Structural\Facade;
 
 /**
  * Class OsInterface
diff --git a/Facade/README.md b/Structural/Facade/README.md
similarity index 100%
rename from Facade/README.md
rename to Structural/Facade/README.md
diff --git a/Tests/Facade/FacadeTest.php b/Structural/Facade/Tests/FacadeTest.php
similarity index 78%
rename from Tests/Facade/FacadeTest.php
rename to Structural/Facade/Tests/FacadeTest.php
index 0d91521..eccb9be 100644
--- a/Tests/Facade/FacadeTest.php
+++ b/Structural/Facade/Tests/FacadeTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Tests\Facade;
+namespace DesignPatterns\Structural\Facade\Tests;
 
-use DesignPatterns\Facade\Facade as Computer;
+use DesignPatterns\Structural\Facade\Facade as Computer;
 
 /**
  * FacadeTest shows example of facades
@@ -12,11 +12,11 @@ class FacadeTest extends \PHPUnit_Framework_TestCase
 
     public function getComputer()
     {
-        $bios = $this->getMockBuilder('DesignPatterns\Facade\BiosInterface')
+        $bios = $this->getMockBuilder('DesignPatterns\Structural\Facade\BiosInterface')
                 ->setMethods(array('launch', 'execute', 'waitForKeyPress'))
                 ->disableAutoload()
                 ->getMock();
-        $operatingSys = $this->getMockBuilder('DesignPatterns\Facade\OsInterface')
+        $operatingSys = $this->getMockBuilder('DesignPatterns\Structural\Facade\OsInterface')
                 ->setMethods(array('getName'))
                 ->disableAutoload()
                 ->getMock();
diff --git a/FluentInterface/README.md b/Structural/FluentInterface/README.md
similarity index 100%
rename from FluentInterface/README.md
rename to Structural/FluentInterface/README.md
diff --git a/FluentInterface/SQL.php b/Structural/FluentInterface/SQL.php
similarity index 95%
rename from FluentInterface/SQL.php
rename to Structural/FluentInterface/SQL.php
index 6b7d82d..3afd300 100644
--- a/FluentInterface/SQL.php
+++ b/Structural/FluentInterface/SQL.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace DesignPatterns\FluentInterface;
+namespace DesignPatterns\Structural\FluentInterface;
 
 /**
  * class SQL
  */
-class SQL
+class Sql
 {
     /**
      * @var array
diff --git a/Tests/FluentInterface/FluentInterfaceTest.php b/Structural/FluentInterface/Tests/FluentInterfaceTest.php
similarity index 75%
rename from Tests/FluentInterface/FluentInterfaceTest.php
rename to Structural/FluentInterface/Tests/FluentInterfaceTest.php
index 63be030..98ea99d 100644
--- a/Tests/FluentInterface/FluentInterfaceTest.php
+++ b/Structural/FluentInterface/Tests/FluentInterfaceTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Tests\FluentInterface;
+namespace DesignPatterns\Structural\FluentInterface\Tests;
 
-use DesignPatterns\FluentInterface\SQL;
+use DesignPatterns\Structural\FluentInterface\Sql;
 
 /**
  * FluentInterfaceTest tests the fluent interface SQL
@@ -12,7 +12,7 @@ class FluentInterfaceTest extends \PHPUnit_Framework_TestCase
 
     public function testBuildSQL()
     {
-        $instance = new SQL();
+        $instance = new Sql();
         $query = $instance->select(array('foo', 'bar'))
                 ->from('foobar', 'f')
                 ->where('f.bar = ?')
diff --git a/Proxy/README.md b/Structural/Proxy/README.md
similarity index 100%
rename from Proxy/README.md
rename to Structural/Proxy/README.md
diff --git a/Proxy/Record.php b/Structural/Proxy/Record.php
similarity index 94%
rename from Proxy/Record.php
rename to Structural/Proxy/Record.php
index 28d861c..38481aa 100644
--- a/Proxy/Record.php
+++ b/Structural/Proxy/Record.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Proxy;
+namespace DesignPatterns\Structural\Proxy;
 
 /**
  * class Record
diff --git a/Proxy/RecordProxy.php b/Structural/Proxy/RecordProxy.php
similarity index 95%
rename from Proxy/RecordProxy.php
rename to Structural/Proxy/RecordProxy.php
index 63f7904..1f68cff 100644
--- a/Proxy/RecordProxy.php
+++ b/Structural/Proxy/RecordProxy.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Proxy;
+namespace DesignPatterns\Structural\Proxy;
 
 /**
  * Class RecordProxy
diff --git a/Structural/README.md b/Structural/README.md
new file mode 100644
index 0000000..6def831
--- /dev/null
+++ b/Structural/README.md
@@ -0,0 +1,16 @@
+# Structural
+
+In Software Engineering, Structural Design Patterns are Design Patterns that
+ease the design by identifying a simple way to realize relationships between
+entities.
+
+* [Adapter](Adapter) [:notebook:](http://en.wikipedia.org/wiki/Adapter_pattern)
+* [Bridge](Bridge) [:notebook:](http://en.wikipedia.org/wiki/Bridge_pattern)
+* [Composite](Composite) [:notebook:](http://en.wikipedia.org/wiki/Composite_pattern)
+* [DataMapper](DataMapper) [:notebook:](http://en.wikipedia.org/wiki/Data_mapper_pattern)
+* [Decorator](Decorator) [:notebook:](http://en.wikipedia.org/wiki/Decorator_pattern)
+* [DependencyInjection](DependencyInjection) [:notebook:](http://en.wikipedia.org/wiki/Dependency_injection)
+* [Facade](Facade) [:notebook:](http://en.wikipedia.org/wiki/Facade_pattern)
+* [FluentInterface](FluentInterface) [:notebook:](http://en.wikipedia.org/wiki/Fluent_interface)
+* [Proxy](Proxy) [:notebook:](http://en.wikipedia.org/wiki/Proxy_pattern)
+* [Registry](Registry) [:notebook:](http://en.wikipedia.org/wiki/Service_locator_pattern)
diff --git a/Registry/README.md b/Structural/Registry/README.md
similarity index 100%
rename from Registry/README.md
rename to Structural/Registry/README.md
diff --git a/Registry/Registry.php b/Structural/Registry/Registry.php
similarity index 94%
rename from Registry/Registry.php
rename to Structural/Registry/Registry.php
index 11df8d6..d1c6b13 100644
--- a/Registry/Registry.php
+++ b/Structural/Registry/Registry.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Registry;
+namespace DesignPatterns\Structural\Registry;
 
 /**
  * class Registry
diff --git a/Structural/Registry/Tests/RegistryTest.php b/Structural/Registry/Tests/RegistryTest.php
new file mode 100644
index 0000000..64685d4
--- /dev/null
+++ b/Structural/Registry/Tests/RegistryTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace DesignPatterns\Structural\Registry\Tests;
+
+use DesignPatterns\Structural\Registry\Registry;
+
+class RegistryTest extends \PHPUnit_Framework_TestCase
+{
+
+    public function testSetAndGetLogger()
+    {
+        Registry::set(Registry::LOGGER, new \StdClass());
+
+        $logger = Registry::get(Registry::LOGGER);
+        $this->assertInstanceOf('StdClass', $logger);
+    }
+}
diff --git a/Tests/ServiceLocator/ServiceLocatorTest.php b/Tests/ServiceLocator/ServiceLocatorTest.php
deleted file mode 100644
index 8fc0670..0000000
--- a/Tests/ServiceLocator/ServiceLocatorTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-namespace DesignPatterns\Tests\ServiceLocator;
-
-use DesignPatterns\ServiceLocator\DatabaseService;
-use DesignPatterns\ServiceLocator\LogService;
-use DesignPatterns\ServiceLocator\ServiceLocator;
-use \PHPUnit_Framework_TestCase as TestCase;
-
-class ServiceLocatorTest extends TestCase
-{
-    /**
-     * @var LogService
-     */
-    private $logService;
-
-    /**
-     * @var DatabaseService
-     */
-    private $databaseService;
-
-    /**
-     * @var ServiceLocator
-     */
-    private $serviceLocator;
-
-    public function setUp()
-    {
-        $this->serviceLocator = new ServiceLocator();
-
-        $this->logService = new LogService();
-        $this->databaseService = new DatabaseService();
-    }
-
-    public function testHasServices()
-    {
-        $this->serviceLocator->add('DesignPatterns\ServiceLocator\LogServiceInterface', $this->logService);
-        $this->serviceLocator->add('DesignPatterns\ServiceLocator\DatabaseServiceInterface', $this->databaseService);
-
-        $this->assertTrue($this->serviceLocator->has('DesignPatterns\ServiceLocator\LogServiceInterface'));
-        $this->assertTrue($this->serviceLocator->has('DesignPatterns\ServiceLocator\DatabaseServiceInterface'));
-
-        $this->assertFalse($this->serviceLocator->has('DesignPatterns\ServiceLocator\FakeServiceInterface'));
-    }
-
-    public function testServicesWithObject()
-    {
-        $this->serviceLocator->add('DesignPatterns\ServiceLocator\LogServiceInterface', $this->logService);
-        $this->serviceLocator->add('DesignPatterns\ServiceLocator\DatabaseServiceInterface', $this->databaseService);
-
-        $this->assertSame($this->logService, $this->serviceLocator->get('DesignPatterns\ServiceLocator\LogServiceInterface'));
-        $this->assertSame($this->databaseService, $this->serviceLocator->get('DesignPatterns\ServiceLocator\DatabaseServiceInterface'));
-    }
-
-    public function testServicesWithClass()
-    {
-        $this->serviceLocator->add('DesignPatterns\ServiceLocator\LogServiceInterface', get_class($this->logService));
-        $this->serviceLocator->add('DesignPatterns\ServiceLocator\DatabaseServiceInterface', get_class($this->databaseService));
-
-        $this->assertNotSame($this->logService, $this->serviceLocator->get('DesignPatterns\ServiceLocator\LogServiceInterface'));
-        $this->assertInstanceOf('DesignPatterns\ServiceLocator\LogServiceInterface', $this->serviceLocator->get('DesignPatterns\ServiceLocator\LogServiceInterface'));
-
-        $this->assertNotSame($this->databaseService, $this->serviceLocator->get('DesignPatterns\ServiceLocator\DatabaseServiceInterface'));
-        $this->assertInstanceOf('DesignPatterns\ServiceLocator\DatabaseServiceInterface', $this->serviceLocator->get('DesignPatterns\ServiceLocator\DatabaseServiceInterface'));
-    }
-
-    public function testServicesNotShared()
-    {
-        $this->serviceLocator->add('DesignPatterns\ServiceLocator\LogServiceInterface', $this->logService, false);
-        $this->serviceLocator->add('DesignPatterns\ServiceLocator\DatabaseServiceInterface', $this->databaseService, false);
-
-        $this->assertNotSame($this->logService, $this->serviceLocator->get('DesignPatterns\ServiceLocator\LogServiceInterface'));
-        $this->assertInstanceOf('DesignPatterns\ServiceLocator\LogServiceInterface', $this->serviceLocator->get('DesignPatterns\ServiceLocator\LogServiceInterface'));
-
-        $this->assertNotSame($this->databaseService, $this->serviceLocator->get('DesignPatterns\ServiceLocator\DatabaseServiceInterface'));
-        $this->assertInstanceOf('DesignPatterns\ServiceLocator\DatabaseServiceInterface', $this->serviceLocator->get('DesignPatterns\ServiceLocator\DatabaseServiceInterface'));
-    }
-}
- 
\ No newline at end of file
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index c69c7f5..f08bbb2 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -3,8 +3,15 @@
 
     <testsuites>
         <testsuite name="Design Patterns">
-            <directory>./Tests</directory>
+            <directory suffix="Test.php">Behavioral/*/Tests</directory>
+            <directory suffix="Test.php">Creational/*/Tests</directory>
+            <directory suffix="Test.php">More/*/Tests</directory>
+            <directory suffix="Test.php">Structural/*/Tests</directory>
         </testsuite>
     </testsuites>
-
+    <filter>
+        <blacklist>
+            <directory>./vendor</directory>
+        </blacklist>
+    </filter>
 </phpunit>