diff --git a/Structural/Adapter/Test/AdapterTest.php b/Structural/Adapter/AdapterTest.php
similarity index 77%
rename from Structural/Adapter/Test/AdapterTest.php
rename to Structural/Adapter/AdapterTest.php
index 370a6c3..55cc5e2 100644
--- a/Structural/Adapter/Test/AdapterTest.php
+++ b/Structural/Adapter/AdapterTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace DesignPatterns\Tests\Adapter;
+namespace DesignPatterns\Structural\Adapter;
 
-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
diff --git a/Structural/Adapter/Book.php b/Structural/Adapter/Book.php
index d993891..f0ce83c 100644
--- a/Structural/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/Structural/Adapter/EBookAdapter.php b/Structural/Adapter/EBookAdapter.php
index 6240da1..ed0fb17 100644
--- a/Structural/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/Structural/Adapter/EBookInterface.php b/Structural/Adapter/EBookInterface.php
index 86eed82..15e0222 100644
--- a/Structural/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/Structural/Adapter/Kindle.php b/Structural/Adapter/Kindle.php
index 72d89e6..760e5f8 100644
--- a/Structural/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/Structural/Adapter/PaperBookInterface.php b/Structural/Adapter/PaperBookInterface.php
index be748eb..12f3103 100644
--- a/Structural/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/Structural/Composite/Test/FormTest.php b/Structural/Composite/CompositeTest.php
similarity index 77%
rename from Structural/Composite/Test/FormTest.php
rename to Structural/Composite/CompositeTest.php
index 8a2aae3..d6472a3 100644
--- a/Structural/Composite/Test/FormTest.php
+++ b/Structural/Composite/CompositeTest.php
@@ -2,12 +2,12 @@
 
 namespace DesignPatterns\Test\Composite;
 
-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,6 @@ class FormTest extends \PHPUnit_Framework_TestCase
      */
     public function testFormImplementsFormEelement()
     {
-        $this->assertTrue(is_subclass_of('DesignPatterns\Composite\Form', 'DesignPatterns\Composite\FormElement'));
+        $this->assertTrue(is_subclass_of('DesignPatterns\Structural\Composite\Form', 'DesignPatterns\Structural\Composite\FormElement'));
     }
 }
diff --git a/Structural/Composite/Form.php b/Structural/Composite/Form.php
index 66248c2..fbf3b50 100644
--- a/Structural/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/Structural/Composite/FormElement.php b/Structural/Composite/FormElement.php
index ab95c67..8063c89 100644
--- a/Structural/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/Structural/Composite/InputElement.php b/Structural/Composite/InputElement.php
index 7a65241..30d8615 100644
--- a/Structural/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/Structural/Composite/TextElement.php b/Structural/Composite/TextElement.php
index 9ea4a4e..ed50294 100644
--- a/Structural/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/Structural/DataMapper/Test/UserMapperTest.php b/Structural/DataMapper/DataMapperTest.php
similarity index 87%
rename from Structural/DataMapper/Test/UserMapperTest.php
rename to Structural/DataMapper/DataMapperTest.php
index bd2d1c1..e6b110e 100644
--- a/Structural/DataMapper/Test/UserMapperTest.php
+++ b/Structural/DataMapper/DataMapperTest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace DesignPatterns\Test\DataMapper;
+namespace DesignPatterns\Structural\DataMapper;
 
-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();
@@ -90,7 +90,7 @@ class UserMapperTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage User #404 not found
      */
     public function testNotFound()
diff --git a/Structural/DataMapper/User.php b/Structural/DataMapper/User.php
index 12f8779..78e60a8 100644
--- a/Structural/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/Structural/DataMapper/UserMapper.php b/Structural/DataMapper/UserMapper.php
index a9d65e7..0ee5352 100644
--- a/Structural/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/Structural/Decorator/Decorator.php b/Structural/Decorator/Decorator.php
index d7fb9ae..f6e377e 100644
--- a/Structural/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/Structural/Decorator/Test/DecoratorTest.php b/Structural/Decorator/DecoratorTest.php
similarity index 72%
rename from Structural/Decorator/Test/DecoratorTest.php
rename to Structural/Decorator/DecoratorTest.php
index c6202dd..9414524 100644
--- a/Structural/Decorator/Test/DecoratorTest.php
+++ b/Structural/Decorator/DecoratorTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Tests\Decorator;
+namespace DesignPatterns\Structural\Decorator;
 
