diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..22d0d82
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+vendor
diff --git a/README.md b/README.md
index dbbb1e0..81bd69b 100644
--- a/README.md
+++ b/README.md
@@ -20,8 +20,19 @@ if you need to.
     namespacer.phar map --mapfile types.php --source path/to/src
     ```
 
-* Second, transform the types located in the map file:
+* Second, if you want to maintain legacy classes extending your new ones:
+
+    ```
+    namespacer.phar legacy --mapfile types.php --target path/for/legacy/files
+    ```
+
+* Thirdly, transform the types located in the map file:
 
     ```
     namespacer.phar transform --mapfile types.php
     ```
+
+* Last, fix any used namespaces
+    ```
+    namespacer.phar fix --mapfile types.php --target path/to/src
+    ```
diff --git a/composer.json b/composer.json
index a7c2ed5..95f262f 100644
--- a/composer.json
+++ b/composer.json
@@ -20,18 +20,21 @@
     },
     "require": {
         "php": ">=5.3.3",
-        "zendframework/zend-mvc": ">=2.0.0",
-        "zendframework/zend-modulemanager": ">=2.0.0",
-        "zendframework/zend-console": ">=2.0.0",
-        "zendframework/zend-code": ">=2.0.0",
-        "zendframework/zend-config": ">=2.0.0",
-        "zendframework/zend-view": ">=2.0.0",
-        "zendframework/zend-stdlib": ">=2.0.0",
-        "zendframework/zend-servicemanager": ">=2.0.0",
-        "zendframework/zend-file": ">=2.0.0",
-        "zendframework/zend-loader": ">=2.0.0",
-        "zendframework/zend-version": ">=2.0.0",
-        "zendframework/zend-text": ">=2.0.0"
+        "zendframework/zend-mvc": "^2.3.0",
+        "zendframework/zend-modulemanager": "^2.3.0",
+        "zendframework/zend-console": "^2.3.0",
+        "zendframework/zend-code": "^2.3.0",
+        "zendframework/zend-config": "^2.3.0",
+        "zendframework/zend-view": "^2.3.0",
+        "zendframework/zend-stdlib": "^2.3.0",
+        "zendframework/zend-servicemanager": "^2.3.0",
+        "zendframework/zend-serializer": "^2.3.0",
+        "zendframework/zend-log": "^2.3.0",
+        "zendframework/zend-i18n": "^2.3.0",
+        "zendframework/zend-file": "^2.3.0",
+        "zendframework/zend-loader": "^2.3.0",
+        "zendframework/zend-version": "^2.3.0",
+        "zendframework/zend-text": "^2.3.0"
     },
     "bin": ["namespacer.php"]
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
index 024ea0c..79b706e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,1138 +1,1890 @@
 {
-    "hash": "fde4f197d804c9e648b1dc7d2d95bf48",
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "hash": "6839d3b40d0d316a0f94f45bbeb625e2",
+    "content-hash": "f7357c2c38115d06f65ea28df023cf9b",
     "packages": [
+        {
+            "name": "container-interop/container-interop",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/container-interop/container-interop.git",
+                "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/fc08354828f8fd3245f77a66b9e23a6bca48297e",
+                "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Interop\\Container\\": "src/Interop/Container/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
+            "time": "2014-12-30 15:22:37"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
+                "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2015-05-04 20:22:00"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
+                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Psr\\Log\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "time": "2012-12-21 11:40:51"
+        },
         {
             "name": "zendframework/zend-code",
-            "version": "2.1.3",
-            "target-dir": "Zend/Code",
+            "version": "2.6.3",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendCode-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-code.git",
+                "reference": "64b26411a10563b2b86f35378777e4919fea78ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_Code-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-code-2.6.3-4e231b.zip",
+                "reference": "64b26411a10563b2b86f35378777e4919fea78ec",
+                "shasum": "d2dbb0f908fb81df4e224073e1745b4df06daede"
             },
             "require": {
-                "php": ">=5.3.3",
-                "zendframework/zend-eventmanager": "self.version"
+                "php": "^5.5 || 7.0.0 - 7.0.4 || ^7.0.6",
+                "zendframework/zend-eventmanager": "^2.6 || ^3.0"
             },
             "require-dev": {
-                "doctrine/common": ">=2.1"
+                "doctrine/annotations": "~1.0",
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "^4.8.21",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
             },
             "suggest": {
-                "doctrine/common": "Doctrine\\Common >=2.1 for annotation features"
+                "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
+                "zendframework/zend-stdlib": "Zend\\Stdlib component"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.6-dev",
+                    "dev-develop": "2.7-dev"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\Code\\": ""
+                "psr-4": {
+                    "Zend\\Code\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\Code\\": "test/"
                 }
             },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": "provides facilities to generate arbitrary code using an object oriented interface",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-code",
             "keywords": [
-                "zf2",
-                "code"
+                "code",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2016-04-20 17:26:42"
         },
         {
             "name": "zendframework/zend-config",
-            "version": "2.1.3",
-            "target-dir": "Zend/Config",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendConfig-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-config.git",
+                "reference": "9dc083ce3341a12bfc1053df40b5f20e42b1f862"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_Config-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-config-2.6.0-e2b849.zip",
+                "reference": "9dc083ce3341a12bfc1053df40b5f20e42b1f862",
+                "shasum": "328ed6f250bfe146ed438cd14b0df6cdf277e82f"
             },
             "require": {
-                "php": ">=5.3.3",
-                "zendframework/zend-stdlib": "self.version"
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-filter": "^2.6",
+                "zendframework/zend-i18n": "^2.5",
+                "zendframework/zend-json": "^2.6.1",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+            },
+            "suggest": {
+                "zendframework/zend-filter": "Zend\\Filter component",
+                "zendframework/zend-i18n": "Zend\\I18n component",
+                "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.6-dev",
+                    "dev-develop": "2.7-dev"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\Config\\": ""
+                "psr-4": {
+                    "Zend\\Config\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\Config\\": "test/"
                 }
             },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": "provides a nested object property based user interface for accessing this configuration data within application code",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-config",
             "keywords": [
-                "zf2",
-                "config"
+                "config",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2016-02-04 23:01:10"
         },
         {
             "name": "zendframework/zend-console",
-            "version": "2.1.3",
-            "target-dir": "Zend/Console",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendConsole-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-console.git",
+                "reference": "dc4c79973c24112e27ebf9a1218f9e51dad3c322"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_Console-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-console-2.6.0-2983e3.zip",
+                "reference": "dc4c79973c24112e27ebf9a1218f9e51dad3c322",
+                "shasum": "765a1095a8fdcf23799f5f7c2a026328ce3e02fb"
             },
             "require": {
-                "php": ">=5.3.3",
-                "zendframework/zend-stdlib": "self.version"
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "^4.0",
+                "zendframework/zend-filter": "^2.6",
+                "zendframework/zend-json": "^2.6",
+                "zendframework/zend-validator": "^2.5"
+            },
+            "suggest": {
+                "zendframework/zend-filter": "To support DefaultRouteMatcher usage",
+                "zendframework/zend-validator": "To support DefaultRouteMatcher usage"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.6-dev",
+                    "dev-develop": "2.7-dev"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\Console\\": ""
+                "psr-4": {
+                    "Zend\\Console\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\Console\\": "test/"
                 }
             },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": " ",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-console",
             "keywords": [
-                "zf2",
-                "console"
+                "console",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2016-02-09 17:15:12"
         },
         {
-            "name": "zendframework/zend-di",
-            "version": "2.1.3",
-            "target-dir": "Zend/Di",
+            "name": "zendframework/zend-diactoros",
+            "version": "1.3.5",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendDi-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-diactoros.git",
+                "reference": "ccc575ceedc8c64360379cbe6bf225bfaa34c121"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_Di-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-diactoros-1.3.5-f9c2c1.zip",
+                "reference": "ccc575ceedc8c64360379cbe6bf225bfaa34c121",
+                "shasum": "77549f13ede6dc68e84dc0ea3580bf77afced2bb"
             },
             "require": {
-                "php": ">=5.3.3",
-                "zendframework/zend-code": "self.version",
-                "zendframework/zend-stdlib": "self.version"
+                "php": "^5.4 || ^7.0",
+                "psr/http-message": "~1.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "~1.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.6",
+                "squizlabs/php_codesniffer": "^2.3.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "1.3-dev",
+                    "dev-develop": "1.4-dev"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\Di\\": ""
+                "psr-4": {
+                    "Zend\\Diactoros\\": "src/"
                 }
             },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\Diactoros\\": "test/"
+                },
+                "files": [
+                    "test/TestAsset/Functions.php",
+                    "test/TestAsset/SapiResponse.php"
+                ]
+            },
+            "scripts": {
+                "check": [
+                    "@cs",
+                    "@test"
+                ],
+                "coveralls": [
+                    "coveralls"
+                ],
+                "cs": [
+                    "phpcs"
+                ],
+                "cs-fix": [
+                    "phpcbf"
+                ],
+                "test": [
+                    "phpunit"
+                ],
+                "test-coverage": [
+                    "phpunit --coverage-clover clover.xml"
+                ]
+            },
             "license": [
-                "BSD-3-Clause"
+                "BSD-2-Clause"
             ],
-            "description": " ",
-            "homepage": "http://packages.zendframework.com/",
+            "description": "PSR HTTP Message implementations",
+            "homepage": "https://github.com/zendframework/zend-diactoros",
             "keywords": [
-                "zf2",
-                "di"
+                "http",
+                "psr",
+                "psr-7"
             ],
             "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+                "issues": "https://github.com/zendframework/zend-diactoros/issues",
+                "source": "https://github.com/zendframework/zend-diactoros"
+            },
+            "time": "2016-03-17 18:02:05"
         },
         {
             "name": "zendframework/zend-escaper",
-            "version": "2.1.3",
-            "target-dir": "Zend/Escaper",
+            "version": "2.5.1",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendEscaper-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-escaper.git",
+                "reference": "9bc5f297f7f880cc2cd89d72b286838374b4525d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_Escaper-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-escaper-2.5.1-aa62dd.zip",
+                "reference": "9bc5f297f7f880cc2cd89d72b286838374b4525d",
+                "shasum": "06aeeeeb2fcc813f28e8a8d6338aee0605c1dfa7"
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.23"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\Escaper\\": ""
+                "psr-4": {
+                    "Zend\\Escaper\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\Escaper\\": "test/"
                 }
             },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": " ",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-escaper",
             "keywords": [
-                "zf2",
-                "escaper"
+                "escaper",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2015-06-03 14:05:37"
         },
         {
             "name": "zendframework/zend-eventmanager",
-            "version": "2.1.3",
-            "target-dir": "Zend/EventManager",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendEventManager-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-eventmanager.git",
+                "reference": "be713ce379d320ac96ee9540b5dac2a5259722da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_EventManager-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-eventmanager-3.0.1-17b0b9.zip",
+                "reference": "be713ce379d320ac96ee9540b5dac2a5259722da",
+                "shasum": "2e4baac2be3d6875651589fc639221ba2ad26b67"
             },
             "require": {
-                "php": ">=5.3.3",
-                "zendframework/zend-stdlib": "self.version"
+                "php": "^5.5 || ^7.0"
+            },
+            "require-dev": {
+                "athletic/athletic": "^0.1",
+                "container-interop/container-interop": "^1.1.0",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "^2.0",
+                "zendframework/zend-stdlib": "^2.7.3 || ^3.0"
+            },
+            "suggest": {
+                "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature",
+                "zendframework/zend-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "3.0-dev",
+                    "dev-develop": "3.1-dev"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\EventManager\\": ""
+                "psr-4": {
+                    "Zend\\EventManager\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\EventManager\\": "test/",
+                    "ZendBench\\EventManager\\": "benchmarks/"
                 }
             },
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": " ",
-            "homepage": "http://packages.zendframework.com/",
+            "description": "Trigger and listen to events within a PHP application",
+            "homepage": "https://github.com/zendframework/zend-eventmanager",
             "keywords": [
-                "zf2",
-                "eventmanager"
+                "event",
+                "eventmanager",
+                "events",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2016-02-18 20:53:00"
         },
         {
             "name": "zendframework/zend-file",
-            "version": "2.1.3",
-            "target-dir": "Zend/File",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendFile-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-file.git",
+                "reference": "96f66b6698c8cccb4dd91cb08a671266cc160821"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_File-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-file-2.7.0-2bee5f.zip",
+                "reference": "96f66b6698c8cccb4dd91cb08a671266cc160821",
+                "shasum": "783b6b59e6d78610771380ea7613d7e8702597b7"
             },
             "require": {
-                "php": ">=5.3.3",
-                "zendframework/zend-stdlib": "self.version"
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-filter": "^2.6.1",
+                "zendframework/zend-i18n": "^2.6",
+                "zendframework/zend-progressbar": "^2.5.2",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+                "zendframework/zend-session": "^2.6.2",
+                "zendframework/zend-validator": "^2.6"
+            },
+            "suggest": {
+                "zendframework/zend-filter": "Zend\\Filter component",
+                "zendframework/zend-i18n": "Zend\\I18n component",
+                "zendframework/zend-validator": "Zend\\Validator component"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "2.8-dev"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\File\\": ""
+                "psr-4": {
+                    "Zend\\File\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\File\\": "test/"
                 }
             },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": " ",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-file",
             "keywords": [
-                "zf2",
-                "file"
+                "file",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2016-04-28 19:21:43"
         },
         {
             "name": "zendframework/zend-filter",
-            "version": "2.1.3",
-            "target-dir": "Zend/Filter",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendFilter-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-filter.git",
+                "reference": "b1e8e03b259a61ffa7caaf64f547a9410df73714"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_Filter-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-filter-2.7.1-37c84e.zip",
+                "reference": "b1e8e03b259a61ffa7caaf64f547a9410df73714",
+                "shasum": "59575f46dcd3c335a00ac344809991f5d8185f64"
             },
             "require": {
-                "php": ">=5.3.3",
-                "zendframework/zend-stdlib": "self.version"
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
             },
             "require-dev": {
-                "zendframework/zend-crypt": "self.version"
+                "fabpot/php-cs-fixer": "1.7.*",
+                "pear/archive_tar": "^1.4",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-crypt": "^2.6",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+                "zendframework/zend-uri": "^2.5"
             },
             "suggest": {
-                "zendframework/zend-i18n": "Zend\\I18n component",
-                "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter",
-                "zendframework/zend-validator": "Zend\\Validator component",
-                "zendframework/zend-crypt": "Zend\\Crypt component",
-                "zendframework/zend-stdlib": "Zend\\Stdlib component"
+                "zendframework/zend-crypt": "Zend\\Crypt component, for encryption filters",
+                "zendframework/zend-i18n": "Zend\\I18n component for filters depending on i18n functionality",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for using the filter chain functionality",
+                "zendframework/zend-uri": "Zend\\Uri component, for the UriNormalize filter"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "2.8-dev"
+                },
+                "zf": {
+                    "component": "Zend\\Filter",
+                    "config-provider": "Zend\\Filter\\ConfigProvider"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\Filter\\": ""
+                "psr-4": {
+                    "Zend\\Filter\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\Filter\\": "test/"
                 }
             },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": "provides a set of commonly needed data filters",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-filter",
             "keywords": [
-                "zf2",
-                "filter"
+                "filter",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2016-04-18 18:32:43"
         },
         {
             "name": "zendframework/zend-form",
-            "version": "2.1.3",
-            "target-dir": "Zend/Form",
+            "version": "2.8.3",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendForm-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-form.git",
+                "reference": "1524ddcac24dcc0bb68e5ff8f3fb8c01b191d3c8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_Form-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-form-2.8.3-f9ac25.zip",
+                "reference": "1524ddcac24dcc0bb68e5ff8f3fb8c01b191d3c8",
+                "shasum": "1c4f9946c38a00c48c6588bf628a7452bee850ce"
             },
             "require": {
-                "php": ">=5.3.3",
-                "zendframework/zend-inputfilter": "self.version",
-                "zendframework/zend-stdlib": "self.version"
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-hydrator": "^1.1 || ^2.1",
+                "zendframework/zend-inputfilter": "^2.6",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
             },
             "require-dev": {
+                "doctrine/annotations": "~1.0",
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "^4.8",
+                "zendframework/zend-cache": "^2.6.1",
+                "zendframework/zend-captcha": "^2.5.4",
+                "zendframework/zend-code": "^2.6",
+                "zendframework/zend-escaper": "^2.5",
+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+                "zendframework/zend-filter": "^2.6",
+                "zendframework/zend-i18n": "^2.6",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+                "zendframework/zend-session": "^2.6.2",
+                "zendframework/zend-text": "^2.6",
+                "zendframework/zend-validator": "^2.6",
+                "zendframework/zend-view": "^2.6.2",
                 "zendframework/zendservice-recaptcha": "*"
             },
             "suggest": {
+                "zendframework/zend-captcha": "Zend\\Captcha component",
+                "zendframework/zend-code": "Zend\\Code component",
+                "zendframework/zend-eventmanager": "Zend\\EventManager component",
+                "zendframework/zend-filter": "Zend\\Filter component",
+                "zendframework/zend-i18n": "Zend\\I18n component",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+                "zendframework/zend-validator": "Zend\\Validator component",
+                "zendframework/zend-view": "Zend\\View component",
                 "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.8-dev",
+                    "dev-develop": "2.9-dev"
+                },
+                "zf": {
+                    "component": "Zend\\Form",
+                    "config-provider": "Zend\\Form\\ConfigProvider"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\Form\\": ""
+                "psr-4": {
+                    "Zend\\Form\\": "src/"
+                },
+                "files": [
+                    "autoload/formElementManagerPolyfill.php"
+                ]
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\Form\\": "test/"
                 }
             },
+            "scripts": {
+                "check": [
+                    "@cs-check",
+                    "@test"
+                ],
+                "upload-coverage": [
+                    "coveralls -v"
+                ],
+                "cs-check": [
+                    "php-cs-fixer --version && php-cs-fixer fix -v --diff --dry-run"
+                ],
+                "cs-fix": [
+                    "php-cs-fixer fix -v"
+                ],
+                "test": [
+                    "phpunit"
+                ],
+                "test-coverage": [
+                    "phpunit --coverage-clover clover.xml"
+                ]
+            },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": " ",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-form",
             "keywords": [
-                "zf2",
-                "form"
+                "form",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2016-05-03 15:16:58"
         },
         {
             "name": "zendframework/zend-http",
-            "version": "2.1.3",
-            "target-dir": "Zend/Http",
+            "version": "2.5.4",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendHttp-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-http.git",
+                "reference": "ca5b0bbecc1c4101c0554ba66e678303312e05dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_Http-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-http-2.5.4-5a0647.zip",
+                "reference": "ca5b0bbecc1c4101c0554ba66e678303312e05dc",
+                "shasum": "527c0b7a0c90ef8b36a974959d950ff7168af950"
             },
             "require": {
-                "php": ">=5.3.3",
-                "zendframework/zend-loader": "self.version",
-                "zendframework/zend-stdlib": "self.version",
-                "zendframework/zend-uri": "self.version"
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-loader": "^2.5",
+                "zendframework/zend-stdlib": "^2.5 || ^3.0",
+                "zendframework/zend-uri": "^2.5",
+                "zendframework/zend-validator": "^2.5"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "^4.0",
+                "zendframework/zend-config": "^2.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\Http\\": ""
+                "psr-4": {
+                    "Zend\\Http\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\Http\\": "test/"
                 }
             },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-http",
             "keywords": [
-                "zf2",
-                "http"
+                "http",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2016-02-04 20:36:48"
+        },
+        {
+            "name": "zendframework/zend-hydrator",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-hydrator.git",
+                "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/22652e1661a5a10b3f564cf7824a2206cf5a4a65",
+                "reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "^2.0@dev",
+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+                "zendframework/zend-filter": "^2.6",
+                "zendframework/zend-inputfilter": "^2.6",
+                "zendframework/zend-serializer": "^2.6.1",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+            },
+            "suggest": {
+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage",
+                "zendframework/zend-filter": "^2.6, to support naming strategy hydrator usage",
+                "zendframework/zend-serializer": "^2.6.1, to use the SerializableStrategy",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-release-1.0": "1.0-dev",
+                    "dev-release-1.1": "1.1-dev",
+                    "dev-master": "2.0-dev",
+                    "dev-develop": "2.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Hydrator\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-hydrator",
+            "keywords": [
+                "hydrator",
+                "zf2"
+            ],
+            "time": "2016-02-18 22:38:26"
         },
         {
             "name": "zendframework/zend-i18n",
-            "version": "2.1.3",
-            "target-dir": "Zend/I18n",
+            "version": "2.7.2",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendI18n-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-i18n.git",
+                "reference": "b0ab05dc9ac0116772baadbbf54081d67fa7ccf5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_I18n-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-i18n-2.7.2-a8bd93.zip",
+                "reference": "b0ab05dc9ac0116772baadbbf54081d67fa7ccf5",
+                "shasum": "d66b1e909692c50f880a40d4a8ff3ecfcc2c51ab"
             },
             "require": {
-                "php": ">=5.3.3",
-                "ext-intl": "*",
-                "zendframework/zend-filter": "self.version",
-                "zendframework/zend-stdlib": "self.version"
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-cache": "^2.6.1",
+                "zendframework/zend-config": "^2.6",
+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+                "zendframework/zend-filter": "^2.6.1",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+                "zendframework/zend-validator": "^2.6",
+                "zendframework/zend-view": "^2.6.3"
+            },
+            "suggest": {
+                "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
+                "zendframework/zend-cache": "Zend\\Cache component",
+                "zendframework/zend-config": "Zend\\Config component",
+                "zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
+                "zendframework/zend-filter": "You should install this package to use the provided filters",
+                "zendframework/zend-i18n-resources": "Translation resources",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+                "zendframework/zend-validator": "You should install this package to use the provided validators",
+                "zendframework/zend-view": "You should install this package to use the provided view helpers"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "2.8-dev"
+                },
+                "zf": {
+                    "component": "Zend\\I18n",
+                    "config-provider": "Zend\\I18n\\ConfigProvider"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\I18n\\": ""
+                "psr-4": {
+                    "Zend\\I18n\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\I18n\\": "test/"
                 }
             },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": " ",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-i18n",
             "keywords": [
-                "zf2",
-                "i18n"
+                "i18n",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2016-04-18 18:25:10"
         },
         {
             "name": "zendframework/zend-inputfilter",
-            "version": "2.1.3",
-            "target-dir": "Zend/InputFilter",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendInputFilter-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-inputfilter.git",
+                "reference": "bb571090ef77fab47d4995a07b45060363606863"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_InputFilter-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-inputfilter-2.7.1-68ed5f.zip",
+                "reference": "bb571090ef77fab47d4995a07b45060363606863",
+                "shasum": "d920aab0ba3dbda8197c3dafd8e6bb9e677c3436"
             },
             "require": {
-                "php": ">=5.3.3",
-                "zendframework/zend-filter": "self.version",
-                "zendframework/zend-validator": "self.version",
-                "zendframework/zend-stdlib": "self.version"
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-filter": "^2.6",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0",
+                "zendframework/zend-validator": "^2.6"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "^4.5",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+            },
+            "suggest": {
+                "zendframework/zend-servicemanager": "To support plugin manager support"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "2.8-dev"
+                },
+                "zf": {
+                    "component": "Zend\\InputFilter",
+                    "config-provider": "Zend\\InputFilter\\ConfigProvider"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\InputFilter\\": ""
+                "psr-4": {
+                    "Zend\\InputFilter\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\InputFilter\\": "test/"
                 }
             },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": " ",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-inputfilter",
             "keywords": [
-                "zf2",
-                "inputfilter"
+                "inputfilter",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2016-04-18 17:52:32"
         },
         {
-            "name": "zendframework/zend-loader",
-            "version": "2.1.3",
-            "target-dir": "Zend/Loader",
+            "name": "zendframework/zend-json",
+            "version": "2.6.1",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendLoader-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-json.git",
+                "reference": "bac51ce54b880969f3e40713dcbdf6bce5927ed1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_Loader-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-json-2.6.1-c21fa8.zip",
+                "reference": "bac51ce54b880969f3e40713dcbdf6bce5927ed1",
+                "shasum": "83eadaadad7c4711e04aaa0f926891a52b129946"
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": "^5.5 || ^7.0"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-http": "^2.5.4",
+                "zendframework/zend-server": "^2.6.1",
+                "zendframework/zend-stdlib": "^2.5 || ^3.0",
+                "zendframework/zendxml": "^1.0.2"
             },
             "suggest": {
-                "zendframework/zend-stdlib": "Zend\\Stdlib component"
+                "zendframework/zend-http": "Zend\\Http component, required to use Zend\\Json\\Server",
+                "zendframework/zend-server": "Zend\\Server component, required to use Zend\\Json\\Server",
+                "zendframework/zend-stdlib": "Zend\\Stdlib component, for use with caching Zend\\Json\\Server responses",
+                "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.6-dev",
+                    "dev-develop": "2.7-dev"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\Loader\\": ""
+                "psr-4": {
+                    "Zend\\Json\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\Json\\": "test/"
+                }
+            },
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
+            "homepage": "https://github.com/zendframework/zend-json",
+            "keywords": [
+                "json",
+                "zf2"
+            ],
+            "time": "2016-02-04 21:20:26"
+        },
+        {
+            "name": "zendframework/zend-loader",
+            "version": "2.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-loader.git",
+                "reference": "c632cddeb2c1216235b8777d0d8ecde173a9b283"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-loader-2.5.1-eda8fc.zip",
+                "reference": "c632cddeb2c1216235b8777d0d8ecde173a9b283",
+                "shasum": "18e4296563b12965b2a854e8e3b9f64ce38c413a"
+            },
+            "require": {
+                "php": ">=5.3.23"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Loader\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\Loader\\": "test/"
                 }
             },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": " ",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-loader",
             "keywords": [
-                "zf2",
-                "loader"
+                "loader",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2015-06-03 14:05:47"
+        },
+        {
+            "name": "zendframework/zend-log",
+            "version": "2.8.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-log.git",
+                "reference": "2811d5166f28b91f9a05abb9975b0ab2a8f300f3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-log-2.8.2-84b147.zip",
+                "reference": "2811d5166f28b91f9a05abb9975b0ab2a8f300f3",
+                "shasum": "ece094925ee0b5f32a29b7ffdfd21f03eb37dc8f"
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "psr/log": "^1.0",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "mikey179/vfsstream": "^1.6",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-console": "^2.6",
+                "zendframework/zend-db": "^2.6",
+                "zendframework/zend-escaper": "^2.5",
+                "zendframework/zend-filter": "^2.5",
+                "zendframework/zend-mail": "^2.6.1",
+                "zendframework/zend-validator": "^2.6"
+            },
+            "suggest": {
+                "ext-mongo": "mongodb extension to use MongoDB writer",
+                "zendframework/zend-console": "Zend\\Console component to use the RequestID log processor",
+                "zendframework/zend-db": "Zend\\Db component to use the database log writer",
+                "zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML log formatter",
+                "zendframework/zend-mail": "Zend\\Mail component to use the email log writer",
+                "zendframework/zend-validator": "Zend\\Validator component to block invalid log messages"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev",
+                    "dev-develop": "2.9-dev"
+                },
+                "zf": {
+                    "component": "Zend\\Log",
+                    "config-provider": "Zend\\Log\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Log\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\Log\\": "test/"
+                },
+                "files": [
+                    "test/Writer/TestAsset/chmod.php"
+                ]
+            },
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "component for general purpose logging",
+            "homepage": "https://github.com/zendframework/zend-log",
+            "keywords": [
+                "log",
+                "logging",
+                "zf2"
+            ],
+            "time": "2016-04-18 17:35:02"
         },
         {
             "name": "zendframework/zend-modulemanager",
-            "version": "2.1.3",
-            "target-dir": "Zend/ModuleManager",
+            "version": "2.7.2",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendModuleManager-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-modulemanager.git",
+                "reference": "dd183dd4819bace579df6cf16cb29092198b0161"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_ModuleManager-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-modulemanager-2.7.2-dcc92a.zip",
+                "reference": "dd183dd4819bace579df6cf16cb29092198b0161",
+                "shasum": "de2d760965050e7f150a1be729b1f2dc620cabb0"
             },
             "require": {
-                "php": ">=5.3.3",
-                "zendframework/zend-eventmanager": "self.version",
-                "zendframework/zend-stdlib": "self.version"
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-config": "^2.6",
+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-console": "^2.6",
+                "zendframework/zend-di": "^2.6",
+                "zendframework/zend-loader": "^2.5",
+                "zendframework/zend-mvc": "^2.7",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
             },
             "suggest": {
                 "zendframework/zend-config": "Zend\\Config component",
+                "zendframework/zend-console": "Zend\\Console component",
                 "zendframework/zend-loader": "Zend\\Loader component",
+                "zendframework/zend-mvc": "Zend\\Mvc component",
                 "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "2.8-dev"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\ModuleManager\\": ""
+                "psr-4": {
+                    "Zend\\ModuleManager\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\ModuleManager\\": "test/"
                 }
             },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": " ",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-modulemanager",
             "keywords": [
-                "zf2",
-                "modulemanager"
+                "modulemanager",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2016-05-16 21:21:11"
         },
         {
             "name": "zendframework/zend-mvc",
-            "version": "2.1.3",
-            "target-dir": "Zend/Mvc",
+            "version": "2.7.7",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendMvc-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-mvc.git",
+                "reference": "f647a1794e2ecdedc65702a0920e29c34a4ec12f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_Mvc-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-mvc-2.7.7-eb1af9.zip",
+                "reference": "f647a1794e2ecdedc65702a0920e29c34a4ec12f",
+                "shasum": "109fdc535eb11fa2e03d74eb4df4e7483e2c6946"
             },
             "require": {
-                "php": ">=5.3.3",
-                "zendframework/zend-console": "self.version",
-                "zendframework/zend-di": "self.version",
-                "zendframework/zend-eventmanager": "self.version",
-                "zendframework/zend-form": "self.version",
-                "zendframework/zend-modulemanager": "self.version",
-                "zendframework/zend-http": "self.version",
-                "zendframework/zend-uri": "self.version",
-                "zendframework/zend-servicemanager": "self.version",
-                "zendframework/zend-stdlib": "self.version",
-                "zendframework/zend-text": "self.version",
-                "zendframework/zend-view": "self.version"
+                "container-interop/container-interop": "^1.1",
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+                "zendframework/zend-form": "^2.7",
+                "zendframework/zend-hydrator": "^1.1 || ^2.1",
+                "zendframework/zend-psr7bridge": "^0.2",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+                "zendframework/zend-stdlib": "^2.7.5 || ^3.0"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "^4.5",
+                "sebastian/version": "^1.0.4",
+                "zendframework/zend-authentication": "^2.5.3",
+                "zendframework/zend-cache": "^2.6.1",
+                "zendframework/zend-console": "^2.6",
+                "zendframework/zend-di": "^2.6",
+                "zendframework/zend-filter": "^2.6.1",
+                "zendframework/zend-http": "^2.5.4",
+                "zendframework/zend-i18n": "^2.6",
+                "zendframework/zend-inputfilter": "^2.6",
+                "zendframework/zend-json": "^2.6.1",
+                "zendframework/zend-log": "^2.7.1",
+                "zendframework/zend-modulemanager": "^2.7.1",
+                "zendframework/zend-serializer": "^2.6.1",
+                "zendframework/zend-session": "^2.6.2",
+                "zendframework/zend-text": "^2.6",
+                "zendframework/zend-uri": "^2.5",
+                "zendframework/zend-validator": "^2.6",
+                "zendframework/zend-version": "^2.5",
+                "zendframework/zend-view": "^2.6.3"
+            },
+            "suggest": {
+                "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
+                "zendframework/zend-config": "Zend\\Config component",
+                "zendframework/zend-console": "Zend\\Console component",
+                "zendframework/zend-di": "Zend\\Di component",
+                "zendframework/zend-filter": "Zend\\Filter component",
+                "zendframework/zend-http": "Zend\\Http component",
+                "zendframework/zend-i18n": "Zend\\I18n component for translatable segments",
+                "zendframework/zend-inputfilter": "Zend\\Inputfilter component",
+                "zendframework/zend-json": "Zend\\Json component",
+                "zendframework/zend-log": "Zend\\Log component",
+                "zendframework/zend-modulemanager": "Zend\\ModuleManager component",
+                "zendframework/zend-serializer": "Zend\\Serializer component",
+                "zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins",
+                "zendframework/zend-text": "Zend\\Text component",
+                "zendframework/zend-uri": "Zend\\Uri component",
+                "zendframework/zend-validator": "Zend\\Validator component",
+                "zendframework/zend-version": "Zend\\Version component",
+                "zendframework/zend-view": "Zend\\View component"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "3.0-dev"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\Mvc\\": ""
+                "psr-4": {
+                    "Zend\\Mvc\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\Mvc\\": "test/"
                 }
             },
+            "scripts": {
+                "check": [
+                    "@cs-check",
+                    "@test"
+                ],
+                "upload-coverage": [
+                    "coveralls -v"
+                ],
+                "cs-check": [
+                    "php-cs-fixer --version && php-cs-fixer fix -v --diff --dry-run"
+                ],
+                "cs-fix": [
+                    "php-cs-fixer fix -v"
+                ],
+                "test": [
+                    "phpunit"
+                ],
+                "test-coverage": [
+                    "phpunit --coverage-clover clover.xml"
+                ]
+            },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": " ",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-mvc",
             "keywords": [
-                "zf2",
-                "mvc"
+                "mvc",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2016-04-12 20:25:40"
+        },
+        {
+            "name": "zendframework/zend-psr7bridge",
+            "version": "0.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-psr7bridge.git",
+                "reference": "86c0b53b0c6381391c4add4a93a56e51d5c74605"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-psr7bridge/zipball/86c0b53b0c6381391c4add4a93a56e51d5c74605",
+                "reference": "86c0b53b0c6381391c4add4a93a56e51d5c74605",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "psr/http-message": "^1.0",
+                "zendframework/zend-diactoros": "^1.1",
+                "zendframework/zend-http": "^2.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.7",
+                "squizlabs/php_codesniffer": "^2.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev",
+                    "dev-develop": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Psr7Bridge\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "PSR-7 <-> Zend\\Http bridge",
+            "homepage": "https://github.com/zendframework/zend-psr7bridge",
+            "keywords": [
+                "http",
+                "psr",
+                "psr-7"
+            ],
+            "time": "2016-05-10 21:44:39"
+        },
+        {
+            "name": "zendframework/zend-serializer",
+            "version": "2.7.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-serializer.git",
+                "reference": "cab538fe9127bad4c2ce9d012b9637701197ef8a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-serializer-2.7.2-08f945.zip",
+                "reference": "cab538fe9127bad4c2ce9d012b9637701197ef8a",
+                "shasum": "c760f066a79bf5a907e6bb9aed171508f0c22da5"
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-json": "^2.5",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "^4.5",
+                "zendframework/zend-math": "^2.6",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+            },
+            "suggest": {
+                "zendframework/zend-math": "(^2.6) To support Python Pickle serialization",
+                "zendframework/zend-servicemanager": "To support plugin manager support"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "2.8-dev"
+                },
+                "zf": {
+                    "component": "Zend\\Serializer",
+                    "config-provider": "Zend\\Serializer\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Serializer\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\Serializer\\": "test/"
+                }
+            },
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover",
+            "homepage": "https://github.com/zendframework/zend-serializer",
+            "keywords": [
+                "serializer",
+                "zf2"
+            ],
+            "time": "2016-05-11 16:05:56"
         },
         {
             "name": "zendframework/zend-servicemanager",
-            "version": "2.1.3",
-            "target-dir": "Zend/ServiceManager",
+            "version": "2.7.6",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendServiceManager-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-servicemanager.git",
+                "reference": "443e4b114d0a08749bc14e7135632bd889d1f78a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_ServiceManager-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-servicemanager-2.7.6-b59dad.zip",
+                "reference": "443e4b114d0a08749bc14e7135632bd889d1f78a",
+                "shasum": "612e941ffeb21ccf70c32bc45752ba76056e4069"
             },
             "require": {
-                "php": ">=5.3.3"
+                "container-interop/container-interop": "~1.0",
+                "php": "^5.5 || ^7.0"
+            },
+            "require-dev": {
+                "athletic/athletic": "dev-master",
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-di": "~2.5",
+                "zendframework/zend-mvc": "~2.5"
             },
             "suggest": {
+                "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services",
                 "zendframework/zend-di": "Zend\\Di component"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "3.0-dev"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\ServiceManager\\": ""
+                "psr-4": {
+                    "Zend\\ServiceManager\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\ServiceManager\\": "test/",
+                    "ZendBench\\ServiceManager\\": "benchmarks/"
                 }
             },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": " ",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-servicemanager",
             "keywords": [
-                "zf2",
-                "servicemanager"
+                "servicemanager",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2016-04-27 19:07:40"
         },
         {
             "name": "zendframework/zend-stdlib",
-            "version": "2.1.3",
-            "target-dir": "Zend/Stdlib",
+            "version": "2.7.7",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendStdlib-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-stdlib.git",
+                "reference": "baa65aec7bc75260254b5f03447f0c16360f9e59"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_Stdlib-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-stdlib-2.7.7-19d9a4.zip",
+                "reference": "baa65aec7bc75260254b5f03447f0c16360f9e59",
+                "shasum": "359141af3a31435fd312b0db47604a424bb113cf"
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-hydrator": "~1.1"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1",
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-config": "~2.5",
+                "zendframework/zend-eventmanager": "~2.5",
+                "zendframework/zend-filter": "~2.5",
+                "zendframework/zend-inputfilter": "~2.5",
+                "zendframework/zend-serializer": "~2.5",
+                "zendframework/zend-servicemanager": "~2.5"
             },
             "suggest": {
-                "pecl-weakref": "Implementation of weak references for Stdlib\\CallbackHandler"
+                "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
+                "zendframework/zend-filter": "To support naming strategy hydrator usage",
+                "zendframework/zend-serializer": "Zend\\Serializer component",
+                "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-release-2.7": "2.7-dev",
+                    "dev-master": "3.0-dev",
+                    "dev-develop": "3.1-dev"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\Stdlib\\": ""
-                },
-                "files": [
-                    "Zend/Stdlib/compatibility/autoload.php"
-                ]
+                "psr-4": {
+                    "Zend\\Stdlib\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\Stdlib\\": "test/",
+                    "ZendBench\\Stdlib\\": "benchmark/"
+                }
             },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": " ",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-stdlib",
             "keywords": [
-                "zf2",
-                "stdlib"
+                "stdlib",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2016-04-12 21:17:31"
         },
         {
             "name": "zendframework/zend-text",
-            "version": "2.1.3",
-            "target-dir": "Zend/Text",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendText-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-text.git",
+                "reference": "a703c10b9fe2fdae5bf4ba755748792511ec5eec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_Text-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-text-2.6.0-bcf77e.zip",
+                "reference": "a703c10b9fe2fdae5bf4ba755748792511ec5eec",
+                "shasum": "c87e5c822c5330cca66673dacce2a7547fe32e99"
             },
             "require": {
-                "php": ">=5.3.3",
-                "zendframework/zend-stdlib": "self.version",
-                "zendframework/zend-servicemanager": "self.version"
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-config": "^2.6"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.6-dev",
+                    "dev-develop": "2.7-dev"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\Text\\": ""
+                "psr-4": {
+                    "Zend\\Text\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\Text\\": "test/"
                 }
             },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": " ",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-text",
             "keywords": [
-                "zf2",
-                "text"
+                "text",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2016-02-08 19:03:52"
         },
         {
             "name": "zendframework/zend-uri",
-            "version": "2.1.3",
-            "target-dir": "Zend/Uri",
+            "version": "2.5.2",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendUri-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-uri.git",
+                "reference": "f11dc4805ce7c4343f6b0f8a2572036f90214b24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_Uri-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-uri-2.5.2-210611.zip",
+                "reference": "f11dc4805ce7c4343f6b0f8a2572036f90214b24",
+                "shasum": "212be1d131cb699918b9c1b559b244e031763274"
             },
             "require": {
-                "php": ">=5.3.3",
-                "zendframework/zend-escaper": "self.version",
-                "zendframework/zend-validator": "self.version"
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-escaper": "^2.5",
+                "zendframework/zend-validator": "^2.5"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\Uri\\": ""
+                "psr-4": {
+                    "Zend\\Uri\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\Uri\\": "test/"
                 }
             },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-uri",
             "keywords": [
-                "zf2",
-                "uri"
+                "uri",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2016-02-17 22:38:51"
         },
         {
             "name": "zendframework/zend-validator",
-            "version": "2.1.3",
-            "target-dir": "Zend/Validator",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendValidator-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-validator.git",
+                "reference": "bf401f454e69dae6e4c5334199bb09839febbcb2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_Validator-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-validator-2.8.0-52e528.zip",
+                "reference": "bf401f454e69dae6e4c5334199bb09839febbcb2",
+                "shasum": "d67165e2c1731353d2862111fedcdc7d3589d521"
             },
             "require": {
-                "php": ">=5.3.3",
-                "zendframework/zend-i18n": "self.version",
-                "zendframework/zend-servicemanager": "self.version",
-                "zendframework/zend-stdlib": "self.version"
+                "container-interop/container-interop": "^1.1",
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
             },
             "require-dev": {
-                "zendframework/zend-math": "self.version"
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "^4.0",
+                "zendframework/zend-cache": "^2.6.1",
+                "zendframework/zend-config": "^2.6",
+                "zendframework/zend-db": "^2.7",
+                "zendframework/zend-filter": "^2.6",
+                "zendframework/zend-http": "^2.5.4",
+                "zendframework/zend-i18n": "^2.6",
+                "zendframework/zend-math": "^2.6",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+                "zendframework/zend-session": "^2.6.2",
+                "zendframework/zend-uri": "^2.5"
             },
             "suggest": {
                 "zendframework/zend-db": "Zend\\Db component",
-                "zendframework/zend-math": "Zend\\Math component"
+                "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator",
+                "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages as well as to use the various Date validators",
+                "zendframework/zend-i18n-resources": "Translations of validator messages",
+                "zendframework/zend-math": "Zend\\Math component",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
+                "zendframework/zend-session": "Zend\\Session component",
+                "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.8-dev",
+                    "dev-develop": "2.9-dev"
+                },
+                "zf": {
+                    "component": "Zend\\Validator",
+                    "config-provider": "Zend\\Validator\\ConfigProvider"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\Validator\\": ""
+                "psr-4": {
+                    "Zend\\Validator\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\Validator\\": "test/"
                 }
             },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": "provides a set of commonly needed validators",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-validator",
             "keywords": [
-                "zf2",
-                "validator"
+                "validator",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2016-05-16 13:39:40"
         },
         {
             "name": "zendframework/zend-version",
-            "version": "2.1.3",
-            "target-dir": "Zend/Version",
+            "version": "2.5.1",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendVersion-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-version.git",
+                "reference": "9635dd35e0e0d7b759c47c62a86ab3f558e58d4b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_Version-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-version-2.5.1-45d110.zip",
+                "reference": "9635dd35e0e0d7b759c47c62a86ab3f558e58d4b",
+                "shasum": "d88ab97a91eab1665bf8051fe824ed9dab040790"
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.23",
+                "zendframework/zend-json": "~2.5"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-http": "~2.5"
+            },
+            "suggest": {
+                "zendframework/zend-http": "Allows use of Zend\\Http\\Client to check version information",
+                "zendframework/zend-json": "To check latest version hosted in GitHub"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\Version\\": ""
+                "psr-4": {
+                    "Zend\\Version\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\Version\\": "test/"
                 }
             },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": " ",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-version",
             "keywords": [
-                "zf2",
-                "version"
+                "version",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2015-06-04 15:41:05"
         },
         {
             "name": "zendframework/zend-view",
-            "version": "2.1.3",
-            "target-dir": "Zend/View",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
-                "url": "git://github.com/zendframework/Component_ZendView-2.1.3.git",
-                "reference": "release-2.1.3"
+                "url": "https://github.com/zendframework/zend-view.git",
+                "reference": "139767fc64858c1b0e41eb0b855ba32edd9c5553"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://packages.zendframework.com/composer/Zend_View-2.1.3.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-view-2.7.0-a3b8fe.zip",
+                "reference": "139767fc64858c1b0e41eb0b855ba32edd9c5553",
+                "shasum": "93261e8a4c37843a58dcc32c49ade10578d05396"
             },
             "require": {
-                "php": ">=5.3.3",
-                "zendframework/zend-eventmanager": "self.version",
-                "zendframework/zend-loader": "self.version",
-                "zendframework/zend-stdlib": "self.version"
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+                "zendframework/zend-loader": "^2.5",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "^4.5",
+                "zendframework/zend-authentication": "^2.5",
+                "zendframework/zend-cache": "^2.6.1",
+                "zendframework/zend-config": "^2.6",
+                "zendframework/zend-console": "^2.6",
+                "zendframework/zend-escaper": "^2.5",
+                "zendframework/zend-feed": "^2.7",
+                "zendframework/zend-filter": "^2.6.1",
+                "zendframework/zend-http": "^2.5.4",
+                "zendframework/zend-i18n": "^2.6",
+                "zendframework/zend-json": "^2.6.1",
+                "zendframework/zend-log": "^2.7",
+                "zendframework/zend-modulemanager": "^2.7.1",
+                "zendframework/zend-mvc": "^2.7",
+                "zendframework/zend-navigation": "^2.5",
+                "zendframework/zend-paginator": "^2.5",
+                "zendframework/zend-permissions-acl": "^2.6",
+                "zendframework/zend-router": "^3.0.1",
+                "zendframework/zend-serializer": "^2.6.1",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+                "zendframework/zend-session": "^2.6.2",
+                "zendframework/zend-uri": "^2.5"
             },
             "suggest": {
-                "zendframework/zend-filter": "Zend\\Filter component"
+                "zendframework/zend-authentication": "Zend\\Authentication component",
+                "zendframework/zend-escaper": "Zend\\Escaper component",
+                "zendframework/zend-feed": "Zend\\Feed component",
+                "zendframework/zend-filter": "Zend\\Filter component",
+                "zendframework/zend-http": "Zend\\Http component",
+                "zendframework/zend-i18n": "Zend\\I18n component",
+                "zendframework/zend-json": "Zend\\Json component",
+                "zendframework/zend-mvc": "Zend\\Mvc component",
+                "zendframework/zend-navigation": "Zend\\Navigation component",
+                "zendframework/zend-paginator": "Zend\\Paginator component",
+                "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+                "zendframework/zend-uri": "Zend\\Uri component"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev",
-                    "dev-develop": "2.2-dev"
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "2.8-dev"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "Zend\\View\\": ""
+                "psr-4": {
+                    "Zend\\View\\": "src/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\View\\": "test/"
                 }
             },
             "license": [
                 "BSD-3-Clause"
             ],
             "description": "provides a system of helpers, output filters, and variable escaping",
-            "homepage": "http://packages.zendframework.com/",
+            "homepage": "https://github.com/zendframework/zend-view",
             "keywords": [
-                "zf2",
-                "view"
+                "view",
+                "zf2"
             ],
-            "support": {
-                "email": "fw-general-subscribe@lists.zend.com",
-                "irc": "irc://irc.freenode.net/zftalk",
-                "issues": "https://github.com/zendframework/zf2/issues",
-                "source": "https://github.com/zendframework/zf2"
-            }
+            "time": "2016-05-12 14:24:52"
         }
     ],
-    "packages-dev": null,
-    "aliases": [
-
-    ],
+    "packages-dev": [],
+    "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [
-
-    ]
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=5.3.3"
+    },
+    "platform-dev": []
 }
diff --git a/config/module.config.php b/config/module.config.php
index 566309c..686aa5a 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -59,6 +59,15 @@
                         ),
                     ),
                 ),
+                'namespacer-legacy' => array(
+                    'options' => array(
+                        'route'    => 'legacy [--mapfile=] [--target=]',
+                        'defaults' => array(
+                            'controller' => 'Namespacer\Controller\Controller',
+                            'action'     => 'legacyExtension',
+                        ),
+                    ),
+                ),
             ),
         ),
     ),
diff --git a/namespacer.phar b/namespacer.phar
index 27977a4..d479c39 100755
Binary files a/namespacer.phar and b/namespacer.phar differ
diff --git a/namespacer.php b/namespacer.php
index 3747851..1ca6b92 100755
--- a/namespacer.php
+++ b/namespacer.php
@@ -2,30 +2,15 @@
 <?php
 /**
  * ZF2 command line tool
- * 
+ *
  * @link      http://github.com/zendframework/ZFTool for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 error_reporting(E_ALL);
 ini_set("display_errors", 1);
+include "vendor/autoload.php";
 
-$basePath = __DIR__;
-if (file_exists("$basePath/vendor/autoload.php")) {
-    require_once "$basePath/vendor/autoload.php";
-} else {
-    $basePath = dirname(dirname($basePath));
-    chdir($basePath);
-    if (file_exists("init_autoloader.php")) {
-        require_once "init_autoloader.php";
-    } elseif (file_exists("vendor/autoload.php")) {
-        require_once "vendor/autoload.php";
-    } else {
-        echo 'Error: I cannot find the autoloader of the application.' . PHP_EOL;
-        echo "Check if $basePath contains a valid ZF2 application." . PHP_EOL;
-        exit(2);
-    }
-}
 
 $appConfig = array(
     'modules' => array(
diff --git a/src/Namespacer/Controller/Controller.php b/src/Namespacer/Controller/Controller.php
index 5cbf2aa..d15797a 100644
--- a/src/Namespacer/Controller/Controller.php
+++ b/src/Namespacer/Controller/Controller.php
@@ -10,6 +10,7 @@
 use Namespacer\Model\Map;
 use Namespacer\Model\Mapper;
 use Namespacer\Model\Transformer;
+use Namespacer\Model\LegacyExtension;
 use Zend\Mvc\Controller\AbstractActionController;
 
 class Controller extends AbstractActionController
@@ -52,6 +53,17 @@ public function transformAction()
         }
     }
 
+    public function legacyExtensionAction()
+    {
+        $mapfile     = $this->params()->fromRoute('mapfile');
+        $target      = $this->params()->fromRoute('target');
+        $data        = include $mapfile;
+        $map         = new Map($data);
+        $transformer = new LegacyExtension($map);
+
+        $transformer->createLegacyClasses($target);
+    }
+
     public function fixAction()
     {
         $mapfile = $this->params()->fromRoute('mapfile');
diff --git a/src/Namespacer/Model/LegacyExtension.php b/src/Namespacer/Model/LegacyExtension.php
new file mode 100644
index 0000000..a2825ef
--- /dev/null
+++ b/src/Namespacer/Model/LegacyExtension.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Namespacer\Model;
+
+use Zend\Code\Scanner\FileScanner;
+
+class LegacyExtension
+{
+    /** @var \Namespacer\Model\Map */
+    protected $map;
+
+    public function __construct(Map $map)
+    {
+        $this->map = $map;
+    }
+
+    public function createLegacyClasses($directory = false)
+    {
+        $fileRenamings = $this->map->getExtensionMap($directory);
+
+        foreach ($fileRenamings as $legacyPath => $data) {
+            $legacyDir = dirname($legacyPath);
+            if (!file_exists($legacyDir)) {
+                mkdir($legacyDir, 0777, true);
+            }
+            touch($legacyPath);
+
+            $this->createLegacyFile($legacyPath, $data);
+        }
+    }
+
+    protected function createLegacyFile($file, $data)
+    {
+        $tokens = token_get_all(file_get_contents($data['original_file']));
+
+        $contents = '';
+        $token = reset($tokens);
+        do {
+            if (T_TRAIT === $token[0]) {
+                $contents .= $token[1] . ' ' . $data['class'];
+                $contents .= "\n{\n";
+                $contents .= "    use \\" . $data['extends'] . ";";
+                $contents .= "\n}\n";
+                break;
+            }
+            if (T_CLASS === $token[0] || T_INTERFACE === $token[0]) {
+                $contents .= $token[1] . ' ' . $data['class'];
+                $contents .= " extends \\" . $data['extends'];
+                $contents .= "\n{\n}\n";
+                break;
+            } else {
+                $contents .= (is_array($token)) ? $token[1] : $token;
+            }
+        } while ($token = next($tokens));
+
+        file_put_contents($file, $contents);
+    }
+}
diff --git a/src/Namespacer/Model/Map.php b/src/Namespacer/Model/Map.php
index e1d0493..9f79b97 100644
--- a/src/Namespacer/Model/Map.php
+++ b/src/Namespacer/Model/Map.php
@@ -53,6 +53,24 @@ public function getNewFiles()
         return $data;
     }
 
+    public function getExtensionMap($directory = false)
+    {
+        $data = array();
+        foreach ($this->mapData as $item) {
+            if ($directory) {
+                $file = str_replace($item['root_directory'], $directory, $item['original_file']);
+            } else {
+                $file = $item['original_file'];
+            }
+            $data[$file] = array(
+                'extends' => $item['new_namespace'] . '\\' . $item['new_class'],
+                'class' => $item['original_class'],
+                'original_file' => $item['original_file']
+            );
+        }
+        return $data;
+    }
+
     public function getClassTransformations()
     {
         $data = array();
@@ -61,4 +79,4 @@ public function getClassTransformations()
         }
         return $data;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Namespacer/Model/Mapper.php b/src/Namespacer/Model/Mapper.php
index 20e33e3..48336e2 100644
--- a/src/Namespacer/Model/Mapper.php
+++ b/src/Namespacer/Model/Mapper.php
@@ -64,6 +64,7 @@ public function getMapDataForFile($file)
             // per-file transformations
             $this->transformInterfaceName($data);
             $this->transformAbstractName($data);
+            $this->transformTraitName($data);
             $this->transformReservedWords($data);
 
             $datas[] = $data;
@@ -132,6 +133,20 @@ protected function transformAbstractName(&$data)
             . $data['new_class'] . '.php';
     }
 
+    protected function transformTraitName(&$data)
+    {
+        if (strtolower($data['new_class']) !== 'trait') {
+            return;
+        }
+
+        $nsParts = array_reverse(explode('\\', $data['new_namespace']));
+        $data['new_class'] = $nsParts[0] . 'Trait';
+
+        $data['new_file'] = $data['root_directory'] . DIRECTORY_SEPARATOR
+            . str_replace('\\', DIRECTORY_SEPARATOR, $data['new_namespace']) . DIRECTORY_SEPARATOR
+            . $data['new_class'] . '.php';
+    }
+
     protected function transformReservedWords(&$data)
     {
         static $reservedWords = array(
diff --git a/src/Namespacer/Model/Transformer.php b/src/Namespacer/Model/Transformer.php
index a7c9042..28d56fa 100644
--- a/src/Namespacer/Model/Transformer.php
+++ b/src/Namespacer/Model/Transformer.php
@@ -47,6 +47,17 @@ public function modifyNamespaceAndClassNames()
         }
     }
 
+    public function modifyOriginalContentForExtension()
+    {
+        $extensionMap = $this->map->getExtensionMap();
+        foreach ($extensionMap as $file => $extends) {
+            if (!file_exists($file)) {
+                throw new \RuntimeException('The file ' . $file . ' could not be found in the filesystem, check your map file is correct.');
+            }
+            $this->modifyOriginalFileforExtension($file, $extends);
+        }
+    }
+
     public function modifyContentForUseStatements()
     {
         $files = $this->map->getNewFiles();
@@ -91,9 +102,37 @@ protected function modifyFileWithNewNamespaceAndClass($file, $names)
         $contents = '';
         $token = reset($tokens);
         do {
-            if ($token[0] === T_CLASS) {
-                $contents .= 'class ' . $names['class'];
-                next($tokens); next($tokens);
+            if ($this->isClass($token[0])) {
+                $contents .= $token[1] . ' ' . $names['class'];
+                next($tokens);
+                next($tokens);
+            } else {
+                $contents .= (is_array($token)) ? $token[1] : $token;
+            }
+        } while ($token = next($tokens));
+
+        file_put_contents($file, $contents);
+    }
+
+    protected function modifyOriginalFileforExtension($file, $names)
+    {
+        $tokens = token_get_all(file_get_contents($file));
+
+        $contents = '';
+        $token = reset($tokens);
+        do {
+            if (T_TRAIT === $token[0]) {
+                $contents .= $token[1] . ' ' . $names['class'];
+                $contents .= "\n{\n";
+                $contents .= "    use \\" . $names['extends'] . ";";
+                $contents .= "\n}\n";
+                break 2;
+            }
+            if ($this->isClass($token[0])) {
+                $contents .= $token[1] . ' ' . $names['class'];
+                $contents .= " extends \\" . $names['extends'];
+                $contents .= "\n{\n}\n";
+                break 2;
             } else {
                 $contents .= (is_array($token)) ? $token[1] : $token;
             }
@@ -247,4 +286,12 @@ protected function modifyFileWithNewUseStatements($file, $classTransformations)
         file_put_contents($file, $contents);
     }
 
+    protected function isClass($token)
+    {
+        return in_array($token, [
+            T_CLASS,
+            T_INTERFACE,
+            T_TRAIT,
+        ], true);
+    }
 }