From 0c774a89e4fdf82da3645df1c9bc56d902d4abca Mon Sep 17 00:00:00 2001
From: Antonio Spinelli <tonicospinelli85@gmail.com>
Date: Mon, 5 May 2014 12:00:18 -0300
Subject: [PATCH] create a Test folder for each pattern

---
 .../ChainOfResponsibilities/{ => Tests}/ChainTest.php     | 2 +-
 Behavioral/Command/{ => Tests}/CommandTest.php            | 2 +-
 Behavioral/Iterator/{ => Tests}/IteratorTest.php          | 2 +-
 Behavioral/Mediator/{ => Tests}/MediatorTest.php          | 2 +-
 Behavioral/Memento/{ => Tests}/MementoTest.php            | 4 +++-
 Behavioral/NullObject/{ => Tests}/LoggerTest.php          | 2 +-
 Behavioral/Observer/{ => Tests}/ObserverTest.php          | 2 +-
 .../Specification/{ => Tests}/SpecificationTest.php       | 2 +-
 Behavioral/Strategy/{ => Tests}/StrategyTest.php          | 2 +-
 Behavioral/TemplateMethod/{ => Tests}/JourneyTest.php     | 2 +-
 Behavioral/Visitor/{ => Tests}/VisitorTest.php            | 2 +-
 .../AbstractFactory/{ => Tests}/AbstractFactoryTest.php   | 2 +-
 Creational/Builder/{ => Tests}/DirectorTest.php           | 2 +-
 .../FactoryMethod/{ => Tests}/FactoryMethodTest.php       | 2 +-
 Creational/Pool/{ => Tests}/PoolTest.php                  | 6 ++++--
 .../SimpleFactory/{ => Tests}/SimpleFactoryTest.php       | 2 +-
 Creational/Singleton/{ => Tests}/SingletonTest.php        | 2 +-
 .../StaticFactory/{ => Tests}/StaticFactoryTest.php       | 2 +-
 More/Delegation/{ => Tests}/DelegationTest.php            | 2 +-
 More/ServiceLocator/{ => Tests}/ServiceLocatorTest.php    | 2 +-
 Structural/Adapter/{ => Tests}/AdapterTest.php            | 2 +-
 Structural/Bridge/{ => Tests}/BridgeTest.php              | 7 ++++++-
 Structural/Composite/{ => Tests}/CompositeTest.php        | 2 +-
 Structural/DataMapper/{ => Tests}/DataMapperTest.php      | 2 +-
 Structural/Decorator/{ => Tests}/DecoratorTest.php        | 2 +-
 .../{ => Tests}/DependencyInjectionTest.php               | 4 +---
 Structural/DependencyInjection/{ => Tests}/config.php     | 0
 Structural/Facade/{ => Tests}/FacadeTest.php              | 2 +-
 .../FluentInterface/{ => Tests}/FluentInterfaceTest.php   | 2 +-
 Structural/Registry/{ => Tests}/RegistryTest.php          | 2 +-
 phpunit.xml.dist                                          | 8 ++++----
 31 files changed, 43 insertions(+), 36 deletions(-)
 rename Behavioral/ChainOfResponsibilities/{ => Tests}/ChainTest.php (97%)
 rename Behavioral/Command/{ => Tests}/CommandTest.php (93%)
 rename Behavioral/Iterator/{ => Tests}/IteratorTest.php (97%)
 rename Behavioral/Mediator/{ => Tests}/MediatorTest.php (95%)
 rename Behavioral/Memento/{ => Tests}/MementoTest.php (94%)
 rename Behavioral/NullObject/{ => Tests}/LoggerTest.php (94%)
 rename Behavioral/Observer/{ => Tests}/ObserverTest.php (96%)
 rename Behavioral/Specification/{ => Tests}/SpecificationTest.php (98%)
 rename Behavioral/Strategy/{ => Tests}/StrategyTest.php (97%)
 rename Behavioral/TemplateMethod/{ => Tests}/JourneyTest.php (94%)
 rename Behavioral/Visitor/{ => Tests}/VisitorTest.php (95%)
 rename Creational/AbstractFactory/{ => Tests}/AbstractFactoryTest.php (95%)
 rename Creational/Builder/{ => Tests}/DirectorTest.php (95%)
 rename Creational/FactoryMethod/{ => Tests}/FactoryMethodTest.php (95%)
 rename Creational/Pool/{ => Tests}/PoolTest.php (69%)
 rename Creational/SimpleFactory/{ => Tests}/SimpleFactoryTest.php (93%)
 rename Creational/Singleton/{ => Tests}/SingletonTest.php (92%)
 rename Creational/StaticFactory/{ => Tests}/StaticFactoryTest.php (90%)
 rename More/Delegation/{ => Tests}/DelegationTest.php (89%)
 rename More/ServiceLocator/{ => Tests}/ServiceLocatorTest.php (98%)
 rename Structural/Adapter/{ => Tests}/AdapterTest.php (95%)
 rename Structural/Bridge/{ => Tests}/BridgeTest.php (67%)
 rename Structural/Composite/{ => Tests}/CompositeTest.php (95%)
 rename Structural/DataMapper/{ => Tests}/DataMapperTest.php (98%)
 rename Structural/Decorator/{ => Tests}/DecoratorTest.php (97%)
 rename Structural/DependencyInjection/{ => Tests}/DependencyInjectionTest.php (76%)
 rename Structural/DependencyInjection/{ => Tests}/config.php (100%)
 rename Structural/Facade/{ => Tests}/FacadeTest.php (96%)
 rename Structural/FluentInterface/{ => Tests}/FluentInterfaceTest.php (89%)
 rename Structural/Registry/{ => Tests}/RegistryTest.php (86%)