-use DesignPatterns\Decorator;
+use DesignPatterns\Structural\Decorator;
 
 /**
  * DecoratorTest tests the decorator pattern
@@ -38,7 +38,7 @@ class DecoratorTest extends \PHPUnit_Framework_TestCase
      */
     public function testDecoratorMustImplementsRenderer()
     {
-        $this->assertTrue(is_subclass_of('DesignPatterns\Decorator\Decorator', 'DesignPatterns\Decorator\RendererInterface'));
+        $this->assertTrue(is_subclass_of('DesignPatterns\Structural\Decorator\Decorator', 'DesignPatterns\Structural\Decorator\RendererInterface'));
     }
 
     /**
@@ -48,7 +48,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 +56,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/Structural/Decorator/RenderInJson.php b/Structural/Decorator/RenderInJson.php
index 0edc7ea..ebcc577 100644
--- a/Structural/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/Structural/Decorator/RenderInXml.php b/Structural/Decorator/RenderInXml.php
index 56b7e44..f8e92a0 100644
--- a/Structural/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/Structural/Decorator/RendererInterface.php b/Structural/Decorator/RendererInterface.php
index f5f3e3f..2957970 100644
--- a/Structural/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/Structural/Decorator/Webservice.php b/Structural/Decorator/Webservice.php
index a23f42c..e6bf306 100644
--- a/Structural/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/Structural/DependencyInjection/AbstractConfig.php b/Structural/DependencyInjection/AbstractConfig.php
index 9b20882..85e5245 100644
--- a/Structural/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/Structural/DependencyInjection/ArrayConfig.php b/Structural/DependencyInjection/ArrayConfig.php
index e2dcc5e..15a9462 100644
--- a/Structural/DependencyInjection/ArrayConfig.php
+++ b/Structural/DependencyInjection/ArrayConfig.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\DependencyInjection;
+namespace DesignPatterns\Structural\DependencyInjection;
 
 /**
  * class ArrayConfig
diff --git a/Structural/DependencyInjection/Connection.php b/Structural/DependencyInjection/Connection.php
index 573de0a..9e131c2 100644
--- a/Structural/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/Structural/DependencyInjection/Test/DependencyInjectionTest.php b/Structural/DependencyInjection/DependencyInjectionTest.php
similarity index 61%
rename from Structural/DependencyInjection/Test/DependencyInjectionTest.php
rename to Structural/DependencyInjection/DependencyInjectionTest.php
index 34e9e76..1e7f638 100644
--- a/Structural/DependencyInjection/Test/DependencyInjectionTest.php
+++ b/Structural/DependencyInjection/DependencyInjectionTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace DesignPatterns\Tests\DependencyInjection;
+namespace DesignPatterns\Structural\DependencyInjection;
 
-use DesignPatterns\DependencyInjection\Parameters;
-use DesignPatterns\DependencyInjection\AbstractConfig;
-use DesignPatterns\DependencyInjection\ArrayConfig;
-use DesignPatterns\DependencyInjection\Connection;
+use DesignPatterns\Structural\DependencyInjection\Parameters;
+use DesignPatterns\Structural\DependencyInjection\AbstractConfig;
+use DesignPatterns\Structural\DependencyInjection\ArrayConfig;
+use DesignPatterns\Structural\DependencyInjection\Connection;
 
 class DependencyInjectionTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/Structural/DependencyInjection/Parameters.php b/Structural/DependencyInjection/Parameters.php
index a30f1a9..679df3a 100644
--- a/Structural/DependencyInjection/Parameters.php
+++ b/Structural/DependencyInjection/Parameters.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\DependencyInjection;
+namespace DesignPatterns\Structural\DependencyInjection;
 
 /**
  * Parameters interface
diff --git a/Structural/DependencyInjection/Test/config.php b/Structural/DependencyInjection/config.php
similarity index 100%
rename from Structural/DependencyInjection/Test/config.php
rename to Structural/DependencyInjection/config.php
diff --git a/Structural/Facade/BiosInterface.php b/Structural/Facade/BiosInterface.php
index 377651c..869dcd9 100644
--- a/Structural/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/Structural/Facade/Facade.php b/Structural/Facade/Facade.php
index 3d82332..d40d412 100644
--- a/Structural/Facade/Facade.php
+++ b/Structural/Facade/Facade.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Facade;
+namespace DesignPatterns\Structural\Facade;
 
 /**
  *
diff --git a/Structural/Facade/Test/FacadeTest.php b/Structural/Facade/FacadeTest.php
similarity index 79%
rename from Structural/Facade/Test/FacadeTest.php
rename to Structural/Facade/FacadeTest.php
index 0d91521..cd7d8a4 100644
--- a/Structural/Facade/Test/FacadeTest.php
+++ b/Structural/Facade/FacadeTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Tests\Facade;
+namespace DesignPatterns\Structural\Facade;
 
-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/Structural/Facade/OsInterface.php b/Structural/Facade/OsInterface.php
index e81c7f1..3b09eb1 100644
--- a/Structural/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/Structural/FluentInterface/Test/FluentInterfaceTest.php b/Structural/FluentInterface/FluentInterfaceTest.php
similarity index 76%
rename from Structural/FluentInterface/Test/FluentInterfaceTest.php
rename to Structural/FluentInterface/FluentInterfaceTest.php
index 63be030..7832c30 100644
--- a/Structural/FluentInterface/Test/FluentInterfaceTest.php
+++ b/Structural/FluentInterface/FluentInterfaceTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Tests\FluentInterface;
+namespace DesignPatterns\Structural\FluentInterface;
 
-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/Structural/FluentInterface/SQL.php b/Structural/FluentInterface/SQL.php
index 6b7d82d..3afd300 100644
--- a/Structural/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/Structural/Proxy/Record.php b/Structural/Proxy/Record.php
index 28d861c..38481aa 100644
--- a/Structural/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/Structural/Proxy/RecordProxy.php b/Structural/Proxy/RecordProxy.php
index 63f7904..1f68cff 100644
--- a/Structural/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/Registry/Registry.php b/Structural/Registry/Registry.php
index 11df8d6..d1c6b13 100644
--- a/Structural/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/RegistryTest.php b/Structural/Registry/RegistryTest.php
new file mode 100644
index 0000000..f7b3f48
--- /dev/null
+++ b/Structural/Registry/RegistryTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace DesignPatterns\Structural\Registry;
+
+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/Structural/Registry/index.php b/Structural/Registry/index.php
deleted file mode 100644
index 2b0ecba..0000000
--- a/Structural/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');