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 60%
rename from Tests/ChainOfResponsibilities/ChainTest.php
rename to Behavioral/ChainOfResponsibilities/Tests/ChainTest.php
index 73669b8..4b867c5 100644
--- a/Tests/ChainOfResponsibilities/ChainTest.php
+++ b/Behavioral/ChainOfResponsibilities/Tests/ChainTest.php
@@ -1,9 +1,11 @@
 <?php
 
-namespace DesignPatterns\Tests\ChainOfResponsibilities;
+namespace DesignPatterns\Behavioral\Tests\ChainOfResponsibilities;
 
-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,7 @@ 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);
+        $this->assertEquals('DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\FastStorage', $request->forDebugOnly);
     }
 
     /**
@@ -55,7 +60,7 @@ 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);
+        $this->assertEquals('DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\SlowStorage', $request->forDebugOnly);
     }
 
     /**
@@ -68,6 +73,6 @@ class ChainTest extends \PHPUnit_Framework_TestCase
 
         $this->assertFalse($ret);
         // the last responsible :
-        $this->assertEquals('DesignPatterns\ChainOfResponsibilities\Responsible\SlowStorage', $request->forDebugOnly);
+        $this->assertEquals('DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\SlowStorage', $request->forDebugOnly);
     }
 }
diff --git a/Command/CommandInterface.php b/Behavioral/Command/CommandInterface.php
similarity index 100%
rename from Command/CommandInterface.php
rename to Behavioral/Command/CommandInterface.php
diff --git a/Command/HelloCommand.php b/Behavioral/Command/HelloCommand.php
similarity index 100%
rename from Command/HelloCommand.php
rename to Behavioral/Command/HelloCommand.php
diff --git a/Command/Invoker.php b/Behavioral/Command/Invoker.php
similarity index 100%
rename from Command/Invoker.php
rename to Behavioral/Command/Invoker.php
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 100%
rename from Command/Receiver.php
rename to Behavioral/Command/Receiver.php
diff --git a/Tests/Command/CommandTest.php b/Behavioral/Command/Test/CommandTest.php
similarity index 100%
rename from Tests/Command/CommandTest.php
rename to Behavioral/Command/Test/CommandTest.php
diff --git a/Iterator/File.php b/Behavioral/Iterator/File.php
similarity index 100%
rename from Iterator/File.php
rename to Behavioral/Iterator/File.php
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/Iterator/Row.php b/Behavioral/Iterator/Row.php
similarity index 100%
rename from Iterator/Row.php
rename to Behavioral/Iterator/Row.php
diff --git a/Iterator/RowSet.php b/Behavioral/Iterator/RowSet.php
similarity index 100%
rename from Iterator/RowSet.php
rename to Behavioral/Iterator/RowSet.php
diff --git a/Mediator/Colleague.php b/Behavioral/Mediator/Colleague.php
similarity index 100%
rename from Mediator/Colleague.php
rename to Behavioral/Mediator/Colleague.php
diff --git a/Mediator/Mediator.php b/Behavioral/Mediator/Mediator.php
similarity index 100%
rename from Mediator/Mediator.php
rename to Behavioral/Mediator/Mediator.php
diff --git a/Mediator/MediatorInterface.php b/Behavioral/Mediator/MediatorInterface.php
similarity index 100%
rename from Mediator/MediatorInterface.php
rename to Behavioral/Mediator/MediatorInterface.php
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 100%
rename from Mediator/Subsystem/Client.php
rename to Behavioral/Mediator/Subsystem/Client.php
diff --git a/Mediator/Subsystem/Database.php b/Behavioral/Mediator/Subsystem/Database.php
similarity index 100%
rename from Mediator/Subsystem/Database.php
rename to Behavioral/Mediator/Subsystem/Database.php
diff --git a/Mediator/Subsystem/Server.php b/Behavioral/Mediator/Subsystem/Server.php
similarity index 100%
rename from Mediator/Subsystem/Server.php
rename to Behavioral/Mediator/Subsystem/Server.php
diff --git a/Tests/Mediator/MediatorTest.php b/Behavioral/Mediator/Test/MediatorTest.php
similarity index 100%
rename from Tests/Mediator/MediatorTest.php
rename to Behavioral/Mediator/Test/MediatorTest.php
diff --git a/NullObject/LoggerInterface.php b/Behavioral/NullObject/LoggerInterface.php
similarity index 100%
rename from NullObject/LoggerInterface.php
rename to Behavioral/NullObject/LoggerInterface.php
diff --git a/NullObject/NullLogger.php b/Behavioral/NullObject/NullLogger.php
similarity index 100%
rename from NullObject/NullLogger.php
rename to Behavioral/NullObject/NullLogger.php
diff --git a/NullObject/PrintLogger.php b/Behavioral/NullObject/PrintLogger.php
similarity index 100%
rename from NullObject/PrintLogger.php
rename to Behavioral/NullObject/PrintLogger.php
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 100%
rename from NullObject/Service.php
rename to Behavioral/NullObject/Service.php
diff --git a/Tests/NullObject/LoggerTest.php b/Behavioral/NullObject/Test/LoggerTest.php
similarity index 100%
rename from Tests/NullObject/LoggerTest.php
rename to Behavioral/NullObject/Test/LoggerTest.php
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/Test/ObserverTest.php
similarity index 100%
rename from Tests/Observer/ObserverTest.php
rename to Behavioral/Observer/Test/ObserverTest.php
diff --git a/Observer/User.php b/Behavioral/Observer/User.php
similarity index 100%
rename from Observer/User.php
rename to Behavioral/Observer/User.php
diff --git a/Observer/UserObserver.php b/Behavioral/Observer/UserObserver.php
similarity index 100%
rename from Observer/UserObserver.php
rename to Behavioral/Observer/UserObserver.php
diff --git a/Specification/AbstractSpecification.php b/Behavioral/Specification/AbstractSpecification.php
old mode 100755
new mode 100644
similarity index 100%
rename from Specification/AbstractSpecification.php
rename to Behavioral/Specification/AbstractSpecification.php
diff --git a/Specification/Either.php b/Behavioral/Specification/Either.php
old mode 100755
new mode 100644
similarity index 100%
rename from Specification/Either.php
rename to Behavioral/Specification/Either.php
diff --git a/Specification/Item.php b/Behavioral/Specification/Item.php
similarity index 100%
rename from Specification/Item.php
rename to Behavioral/Specification/Item.php
diff --git a/Specification/Not.php b/Behavioral/Specification/Not.php
old mode 100755
new mode 100644
similarity index 100%
rename from Specification/Not.php
rename to Behavioral/Specification/Not.php
diff --git a/Specification/Plus.php b/Behavioral/Specification/Plus.php
old mode 100755
new mode 100644
similarity index 100%
rename from Specification/Plus.php
rename to Behavioral/Specification/Plus.php
diff --git a/Specification/PriceSpecification.php b/Behavioral/Specification/PriceSpecification.php
similarity index 100%
rename from Specification/PriceSpecification.php
rename to Behavioral/Specification/PriceSpecification.php
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 100%
rename from Specification/SpecificationInterface.php
rename to Behavioral/Specification/SpecificationInterface.php
diff --git a/Tests/Specification/SpecificationTest.php b/Behavioral/Specification/Test/SpecificationTest.php
similarity index 100%
rename from Tests/Specification/SpecificationTest.php
rename to Behavioral/Specification/Test/SpecificationTest.php
diff --git a/State/CreateOrder.php b/Behavioral/State/CreateOrder.php
similarity index 100%
rename from State/CreateOrder.php
rename to Behavioral/State/CreateOrder.php
diff --git a/State/OrderController.php b/Behavioral/State/OrderController.php
similarity index 100%
rename from State/OrderController.php
rename to Behavioral/State/OrderController.php
diff --git a/State/OrderFactory.php b/Behavioral/State/OrderFactory.php
similarity index 100%
rename from State/OrderFactory.php
rename to Behavioral/State/OrderFactory.php
diff --git a/State/OrderInterface.php b/Behavioral/State/OrderInterface.php
similarity index 100%
rename from State/OrderInterface.php
rename to Behavioral/State/OrderInterface.php
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 100%
rename from State/ShippingOrder.php
rename to Behavioral/State/ShippingOrder.php
diff --git a/Strategy/ComparatorInterface.php b/Behavioral/Strategy/ComparatorInterface.php
similarity index 100%
rename from Strategy/ComparatorInterface.php
rename to Behavioral/Strategy/ComparatorInterface.php
diff --git a/Strategy/DateComparator.php b/Behavioral/Strategy/DateComparator.php
similarity index 100%
rename from Strategy/DateComparator.php
rename to Behavioral/Strategy/DateComparator.php
diff --git a/Strategy/IdComparator.php b/Behavioral/Strategy/IdComparator.php
similarity index 100%
rename from Strategy/IdComparator.php
rename to Behavioral/Strategy/IdComparator.php
diff --git a/Strategy/ObjectCollection.php b/Behavioral/Strategy/ObjectCollection.php
similarity index 100%
rename from Strategy/ObjectCollection.php
rename to Behavioral/Strategy/ObjectCollection.php
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/Strategy/index.php b/Behavioral/Strategy/index.php
similarity index 100%
rename from Strategy/index.php
rename to Behavioral/Strategy/index.php
diff --git a/TemplateMethod/BeachJourney.php b/Behavioral/TemplateMethod/BeachJourney.php
similarity index 100%
rename from TemplateMethod/BeachJourney.php
rename to Behavioral/TemplateMethod/BeachJourney.php
diff --git a/TemplateMethod/CityJourney.php b/Behavioral/TemplateMethod/CityJourney.php
similarity index 100%
rename from TemplateMethod/CityJourney.php
rename to Behavioral/TemplateMethod/CityJourney.php
diff --git a/TemplateMethod/Journey.php b/Behavioral/TemplateMethod/Journey.php
similarity index 100%
rename from TemplateMethod/Journey.php
rename to Behavioral/TemplateMethod/Journey.php
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/Test/JourneyTest.php
similarity index 100%
rename from Tests/TemplateMethod/JourneyTest.php
rename to Behavioral/TemplateMethod/Test/JourneyTest.php
diff --git a/Visitor/Group.php b/Behavioral/Visitor/Group.php
similarity index 100%
rename from Visitor/Group.php
rename to Behavioral/Visitor/Group.php
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 100%
rename from Visitor/Role.php
rename to Behavioral/Visitor/Role.php
diff --git a/Visitor/RolePrintVisitor.php b/Behavioral/Visitor/RolePrintVisitor.php
similarity index 100%
rename from Visitor/RolePrintVisitor.php
rename to Behavioral/Visitor/RolePrintVisitor.php
diff --git a/Visitor/RoleVisitorInterface.php b/Behavioral/Visitor/RoleVisitorInterface.php
similarity index 100%
rename from Visitor/RoleVisitorInterface.php
rename to Behavioral/Visitor/RoleVisitorInterface.php
diff --git a/Tests/Visitor/VisitorTest.php b/Behavioral/Visitor/Test/VisitorTest.php
similarity index 100%
rename from Tests/Visitor/VisitorTest.php
rename to Behavioral/Visitor/Test/VisitorTest.php
diff --git a/Visitor/User.php b/Behavioral/Visitor/User.php
similarity index 100%
rename from Visitor/User.php
rename to Behavioral/Visitor/User.php
diff --git a/AbstractFactory/AbstractFactory.php b/Creational/AbstractFactory/AbstractFactory.php
similarity index 100%
rename from AbstractFactory/AbstractFactory.php
rename to Creational/AbstractFactory/AbstractFactory.php
diff --git a/AbstractFactory/Html/Picture.php b/Creational/AbstractFactory/Html/Picture.php
similarity index 100%
rename from AbstractFactory/Html/Picture.php
rename to Creational/AbstractFactory/Html/Picture.php
diff --git a/AbstractFactory/Html/Text.php b/Creational/AbstractFactory/Html/Text.php
similarity index 100%
rename from AbstractFactory/Html/Text.php
rename to Creational/AbstractFactory/Html/Text.php
diff --git a/AbstractFactory/HtmlFactory.php b/Creational/AbstractFactory/HtmlFactory.php
similarity index 100%
rename from AbstractFactory/HtmlFactory.php
rename to Creational/AbstractFactory/HtmlFactory.php
diff --git a/AbstractFactory/Json/Picture.php b/Creational/AbstractFactory/Json/Picture.php
similarity index 100%
rename from AbstractFactory/Json/Picture.php
rename to Creational/AbstractFactory/Json/Picture.php
diff --git a/AbstractFactory/Json/Text.php b/Creational/AbstractFactory/Json/Text.php
similarity index 100%
rename from AbstractFactory/Json/Text.php
rename to Creational/AbstractFactory/Json/Text.php
diff --git a/AbstractFactory/JsonFactory.php b/Creational/AbstractFactory/JsonFactory.php
similarity index 100%
rename from AbstractFactory/JsonFactory.php
rename to Creational/AbstractFactory/JsonFactory.php
diff --git a/AbstractFactory/MediaInterface.php b/Creational/AbstractFactory/MediaInterface.php
similarity index 100%
rename from AbstractFactory/MediaInterface.php
rename to Creational/AbstractFactory/MediaInterface.php
diff --git a/AbstractFactory/Picture.php b/Creational/AbstractFactory/Picture.php
similarity index 100%
rename from AbstractFactory/Picture.php
rename to Creational/AbstractFactory/Picture.php
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/Test/AbstractFactoryTest.php
similarity index 100%
rename from Tests/AbstractFactory/AbstractFactoryTest.php
rename to Creational/AbstractFactory/Test/AbstractFactoryTest.php
diff --git a/AbstractFactory/Text.php b/Creational/AbstractFactory/Text.php
similarity index 100%
rename from AbstractFactory/Text.php
rename to Creational/AbstractFactory/Text.php
diff --git a/Builder/BikeBuilder.php b/Creational/Builder/BikeBuilder.php
similarity index 100%
rename from Builder/BikeBuilder.php
rename to Creational/Builder/BikeBuilder.php
diff --git a/Builder/BuilderInterface.php b/Creational/Builder/BuilderInterface.php
similarity index 100%
rename from Builder/BuilderInterface.php
rename to Creational/Builder/BuilderInterface.php
diff --git a/Builder/CarBuilder.php b/Creational/Builder/CarBuilder.php
similarity index 100%
rename from Builder/CarBuilder.php
rename to Creational/Builder/CarBuilder.php
diff --git a/Builder/Director.php b/Creational/Builder/Director.php
similarity index 100%
rename from Builder/Director.php
rename to Creational/Builder/Director.php
diff --git a/Builder/Parts/Bike.php b/Creational/Builder/Parts/Bike.php
similarity index 100%
rename from Builder/Parts/Bike.php
rename to Creational/Builder/Parts/Bike.php
diff --git a/Builder/Parts/Car.php b/Creational/Builder/Parts/Car.php
similarity index 100%
rename from Builder/Parts/Car.php
rename to Creational/Builder/Parts/Car.php
diff --git a/Builder/Parts/Door.php b/Creational/Builder/Parts/Door.php
similarity index 100%
rename from Builder/Parts/Door.php
rename to Creational/Builder/Parts/Door.php
diff --git a/Builder/Parts/Engine.php b/Creational/Builder/Parts/Engine.php
similarity index 100%
rename from Builder/Parts/Engine.php
rename to Creational/Builder/Parts/Engine.php
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 100%
rename from Builder/Parts/Vehicle.php
rename to Creational/Builder/Parts/Vehicle.php
diff --git a/Builder/Parts/Wheel.php b/Creational/Builder/Parts/Wheel.php
similarity index 100%
rename from Builder/Parts/Wheel.php
rename to Creational/Builder/Parts/Wheel.php
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/Test/DirectorTest.php
similarity index 100%
rename from Tests/Builder/DirectorTest.php
rename to Creational/Builder/Test/DirectorTest.php
diff --git a/FactoryMethod/Bicycle.php b/Creational/FactoryMethod/Bicycle.php
similarity index 100%
rename from FactoryMethod/Bicycle.php
rename to Creational/FactoryMethod/Bicycle.php
diff --git a/FactoryMethod/FactoryMethod.php b/Creational/FactoryMethod/FactoryMethod.php
similarity index 100%
rename from FactoryMethod/FactoryMethod.php
rename to Creational/FactoryMethod/FactoryMethod.php
diff --git a/FactoryMethod/Ferrari.php b/Creational/FactoryMethod/Ferrari.php
similarity index 100%
rename from FactoryMethod/Ferrari.php
rename to Creational/FactoryMethod/Ferrari.php
diff --git a/FactoryMethod/GermanFactory.php b/Creational/FactoryMethod/GermanFactory.php
similarity index 100%
rename from FactoryMethod/GermanFactory.php
rename to Creational/FactoryMethod/GermanFactory.php
diff --git a/FactoryMethod/ItalianFactory.php b/Creational/FactoryMethod/ItalianFactory.php
similarity index 100%
rename from FactoryMethod/ItalianFactory.php
rename to Creational/FactoryMethod/ItalianFactory.php
diff --git a/FactoryMethod/Porsche.php b/Creational/FactoryMethod/Porsche.php
similarity index 100%
rename from FactoryMethod/Porsche.php
rename to Creational/FactoryMethod/Porsche.php
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/Test/FactoryMethodTest.php
similarity index 100%
rename from Tests/FactoryMethod/FactoryMethodTest.php
rename to Creational/FactoryMethod/Test/FactoryMethodTest.php
diff --git a/FactoryMethod/VehicleInterface.php b/Creational/FactoryMethod/VehicleInterface.php
similarity index 100%
rename from FactoryMethod/VehicleInterface.php
rename to Creational/FactoryMethod/VehicleInterface.php
diff --git a/Multiton/Multiton.php b/Creational/Multiton/Multiton.php
similarity index 100%
rename from Multiton/Multiton.php
rename to Creational/Multiton/Multiton.php
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/Prototype/BarBookPrototype.php b/Creational/Prototype/BarBookPrototype.php
similarity index 100%
rename from Prototype/BarBookPrototype.php
rename to Creational/Prototype/BarBookPrototype.php
diff --git a/Prototype/BookPrototype.php b/Creational/Prototype/BookPrototype.php
similarity index 100%
rename from Prototype/BookPrototype.php
rename to Creational/Prototype/BookPrototype.php
diff --git a/Prototype/FooBookPrototype.php b/Creational/Prototype/FooBookPrototype.php
similarity index 100%
rename from Prototype/FooBookPrototype.php
rename to Creational/Prototype/FooBookPrototype.php
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 100%
rename from Prototype/index.php
rename to Creational/Prototype/index.php
diff --git a/SimpleFactory/Bicycle.php b/Creational/SimpleFactory/Bicycle.php
similarity index 100%
rename from SimpleFactory/Bicycle.php
rename to Creational/SimpleFactory/Bicycle.php
diff --git a/SimpleFactory/ConcreteFactory.php b/Creational/SimpleFactory/ConcreteFactory.php
similarity index 100%
rename from SimpleFactory/ConcreteFactory.php
rename to Creational/SimpleFactory/ConcreteFactory.php
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 100%
rename from SimpleFactory/Scooter.php
rename to Creational/SimpleFactory/Scooter.php
diff --git a/Tests/SimpleFactory/SimpleFactoryTest.php b/Creational/SimpleFactory/Test/SimpleFactoryTest.php
similarity index 100%
rename from Tests/SimpleFactory/SimpleFactoryTest.php
rename to Creational/SimpleFactory/Test/SimpleFactoryTest.php
diff --git a/SimpleFactory/VehicleInterface.php b/Creational/SimpleFactory/VehicleInterface.php
similarity index 100%
rename from SimpleFactory/VehicleInterface.php
rename to Creational/SimpleFactory/VehicleInterface.php
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 100%
rename from Singleton/Singleton.php
rename to Creational/Singleton/Singleton.php
diff --git a/Tests/Singleton/SingletonTest.php b/Creational/Singleton/Test/SingletonTest.php
similarity index 100%
rename from Tests/Singleton/SingletonTest.php
rename to Creational/Singleton/Test/SingletonTest.php
diff --git a/StaticFactory/FormatNumber.php b/Creational/StaticFactory/FormatNumber.php
similarity index 100%
rename from StaticFactory/FormatNumber.php
rename to Creational/StaticFactory/FormatNumber.php
diff --git a/StaticFactory/FormatString.php b/Creational/StaticFactory/FormatString.php
similarity index 100%
rename from StaticFactory/FormatString.php
rename to Creational/StaticFactory/FormatString.php
diff --git a/StaticFactory/FormatterInterface.php b/Creational/StaticFactory/FormatterInterface.php
similarity index 100%
rename from StaticFactory/FormatterInterface.php
rename to Creational/StaticFactory/FormatterInterface.php
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 100%
rename from StaticFactory/StaticFactory.php
rename to Creational/StaticFactory/StaticFactory.php
diff --git a/Tests/StaticFactory/StaticFactoryTest.php b/Creational/StaticFactory/Test/StaticFactoryTest.php
similarity index 100%
rename from Tests/StaticFactory/StaticFactoryTest.php
rename to Creational/StaticFactory/Test/StaticFactoryTest.php
diff --git a/Delegation/JuniorDeveloper.php b/More/Delegation/JuniorDeveloper.php
similarity index 100%
rename from Delegation/JuniorDeveloper.php
rename to More/Delegation/JuniorDeveloper.php
diff --git a/Delegation/TeamLead.php b/More/Delegation/TeamLead.php
similarity index 100%
rename from Delegation/TeamLead.php
rename to More/Delegation/TeamLead.php
diff --git a/Tests/Delegation/DelegationTest.php b/More/Delegation/Test/DelegationTest.php
similarity index 100%
rename from Tests/Delegation/DelegationTest.php
rename to More/Delegation/Test/DelegationTest.php
diff --git a/Delegation/Usage.php b/More/Delegation/Usage.php
similarity index 100%
rename from Delegation/Usage.php
rename to More/Delegation/Usage.php
diff --git a/ServiceLocator/DatabaseService.php b/More/ServiceLocator/DatabaseService.php
similarity index 100%
rename from ServiceLocator/DatabaseService.php
rename to More/ServiceLocator/DatabaseService.php
diff --git a/ServiceLocator/DatabaseServiceInterface.php b/More/ServiceLocator/DatabaseServiceInterface.php
similarity index 100%
rename from ServiceLocator/DatabaseServiceInterface.php
rename to More/ServiceLocator/DatabaseServiceInterface.php
diff --git a/ServiceLocator/LogService.php b/More/ServiceLocator/LogService.php
similarity index 100%
rename from ServiceLocator/LogService.php
rename to More/ServiceLocator/LogService.php
diff --git a/ServiceLocator/LogServiceInterface.php b/More/ServiceLocator/LogServiceInterface.php
similarity index 100%
rename from ServiceLocator/LogServiceInterface.php
rename to More/ServiceLocator/LogServiceInterface.php
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 100%
rename from ServiceLocator/ServiceLocator.php
rename to More/ServiceLocator/ServiceLocator.php
diff --git a/ServiceLocator/ServiceLocatorInterface.php b/More/ServiceLocator/ServiceLocatorInterface.php
similarity index 100%
rename from ServiceLocator/ServiceLocatorInterface.php
rename to More/ServiceLocator/ServiceLocatorInterface.php
diff --git a/Tests/ServiceLocator/ServiceLocatorTest.php b/More/ServiceLocator/Test/ServiceLocatorTest.php
similarity index 100%
rename from Tests/ServiceLocator/ServiceLocatorTest.php
rename to More/ServiceLocator/Test/ServiceLocatorTest.php
diff --git a/Adapter/Book.php b/Structural/Adapter/Book.php
similarity index 100%
rename from Adapter/Book.php
rename to Structural/Adapter/Book.php
diff --git a/Adapter/EBookAdapter.php b/Structural/Adapter/EBookAdapter.php
similarity index 100%
rename from Adapter/EBookAdapter.php
rename to Structural/Adapter/EBookAdapter.php
diff --git a/Adapter/EBookInterface.php b/Structural/Adapter/EBookInterface.php
similarity index 100%
rename from Adapter/EBookInterface.php
rename to Structural/Adapter/EBookInterface.php
diff --git a/Adapter/Kindle.php b/Structural/Adapter/Kindle.php
similarity index 100%
rename from Adapter/Kindle.php
rename to Structural/Adapter/Kindle.php
diff --git a/Adapter/PaperBookInterface.php b/Structural/Adapter/PaperBookInterface.php
similarity index 100%
rename from Adapter/PaperBookInterface.php
rename to Structural/Adapter/PaperBookInterface.php
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/Test/AdapterTest.php
similarity index 100%
rename from Tests/Adapter/AdapterTest.php
rename to Structural/Adapter/Test/AdapterTest.php
diff --git a/Composite/Form.php b/Structural/Composite/Form.php
similarity index 100%
rename from Composite/Form.php
rename to Structural/Composite/Form.php
diff --git a/Composite/FormElement.php b/Structural/Composite/FormElement.php
similarity index 100%
rename from Composite/FormElement.php
rename to Structural/Composite/FormElement.php
diff --git a/Composite/InputElement.php b/Structural/Composite/InputElement.php
similarity index 100%
rename from Composite/InputElement.php
rename to Structural/Composite/InputElement.php
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/Test/FormTest.php
similarity index 100%
rename from Tests/Composite/FormTest.php
rename to Structural/Composite/Test/FormTest.php
diff --git a/Composite/TextElement.php b/Structural/Composite/TextElement.php
similarity index 100%
rename from Composite/TextElement.php
rename to Structural/Composite/TextElement.php
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/Test/UserMapperTest.php
similarity index 100%
rename from Tests/DataMapper/UserMapperTest.php
rename to Structural/DataMapper/Test/UserMapperTest.php
diff --git a/DataMapper/User.php b/Structural/DataMapper/User.php
similarity index 100%
rename from DataMapper/User.php
rename to Structural/DataMapper/User.php
diff --git a/DataMapper/UserMapper.php b/Structural/DataMapper/UserMapper.php
similarity index 100%
rename from DataMapper/UserMapper.php
rename to Structural/DataMapper/UserMapper.php
diff --git a/Decorator/Decorator.php b/Structural/Decorator/Decorator.php
similarity index 100%
rename from Decorator/Decorator.php
rename to Structural/Decorator/Decorator.php
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 100%
rename from Decorator/RenderInJson.php
rename to Structural/Decorator/RenderInJson.php
diff --git a/Decorator/RenderInXml.php b/Structural/Decorator/RenderInXml.php
similarity index 100%
rename from Decorator/RenderInXml.php
rename to Structural/Decorator/RenderInXml.php
diff --git a/Decorator/RendererInterface.php b/Structural/Decorator/RendererInterface.php
similarity index 100%
rename from Decorator/RendererInterface.php
rename to Structural/Decorator/RendererInterface.php
diff --git a/Tests/Decorator/DecoratorTest.php b/Structural/Decorator/Test/DecoratorTest.php
similarity index 100%
rename from Tests/Decorator/DecoratorTest.php
rename to Structural/Decorator/Test/DecoratorTest.php
diff --git a/Decorator/Webservice.php b/Structural/Decorator/Webservice.php
similarity index 100%
rename from Decorator/Webservice.php
rename to Structural/Decorator/Webservice.php
diff --git a/DependencyInjection/AbstractConfig.php b/Structural/DependencyInjection/AbstractConfig.php
similarity index 100%
rename from DependencyInjection/AbstractConfig.php
rename to Structural/DependencyInjection/AbstractConfig.php
diff --git a/DependencyInjection/ArrayConfig.php b/Structural/DependencyInjection/ArrayConfig.php
similarity index 100%
rename from DependencyInjection/ArrayConfig.php
rename to Structural/DependencyInjection/ArrayConfig.php
diff --git a/DependencyInjection/Connection.php b/Structural/DependencyInjection/Connection.php
similarity index 100%
rename from DependencyInjection/Connection.php
rename to Structural/DependencyInjection/Connection.php
diff --git a/DependencyInjection/Parameters.php b/Structural/DependencyInjection/Parameters.php
similarity index 100%
rename from DependencyInjection/Parameters.php
rename to Structural/DependencyInjection/Parameters.php
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/Test/DependencyInjectionTest.php
similarity index 100%
rename from Tests/DependencyInjection/DependencyInjectionTest.php
rename to Structural/DependencyInjection/Test/DependencyInjectionTest.php
diff --git a/Tests/DependencyInjection/config.php b/Structural/DependencyInjection/Test/config.php
similarity index 100%
rename from Tests/DependencyInjection/config.php
rename to Structural/DependencyInjection/Test/config.php
diff --git a/Facade/BiosInterface.php b/Structural/Facade/BiosInterface.php
similarity index 100%
rename from Facade/BiosInterface.php
rename to Structural/Facade/BiosInterface.php
diff --git a/Facade/Facade.php b/Structural/Facade/Facade.php
similarity index 100%
rename from Facade/Facade.php
rename to Structural/Facade/Facade.php
diff --git a/Facade/OsInterface.php b/Structural/Facade/OsInterface.php
similarity index 100%
rename from Facade/OsInterface.php
rename to Structural/Facade/OsInterface.php
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/Test/FacadeTest.php
similarity index 100%
rename from Tests/Facade/FacadeTest.php
rename to Structural/Facade/Test/FacadeTest.php
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 100%
rename from FluentInterface/SQL.php
rename to Structural/FluentInterface/SQL.php
diff --git a/Tests/FluentInterface/FluentInterfaceTest.php b/Structural/FluentInterface/Test/FluentInterfaceTest.php
similarity index 100%
rename from Tests/FluentInterface/FluentInterfaceTest.php
rename to Structural/FluentInterface/Test/FluentInterfaceTest.php
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 100%
rename from Proxy/Record.php
rename to Structural/Proxy/Record.php
diff --git a/Proxy/RecordProxy.php b/Structural/Proxy/RecordProxy.php
similarity index 100%
rename from Proxy/RecordProxy.php
rename to Structural/Proxy/RecordProxy.php
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 100%
rename from Registry/Registry.php
rename to Structural/Registry/Registry.php
diff --git a/Registry/index.php b/Structural/Registry/index.php
similarity index 100%
rename from Registry/index.php
rename to Structural/Registry/index.php