diff --git a/Behavioral/ChainOfResponsibilities/ChainTest.php b/Behavioral/ChainOfResponsibilities/Tests/ChainTest.php
similarity index 97%
rename from Behavioral/ChainOfResponsibilities/ChainTest.php
rename to Behavioral/ChainOfResponsibilities/Tests/ChainTest.php
index 9fe7f30fa..4733d6fdb 100644
--- a/Behavioral/ChainOfResponsibilities/ChainTest.php
+++ b/Behavioral/ChainOfResponsibilities/Tests/ChainTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Behavioral\ChainOfResponsibilities;
+namespace DesignPatterns\Behavioral\ChainOfResponsibilities\Tests;
 
 use DesignPatterns\Behavioral\ChainOfResponsibilities\Request;
 use DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\FastStorage;
diff --git a/Behavioral/Command/CommandTest.php b/Behavioral/Command/Tests/CommandTest.php
similarity index 93%
rename from Behavioral/Command/CommandTest.php
rename to Behavioral/Command/Tests/CommandTest.php
index eb48f14c2..abf731763 100644
--- a/Behavioral/Command/CommandTest.php
+++ b/Behavioral/Command/Tests/CommandTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Behavioral\Command;
+namespace DesignPatterns\Behavioral\Command\Tests;
 
 use DesignPatterns\Behavioral\Command\Invoker;
 use DesignPatterns\Behavioral\Command\Receiver;
diff --git a/Behavioral/Iterator/IteratorTest.php b/Behavioral/Iterator/Tests/IteratorTest.php
similarity index 97%
rename from Behavioral/Iterator/IteratorTest.php
rename to Behavioral/Iterator/Tests/IteratorTest.php
index 83cdb0f39..2e117d8fc 100644
--- a/Behavioral/Iterator/IteratorTest.php
+++ b/Behavioral/Iterator/Tests/IteratorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Behavioral\Iterator;
+namespace DesignPatterns\Behavioral\Iterator\Tests;
 
 use DesignPatterns\Behavioral\Iterator\Book;
 use DesignPatterns\Behavioral\Iterator\BookList;
diff --git a/Behavioral/Mediator/MediatorTest.php b/Behavioral/Mediator/Tests/MediatorTest.php
similarity index 95%
rename from Behavioral/Mediator/MediatorTest.php
rename to Behavioral/Mediator/Tests/MediatorTest.php
index a2c91669a..13abe484f 100644
--- a/Behavioral/Mediator/MediatorTest.php
+++ b/Behavioral/Mediator/Tests/MediatorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Tests\Mediator;
+namespace DesignPatterns\Tests\Mediator\Tests;
 
 use DesignPatterns\Behavioral\Mediator\Mediator;
 use DesignPatterns\Behavioral\Mediator\Subsystem\Database;
