diff --git a/Structural/Adapter/README.rst b/Structural/Adapter/README.rst
index 5136d07..dacd97e 100644
--- a/Structural/Adapter/README.rst
+++ b/Structural/Adapter/README.rst
@@ -34,9 +34,9 @@ PaperBookInterface.php
    :language: php
    :linenos:
 
-EBookInterface.php
+Book.php
 
-.. literalinclude:: EBookInterface.php
+.. literalinclude:: Book.php
    :language: php
    :linenos:
 
@@ -46,15 +46,15 @@ EBookAdapter.php
    :language: php
    :linenos:
 
-Kindle.php
+EBookInterface.php
 
-.. literalinclude:: Kindle.php
+.. literalinclude:: EBookInterface.php
    :language: php
    :linenos:
 
-Book.php
+Kindle.php
 
-.. literalinclude:: Book.php
+.. literalinclude:: Kindle.php
    :language: php
    :linenos:
 
diff --git a/Structural/Bridge/README.rst b/Structural/Bridge/README.rst
index 1de59d8..b92fd1c 100644
--- a/Structural/Bridge/README.rst
+++ b/Structural/Bridge/README.rst
@@ -25,27 +25,21 @@ Code
 
 You can also find these code on `GitHub`_
 
-Assemble.php
-
-.. literalinclude:: Assemble.php
-   :language: php
-   :linenos:
-
 Workshop.php
 
 .. literalinclude:: Workshop.php
    :language: php
    :linenos:
 
-Car.php
+Assemble.php
 
-.. literalinclude:: Car.php
+.. literalinclude:: Assemble.php
    :language: php
    :linenos:
 
-Motorcycle.php
+Produce.php
 
-.. literalinclude:: Motorcycle.php
+.. literalinclude:: Produce.php
    :language: php
    :linenos:
 
@@ -55,9 +49,15 @@ Vehicle.php
    :language: php
    :linenos:
 
-Produce.php
+Motorcycle.php
 
-.. literalinclude:: Produce.php
+.. literalinclude:: Motorcycle.php
+   :language: php
+   :linenos:
+
+Car.php
+
+.. literalinclude:: Car.php
    :language: php
    :linenos:
 
diff --git a/Structural/DataMapper/README.rst b/Structural/DataMapper/README.rst
index 83ba501..7fca1e9 100644
--- a/Structural/DataMapper/README.rst
+++ b/Structural/DataMapper/README.rst
@@ -35,18 +35,18 @@ Code
 
 You can also find these code on `GitHub`_
 
-UserMapper.php
-
-.. literalinclude:: UserMapper.php
-   :language: php
-   :linenos:
-
 User.php
 
 .. literalinclude:: User.php
    :language: php
    :linenos:
 
+UserMapper.php
+
+.. literalinclude:: UserMapper.php
+   :language: php
+   :linenos:
+
 Test
 ----
 
diff --git a/Structural/Decorator/README.rst b/Structural/Decorator/README.rst
index 95d234c..b40ac69 100644
--- a/Structural/Decorator/README.rst
+++ b/Structural/Decorator/README.rst
@@ -31,30 +31,30 @@ RendererInterface.php
    :language: php
    :linenos:
 
-RenderInXml.php
-
-.. literalinclude:: RenderInXml.php
-   :language: php
-   :linenos:
-
 Webservice.php
 
 .. literalinclude:: Webservice.php
    :language: php
    :linenos:
 
-RenderInJson.php
-
-.. literalinclude:: RenderInJson.php
-   :language: php
-   :linenos:
-
 Decorator.php
 
 .. literalinclude:: Decorator.php
    :language: php
    :linenos:
 
+RenderInXml.php
+
+.. literalinclude:: RenderInXml.php
+   :language: php
+   :linenos:
+
+RenderInJson.php
+
+.. literalinclude:: RenderInJson.php
+   :language: php
+   :linenos:
+
 Test
 ----
 
diff --git a/Structural/DependencyInjection/README.rst b/Structural/DependencyInjection/README.rst
index 8200cc1..2446c2c 100644
--- a/Structural/DependencyInjection/README.rst
+++ b/Structural/DependencyInjection/README.rst
@@ -45,18 +45,6 @@ Code
 
 You can also find these code on `GitHub`_
 
-Connection.php
-
-.. literalinclude:: Connection.php
-   :language: php
-   :linenos:
-
-ArrayConfig.php
-
-.. literalinclude:: ArrayConfig.php
-   :language: php
-   :linenos:
-
 AbstractConfig.php
 
 .. literalinclude:: AbstractConfig.php
@@ -69,6 +57,18 @@ Parameters.php
    :language: php
    :linenos:
 
+ArrayConfig.php
+
+.. literalinclude:: ArrayConfig.php
+   :language: php
+   :linenos:
+
+Connection.php
+
+.. literalinclude:: Connection.php
+   :language: php
+   :linenos:
+
 Test
 ----
 
diff --git a/Structural/Facade/README.rst b/Structural/Facade/README.rst
index 5be63e7..1148b5e 100644
--- a/Structural/Facade/README.rst
+++ b/Structural/Facade/README.rst
@@ -35,18 +35,18 @@ Code
 
 You can also find these code on `GitHub`_
 
-OsInterface.php
-
-.. literalinclude:: OsInterface.php
-   :language: php
-   :linenos:
-
 Facade.php
 
 .. literalinclude:: Facade.php
    :language: php
    :linenos:
 
+OsInterface.php
+
+.. literalinclude:: OsInterface.php
+   :language: php
+   :linenos:
+
 BiosInterface.php
 
 .. literalinclude:: BiosInterface.php
diff --git a/Structural/Proxy/README.rst b/Structural/Proxy/README.rst
index f9aa24e..b60baea 100644
--- a/Structural/Proxy/README.rst
+++ b/Structural/Proxy/README.rst
@@ -25,18 +25,18 @@ Code
 
 You can also find these code on `GitHub`_
 
-RecordProxy.php
-
-.. literalinclude:: RecordProxy.php
-   :language: php
-   :linenos:
-
 Record.php
 
 .. literalinclude:: Record.php
    :language: php
    :linenos:
 
+RecordProxy.php
+
+.. literalinclude:: RecordProxy.php
+   :language: php
+   :linenos:
+
 Test
 ----
 
diff --git a/conf.py b/conf.py
index 6df45f4..87f2d27 100644
--- a/conf.py
+++ b/conf.py
@@ -47,8 +47,8 @@ master_doc = 'README'
 
 # General information about the project.
 project = u'DesignPatternsPHP'
-copyright = u'2015, Dominik Liebler'
-author = u'Dominik Liebler with contributors'
+copyright = u'2015, Dominik Liebler and contributors'
+author = u'Dominik Liebler and contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -223,7 +223,7 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
   (master_doc, 'DesignPatternsPHP.tex', u'DesignPatternsPHP Documentation',
-   u'Dominik Liebler  with contributors', 'manual'),
+   u'Dominik Liebler and contributors', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of