diff --git a/Creational/AbstractFactory/AbstractFactory.php b/Creational/AbstractFactory/AbstractFactory.php
index 481e14e..84b4203 100644
--- a/Creational/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/Creational/AbstractFactory/Test/AbstractFactoryTest.php b/Creational/AbstractFactory/AbstractFactoryTest.php
similarity index 74%
rename from Creational/AbstractFactory/Test/AbstractFactoryTest.php
rename to Creational/AbstractFactory/AbstractFactoryTest.php
index 581c068..3fafb3a 100644
--- a/Creational/AbstractFactory/Test/AbstractFactoryTest.php
+++ b/Creational/AbstractFactory/AbstractFactoryTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace DesignPatterns\Tests\AbstractFactory;
+namespace DesignPatterns\Creational\AbstractFactory;
 
-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/Creational/AbstractFactory/Html/Picture.php b/Creational/AbstractFactory/Html/Picture.php
index 2e648b0..3f224fc 100644
--- a/Creational/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/Creational/AbstractFactory/Html/Text.php b/Creational/AbstractFactory/Html/Text.php
index 8ea6d4f..120c043 100644
--- a/Creational/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/Creational/AbstractFactory/HtmlFactory.php b/Creational/AbstractFactory/HtmlFactory.php
index 3606374..7982a24 100644
--- a/Creational/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/Creational/AbstractFactory/Json/Picture.php b/Creational/AbstractFactory/Json/Picture.php
index 4684191..13d191b 100644
--- a/Creational/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/Creational/AbstractFactory/Json/Text.php b/Creational/AbstractFactory/Json/Text.php
index 83d0877..699fff3 100644
--- a/Creational/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/Creational/AbstractFactory/JsonFactory.php b/Creational/AbstractFactory/JsonFactory.php
index 6cf15d2..ab2bb6f 100644
--- a/Creational/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/Creational/AbstractFactory/MediaInterface.php b/Creational/AbstractFactory/MediaInterface.php
index 92d0089..6bb5d3a 100644
--- a/Creational/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/Creational/AbstractFactory/Picture.php b/Creational/AbstractFactory/Picture.php
index 264bfb6..8a4f720 100644
--- a/Creational/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/Creational/AbstractFactory/Text.php b/Creational/AbstractFactory/Text.php
index 248f5c6..5d2da89 100644
--- a/Creational/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/Creational/Builder/BikeBuilder.php b/Creational/Builder/BikeBuilder.php
index a6f1a30..477e1ad 100644
--- a/Creational/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/Creational/Builder/BuilderInterface.php b/Creational/Builder/BuilderInterface.php
index 89b4b8f..f682656 100644
--- a/Creational/Builder/BuilderInterface.php
+++ b/Creational/Builder/BuilderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Builder;
+namespace DesignPatterns\Creational\Builder;
 
 /**
  *
diff --git a/Creational/Builder/CarBuilder.php b/Creational/Builder/CarBuilder.php
index b89ee20..7725176 100644
--- a/Creational/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/Creational/Builder/Director.php b/Creational/Builder/Director.php
index 99317f5..0c11877 100644
--- a/Creational/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/Creational/Builder/Test/DirectorTest.php b/Creational/Builder/DirectorTest.php
similarity index 66%
rename from Creational/Builder/Test/DirectorTest.php
rename to Creational/Builder/DirectorTest.php
index 2f26248..d1d0ab7 100644
--- a/Creational/Builder/Test/DirectorTest.php
+++ b/Creational/Builder/DirectorTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace DesignPatterns\Tests\Builder;
+namespace DesignPatterns\Creational\Builder;
 
-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/Creational/Builder/Parts/Bike.php b/Creational/Builder/Parts/Bike.php
index 6ffa4e2..307b3e0 100644
--- a/Creational/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/Creational/Builder/Parts/Car.php b/Creational/Builder/Parts/Car.php
index e3bc455..a18b301 100644
--- a/Creational/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
index ccad7ac..aa08772 100644
--- a/Creational/Builder/Parts/Door.php
+++ b/Creational/Builder/Parts/Door.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Builder\Parts;
+namespace DesignPatterns\Creational\Builder\Parts;
 
 /**
  * Class Door
diff --git a/Creational/Builder/Parts/Engine.php b/Creational/Builder/Parts/Engine.php
index 20410b1..08d5bd0 100644
--- a/Creational/Builder/Parts/Engine.php
+++ b/Creational/Builder/Parts/Engine.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Builder\Parts;
+namespace DesignPatterns\Creational\Builder\Parts;
 
 /**
  * Class Engine
diff --git a/Creational/Builder/Parts/Vehicle.php b/Creational/Builder/Parts/Vehicle.php
index 88f266f..492eade 100644
--- a/Creational/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
index 71337e4..19ef7c3 100644
--- a/Creational/Builder/Parts/Wheel.php
+++ b/Creational/Builder/Parts/Wheel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Builder\Parts;
+namespace DesignPatterns\Creational\Builder\Parts;
 
 /**
  * Class Wheel
diff --git a/Creational/FactoryMethod/Bicycle.php b/Creational/FactoryMethod/Bicycle.php
index 76b4a53..01fa8a0 100644
--- a/Creational/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/Creational/FactoryMethod/FactoryMethod.php b/Creational/FactoryMethod/FactoryMethod.php
index 677e6a6..e4f3771 100644
--- a/Creational/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/Creational/FactoryMethod/Test/FactoryMethodTest.php b/Creational/FactoryMethod/FactoryMethodTest.php
similarity index 75%
rename from Creational/FactoryMethod/Test/FactoryMethodTest.php
rename to Creational/FactoryMethod/FactoryMethodTest.php
index 0796a98..08f58f0 100644
--- a/Creational/FactoryMethod/Test/FactoryMethodTest.php
+++ b/Creational/FactoryMethod/FactoryMethodTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace DesignPatterns\Tests\FactoryMethod;
+namespace DesignPatterns\Creational\FactoryMethod;
 
-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/Creational/FactoryMethod/Ferrari.php b/Creational/FactoryMethod/Ferrari.php
index f221e42..c905f91 100644
--- a/Creational/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/Creational/FactoryMethod/GermanFactory.php b/Creational/FactoryMethod/GermanFactory.php
index 36e7f04..67306e9 100644
--- a/Creational/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/Creational/FactoryMethod/ItalianFactory.php b/Creational/FactoryMethod/ItalianFactory.php
index 17a1233..c7010e0 100644
--- a/Creational/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/Creational/FactoryMethod/Porsche.php b/Creational/FactoryMethod/Porsche.php
index f4824fe..818a082 100644
--- a/Creational/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/Creational/FactoryMethod/VehicleInterface.php b/Creational/FactoryMethod/VehicleInterface.php
index 5f6d756..a734b61 100644
--- a/Creational/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/Creational/Multiton/Multiton.php b/Creational/Multiton/Multiton.php
index cacc79b..e10c513 100644
--- a/Creational/Multiton/Multiton.php
+++ b/Creational/Multiton/Multiton.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns;
+namespace DesignPatterns\Creational\Multiton;
 
 /**
  * class Multiton
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..dcd1611 100644
--- a/Pool/Pool.php
+++ b/Creational/Pool/Pool.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Pool;
+namespace DesignPatterns\Creational\Pool;
 
 class Pool
 {
diff --git a/Tests/Pool/PoolTest.php b/Creational/Pool/PoolTest.php
similarity index 71%
rename from Tests/Pool/PoolTest.php
rename to Creational/Pool/PoolTest.php
index 0b86c5b..f52d2f9 100644
--- a/Tests/Pool/PoolTest.php
+++ b/Creational/Pool/PoolTest.php
@@ -1,14 +1,13 @@
 <?php
 
-namespace DesignPatterns\Tests\Pool;
+namespace DesignPatterns\Creational\Pool;
 
-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\TestWorker');
         $worker = $pool->get();
 
         $this->assertEquals(1, $worker->id);
@@ -27,6 +26,5 @@ class PoolTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(5, $pool->get()->id);
         $this->assertEquals(1, $pool->get()->id);
     }
-
 }
 
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..47523b0 100644
--- a/Pool/Processor.php
+++ b/Creational/Pool/Processor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Pool;
+namespace DesignPatterns\Creational\Pool;
 
 class Processor
 {
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/Pool/Worker.php b/Creational/Pool/Worker.php
similarity index 89%
rename from Pool/Worker.php
rename to Creational/Pool/Worker.php
index 4d34a0d..a176372 100644
--- a/Pool/Worker.php
+++ b/Creational/Pool/Worker.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Pool;
+namespace DesignPatterns\Creational\Pool;
 
 class Worker
 {
diff --git a/Creational/Prototype/BarBookPrototype.php b/Creational/Prototype/BarBookPrototype.php
index c254496..971d00e 100644
--- a/Creational/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/Creational/Prototype/BookPrototype.php b/Creational/Prototype/BookPrototype.php
index 79ddf36..18d4871 100644
--- a/Creational/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/Creational/Prototype/FooBookPrototype.php b/Creational/Prototype/FooBookPrototype.php
index ed2f250..9eb19d3 100644
--- a/Creational/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/Creational/Prototype/index.php b/Creational/Prototype/index.php
index 84f813d..f268e5c 100644
--- a/Creational/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/SimpleFactory/Bicycle.php b/Creational/SimpleFactory/Bicycle.php
index fbe605d..75cb413 100644
--- a/Creational/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/Creational/SimpleFactory/ConcreteFactory.php b/Creational/SimpleFactory/ConcreteFactory.php
index fba685f..177290c 100644
--- a/Creational/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/Creational/SimpleFactory/Scooter.php b/Creational/SimpleFactory/Scooter.php
index 2e386b7..710c8cd 100644
--- a/Creational/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/Creational/SimpleFactory/Test/SimpleFactoryTest.php b/Creational/SimpleFactory/SimpleFactoryTest.php
similarity index 76%
rename from Creational/SimpleFactory/Test/SimpleFactoryTest.php
rename to Creational/SimpleFactory/SimpleFactoryTest.php
index 48c949c..0c2c470 100644
--- a/Creational/SimpleFactory/Test/SimpleFactoryTest.php
+++ b/Creational/SimpleFactory/SimpleFactoryTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Tests\SimpleFactory;
+namespace DesignPatterns\Creational\SimpleFactory;
 
-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);
     }
 
     /**
diff --git a/Creational/SimpleFactory/VehicleInterface.php b/Creational/SimpleFactory/VehicleInterface.php
index 66dc3fd..eb13a66 100644
--- a/Creational/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/Creational/Singleton/Singleton.php b/Creational/Singleton/Singleton.php
index 0aee908..00f0440 100644
--- a/Creational/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/Creational/Singleton/Test/SingletonTest.php b/Creational/Singleton/SingletonTest.php
similarity index 74%
rename from Creational/Singleton/Test/SingletonTest.php
rename to Creational/Singleton/SingletonTest.php
index 8d1405e..c39fbbc 100644
--- a/Creational/Singleton/Test/SingletonTest.php
+++ b/Creational/Singleton/SingletonTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Tests\Singleton;
+namespace DesignPatterns\Creational\Singleton;
 
-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/Creational/StaticFactory/FormatNumber.php b/Creational/StaticFactory/FormatNumber.php
index 8b20db2..93ac7c7 100644
--- a/Creational/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/Creational/StaticFactory/FormatString.php b/Creational/StaticFactory/FormatString.php
index 9f48fde..6578b68 100644
--- a/Creational/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/Creational/StaticFactory/FormatterInterface.php b/Creational/StaticFactory/FormatterInterface.php
index b5220cd..969f047 100644
--- a/Creational/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/Creational/StaticFactory/StaticFactory.php b/Creational/StaticFactory/StaticFactory.php
index 2010416..e4f2f96 100644
--- a/Creational/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/Creational/StaticFactory/Test/StaticFactoryTest.php b/Creational/StaticFactory/StaticFactoryTest.php
similarity index 65%
rename from Creational/StaticFactory/Test/StaticFactoryTest.php
rename to Creational/StaticFactory/StaticFactoryTest.php
index d85f266..1582e56 100644
--- a/Creational/StaticFactory/Test/StaticFactoryTest.php
+++ b/Creational/StaticFactory/StaticFactoryTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Tests\StaticFactory;
+namespace DesignPatterns\Creational\StaticFactory;
 
-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/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');