diff --git a/Behavioral/Memento/MementoTest.php b/Behavioral/Memento/Tests/MementoTest.php
similarity index 94%
rename from Behavioral/Memento/MementoTest.php
rename to Behavioral/Memento/Tests/MementoTest.php
index 4d25d4df8..88110a63c 100644
--- a/Behavioral/Memento/MementoTest.php
+++ b/Behavioral/Memento/Tests/MementoTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace DesignPatterns\Behavioral\Memento;
+namespace DesignPatterns\Behavioral\Memento\Tests;
+
+use DesignPatterns\Behavioral\Memento\Originator;
 
 /**
  * MementoTest tests the memento pattern
diff --git a/Behavioral/NullObject/LoggerTest.php b/Behavioral/NullObject/Tests/LoggerTest.php
similarity index 94%
rename from Behavioral/NullObject/LoggerTest.php
rename to Behavioral/NullObject/Tests/LoggerTest.php
index a67b814c6..a8e7bf583 100644
--- a/Behavioral/NullObject/LoggerTest.php
+++ b/Behavioral/NullObject/Tests/LoggerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Behavioral\NullObject;
+namespace DesignPatterns\Behavioral\NullObject\Tests;
 
 use DesignPatterns\Behavioral\NullObject\NullLogger;
 use DesignPatterns\Behavioral\NullObject\Service;
diff --git a/Behavioral/Observer/ObserverTest.php b/Behavioral/Observer/Tests/ObserverTest.php
similarity index 96%
rename from Behavioral/Observer/ObserverTest.php
rename to Behavioral/Observer/Tests/ObserverTest.php
index 0ecd9c9b4..233de283f 100644
--- a/Behavioral/Observer/ObserverTest.php
+++ b/Behavioral/Observer/Tests/ObserverTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Behavioral\Observer;
+namespace DesignPatterns\Behavioral\Observer\Tests;
 
 use DesignPatterns\Behavioral\Observer\UserObserver;
 use DesignPatterns\Behavioral\Observer\User;
diff --git a/Behavioral/Specification/SpecificationTest.php b/Behavioral/Specification/Tests/SpecificationTest.php
similarity index 98%
rename from Behavioral/Specification/SpecificationTest.php
rename to Behavioral/Specification/Tests/SpecificationTest.php
index 70611b038..2677cad8c 100644
--- a/Behavioral/Specification/SpecificationTest.php
+++ b/Behavioral/Specification/Tests/SpecificationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Behavioral\Specification;
+namespace DesignPatterns\Behavioral\Specification\Tests;
 
 use DesignPatterns\Behavioral\Specification\PriceSpecification;
 use DesignPatterns\Behavioral\Specification\Item;
diff --git a/Behavioral/Strategy/StrategyTest.php b/Behavioral/Strategy/Tests/StrategyTest.php
similarity index 97%
rename from Behavioral/Strategy/StrategyTest.php
rename to Behavioral/Strategy/Tests/StrategyTest.php
index addb73168..927ae19d4 100644
--- a/Behavioral/Strategy/StrategyTest.php
+++ b/Behavioral/Strategy/Tests/StrategyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Behavioral\Strategy;
+namespace DesignPatterns\Behavioral\Strategy\Tests;
 
 use DesignPatterns\Behavioral\Strategy\DateComparator;
 use DesignPatterns\Behavioral\Strategy\IdComparator;
diff --git a/Behavioral/TemplateMethod/JourneyTest.php b/Behavioral/TemplateMethod/Tests/JourneyTest.php
similarity index 94%
rename from Behavioral/TemplateMethod/JourneyTest.php
rename to Behavioral/TemplateMethod/Tests/JourneyTest.php
index b99f2aa20..d0b134c6c 100644
--- a/Behavioral/TemplateMethod/JourneyTest.php
+++ b/Behavioral/TemplateMethod/Tests/JourneyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Behavioral\TemplateMethod;
+namespace DesignPatterns\Behavioral\TemplateMethod\Tests;
 
 use DesignPatterns\Behavioral\TemplateMethod;
 
diff --git a/Behavioral/Visitor/VisitorTest.php b/Behavioral/Visitor/Tests/VisitorTest.php
similarity index 95%
rename from Behavioral/Visitor/VisitorTest.php
rename to Behavioral/Visitor/Tests/VisitorTest.php
index 104c7706b..6d71658ea 100644
--- a/Behavioral/Visitor/VisitorTest.php
+++ b/Behavioral/Visitor/Tests/VisitorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Tests\Visitor;
+namespace DesignPatterns\Tests\Visitor\Tests;
 
 use DesignPatterns\Behavioral\Visitor;
 
diff --git a/Creational/AbstractFactory/AbstractFactoryTest.php b/Creational/AbstractFactory/Tests/AbstractFactoryTest.php
similarity index 95%
rename from Creational/AbstractFactory/AbstractFactoryTest.php
rename to Creational/AbstractFactory/Tests/AbstractFactoryTest.php
index 3fafb3aa0..9c61f96d4 100644
--- a/Creational/AbstractFactory/AbstractFactoryTest.php
+++ b/Creational/AbstractFactory/Tests/AbstractFactoryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Creational\AbstractFactory;
+namespace DesignPatterns\Creational\AbstractFactory\Tests;
 
 use DesignPatterns\Creational\AbstractFactory\AbstractFactory;
 use DesignPatterns\Creational\AbstractFactory\HtmlFactory;
diff --git a/Creational/Builder/DirectorTest.php b/Creational/Builder/Tests/DirectorTest.php
similarity index 95%
rename from Creational/Builder/DirectorTest.php
rename to Creational/Builder/Tests/DirectorTest.php
index d1d0ab713..90cdb39ff 100644
--- a/Creational/Builder/DirectorTest.php
+++ b/Creational/Builder/Tests/DirectorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Creational\Builder;
+namespace DesignPatterns\Creational\Builder\Tests;
 
 use DesignPatterns\Creational\Builder\Director;
 use DesignPatterns\Creational\Builder\CarBuilder;
diff --git a/Creational/FactoryMethod/FactoryMethodTest.php b/Creational/FactoryMethod/Tests/FactoryMethodTest.php
similarity index 95%
rename from Creational/FactoryMethod/FactoryMethodTest.php
rename to Creational/FactoryMethod/Tests/FactoryMethodTest.php
index 08f58f07f..acbe0c648 100644
--- a/Creational/FactoryMethod/FactoryMethodTest.php
+++ b/Creational/FactoryMethod/Tests/FactoryMethodTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Creational\FactoryMethod;
+namespace DesignPatterns\Creational\FactoryMethod\Tests;
 
 use DesignPatterns\Creational\FactoryMethod\FactoryMethod;
 use DesignPatterns\Creational\FactoryMethod\GermanFactory;
diff --git a/Creational/Pool/PoolTest.php b/Creational/Pool/Tests/PoolTest.php
similarity index 69%
rename from Creational/Pool/PoolTest.php
rename to Creational/Pool/Tests/PoolTest.php
index e0b062d29..91fde010c 100644
--- a/Creational/Pool/PoolTest.php
+++ b/Creational/Pool/Tests/PoolTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace DesignPatterns\Creational\Pool;
+namespace DesignPatterns\Creational\Pool\Tests;
+
+use DesignPatterns\Creational\Pool\Pool;
 
 class TestWorker
 {
@@ -13,7 +15,7 @@ class PoolTest extends \PHPUnit_Framework_TestCase
 
     public function testPool()
     {
-        $pool = new Pool('DesignPatterns\Creational\Pool\TestWorker');
+        $pool = new Pool('DesignPatterns\Creational\Pool\Tests\TestWorker');
         $worker = $pool->get();
 
         $this->assertEquals(1, $worker->id);
diff --git a/Creational/SimpleFactory/SimpleFactoryTest.php b/Creational/SimpleFactory/Tests/SimpleFactoryTest.php
similarity index 93%
rename from Creational/SimpleFactory/SimpleFactoryTest.php
rename to Creational/SimpleFactory/Tests/SimpleFactoryTest.php
index 123360978..1fffda3e7 100644
--- a/Creational/SimpleFactory/SimpleFactoryTest.php
+++ b/Creational/SimpleFactory/Tests/SimpleFactoryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Creational\SimpleFactory;
+namespace DesignPatterns\Creational\SimpleFactory\Tests;
 
 use DesignPatterns\Creational\SimpleFactory\ConcreteFactory;
 
diff --git a/Creational/Singleton/SingletonTest.php b/Creational/Singleton/Tests/SingletonTest.php
similarity index 92%
rename from Creational/Singleton/SingletonTest.php
rename to Creational/Singleton/Tests/SingletonTest.php
index c39fbbc42..07abf7cd4 100644
--- a/Creational/Singleton/SingletonTest.php
+++ b/Creational/Singleton/Tests/SingletonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Creational\Singleton;
+namespace DesignPatterns\Creational\Singleton\Tests;
 
 use DesignPatterns\Creational\Singleton\Singleton;
 
diff --git a/Creational/StaticFactory/StaticFactoryTest.php b/Creational/StaticFactory/Tests/StaticFactoryTest.php
similarity index 90%
rename from Creational/StaticFactory/StaticFactoryTest.php
rename to Creational/StaticFactory/Tests/StaticFactoryTest.php
index 1582e56ca..e8bb7a5df 100644
--- a/Creational/StaticFactory/StaticFactoryTest.php
+++ b/Creational/StaticFactory/Tests/StaticFactoryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Creational\StaticFactory;
+namespace DesignPatterns\Creational\StaticFactory\Tests;
 
 use DesignPatterns\Creational\StaticFactory\StaticFactory;
 
diff --git a/More/Delegation/DelegationTest.php b/More/Delegation/Tests/DelegationTest.php
similarity index 89%
rename from More/Delegation/DelegationTest.php
rename to More/Delegation/Tests/DelegationTest.php
index 5823f8576..b19f871cd 100644
--- a/More/Delegation/DelegationTest.php
+++ b/More/Delegation/Tests/DelegationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\More\Delegation;
+namespace DesignPatterns\More\Delegation\Tests;
 
 use DesignPatterns\More\Delegation;
 
diff --git a/More/ServiceLocator/ServiceLocatorTest.php b/More/ServiceLocator/Tests/ServiceLocatorTest.php
similarity index 98%
rename from More/ServiceLocator/ServiceLocatorTest.php
rename to More/ServiceLocator/Tests/ServiceLocatorTest.php
index 5e20cc77c..14e5974b0 100644
--- a/More/ServiceLocator/ServiceLocatorTest.php
+++ b/More/ServiceLocator/Tests/ServiceLocatorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\More\ServiceLocator;
+namespace DesignPatterns\More\ServiceLocator\Tests;
 
 use DesignPatterns\More\ServiceLocator\DatabaseService;
 use DesignPatterns\More\ServiceLocator\LogService;
diff --git a/Structural/Adapter/AdapterTest.php b/Structural/Adapter/Tests/AdapterTest.php
similarity index 95%
rename from Structural/Adapter/AdapterTest.php
rename to Structural/Adapter/Tests/AdapterTest.php
index 0d8673909..258e75596 100644
--- a/Structural/Adapter/AdapterTest.php
+++ b/Structural/Adapter/Tests/AdapterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Structural\Adapter;
+namespace DesignPatterns\Structural\Adapter\Tests;
 
 use DesignPatterns\Structural\Adapter\EBookAdapter;
 use DesignPatterns\Structural\Adapter\Kindle;
diff --git a/Structural/Bridge/BridgeTest.php b/Structural/Bridge/Tests/BridgeTest.php
similarity index 67%
rename from Structural/Bridge/BridgeTest.php
rename to Structural/Bridge/Tests/BridgeTest.php
index d1095533f..e07afe996 100644
--- a/Structural/Bridge/BridgeTest.php
+++ b/Structural/Bridge/Tests/BridgeTest.php
@@ -1,6 +1,11 @@
 <?php
 
-namespace DesignPatterns\Structural\Bridge;
+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
 {
diff --git a/Structural/Composite/CompositeTest.php b/Structural/Composite/Tests/CompositeTest.php
similarity index 95%
rename from Structural/Composite/CompositeTest.php
rename to Structural/Composite/Tests/CompositeTest.php
index 50b31310f..71aa98efe 100644
--- a/Structural/Composite/CompositeTest.php
+++ b/Structural/Composite/Tests/CompositeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Test\Composite;
+namespace DesignPatterns\Test\Composite\Tests;
 
 use DesignPatterns\Structural\Composite;
 
diff --git a/Structural/DataMapper/DataMapperTest.php b/Structural/DataMapper/Tests/DataMapperTest.php
similarity index 98%
rename from Structural/DataMapper/DataMapperTest.php
rename to Structural/DataMapper/Tests/DataMapperTest.php
index b5f7c4c07..fb531e963 100644
--- a/Structural/DataMapper/DataMapperTest.php
+++ b/Structural/DataMapper/Tests/DataMapperTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Structural\DataMapper;
+namespace DesignPatterns\Structural\DataMapper\Tests;
 
 use DesignPatterns\Structural\DataMapper\UserMapper;
 use DesignPatterns\Structural\DataMapper\User;
diff --git a/Structural/Decorator/DecoratorTest.php b/Structural/Decorator/Tests/DecoratorTest.php
similarity index 97%
rename from Structural/Decorator/DecoratorTest.php
rename to Structural/Decorator/Tests/DecoratorTest.php
index 31adc2fcf..a824625b7 100644
--- a/Structural/Decorator/DecoratorTest.php
+++ b/Structural/Decorator/Tests/DecoratorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Structural\Decorator;
+namespace DesignPatterns\Structural\Decorator\Tests;
 
 use DesignPatterns\Structural\Decorator;
 
diff --git a/Structural/DependencyInjection/DependencyInjectionTest.php b/Structural/DependencyInjection/Tests/DependencyInjectionTest.php
similarity index 76%
rename from Structural/DependencyInjection/DependencyInjectionTest.php
rename to Structural/DependencyInjection/Tests/DependencyInjectionTest.php
index 1e7f638a1..6df82a71a 100644
--- a/Structural/DependencyInjection/DependencyInjectionTest.php
+++ b/Structural/DependencyInjection/Tests/DependencyInjectionTest.php
@@ -1,9 +1,7 @@
 <?php
 
-namespace DesignPatterns\Structural\DependencyInjection;
+namespace DesignPatterns\Structural\DependencyInjection\Tests;
 
-use DesignPatterns\Structural\DependencyInjection\Parameters;
-use DesignPatterns\Structural\DependencyInjection\AbstractConfig;
 use DesignPatterns\Structural\DependencyInjection\ArrayConfig;
 use DesignPatterns\Structural\DependencyInjection\Connection;
 
diff --git a/Structural/DependencyInjection/config.php b/Structural/DependencyInjection/Tests/config.php
similarity index 100%
rename from Structural/DependencyInjection/config.php
rename to Structural/DependencyInjection/Tests/config.php
diff --git a/Structural/Facade/FacadeTest.php b/Structural/Facade/Tests/FacadeTest.php
similarity index 96%
rename from Structural/Facade/FacadeTest.php
rename to Structural/Facade/Tests/FacadeTest.php
index cd7d8a443..eccb9bec1 100644
--- a/Structural/Facade/FacadeTest.php
+++ b/Structural/Facade/Tests/FacadeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Structural\Facade;
+namespace DesignPatterns\Structural\Facade\Tests;
 
 use DesignPatterns\Structural\Facade\Facade as Computer;
 
diff --git a/Structural/FluentInterface/FluentInterfaceTest.php b/Structural/FluentInterface/Tests/FluentInterfaceTest.php
similarity index 89%
rename from Structural/FluentInterface/FluentInterfaceTest.php
rename to Structural/FluentInterface/Tests/FluentInterfaceTest.php
index 7832c300f..98ea99d3a 100644
--- a/Structural/FluentInterface/FluentInterfaceTest.php
+++ b/Structural/FluentInterface/Tests/FluentInterfaceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Structural\FluentInterface;
+namespace DesignPatterns\Structural\FluentInterface\Tests;
 
 use DesignPatterns\Structural\FluentInterface\Sql;
 
diff --git a/Structural/Registry/RegistryTest.php b/Structural/Registry/Tests/RegistryTest.php
similarity index 86%
rename from Structural/Registry/RegistryTest.php
rename to Structural/Registry/Tests/RegistryTest.php
index f7b3f48d8..64685d4ff 100644
--- a/Structural/Registry/RegistryTest.php
+++ b/Structural/Registry/Tests/RegistryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Structural\Registry;
+namespace DesignPatterns\Structural\Registry\Tests;
 
 use DesignPatterns\Structural\Registry\Registry;
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0f034279b..f08bbb223 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -3,10 +3,10 @@
 
     <testsuites>
         <testsuite name="Design Patterns">
-            <directory suffix="Test.php">Behavioral</directory>
-            <directory suffix="Test.php">Creational</directory>
-            <directory suffix="Test.php">More</directory>
-            <directory suffix="Test.php">Structural</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>