From 0aaa9981a750c83dc8d22163632b0e9800baf5cd Mon Sep 17 00:00:00 2001
From: n3vrax <n3vra@DESKTOP-4FJE6B6>
Date: Sun, 12 Mar 2017 14:42:51 +0200
Subject: [PATCH 1/7] changed links protocols to https in dashboard templates

---
 templates/app/dashboard.html.twig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/app/dashboard.html.twig b/templates/app/dashboard.html.twig
index 5572300..c9c0050 100644
--- a/templates/app/dashboard.html.twig
+++ b/templates/app/dashboard.html.twig
@@ -133,7 +133,7 @@
                     <ul>
                         <li class="left clearfix">
 								<span class="chat-img pull-left">
-									<img src="http://placehold.it/80/30a5ff/fff" alt="User Avatar" class="img-circle"/>
+									<img src="https://placehold.it/80/30a5ff/fff" alt="User Avatar" class="img-circle"/>
 								</span>
                             <div class="chat-body clearfix">
                                 <div class="header">
@@ -149,7 +149,7 @@
                         </li>
                         <li class="right clearfix">
 								<span class="chat-img pull-right">
-									<img src="http://placehold.it/80/dde0e6/5f6468" alt="User Avatar"
+									<img src="https://placehold.it/80/dde0e6/5f6468" alt="User Avatar"
                                          class="img-circle"/>
 								</span>
                             <div class="chat-body clearfix">
@@ -167,7 +167,7 @@
                         </li>
                         <li class="left clearfix">
 								<span class="chat-img pull-left">
-									<img src="http://placehold.it/80/30a5ff/fff" alt="User Avatar" class="img-circle"/>
+									<img src="https://placehold.it/80/30a5ff/fff" alt="User Avatar" class="img-circle"/>
 								</span>
                             <div class="chat-body clearfix">
                                 <div class="header">

From 94abac0e6ec530931b8000b1715c8b0060282228 Mon Sep 17 00:00:00 2001
From: n3vrax <n3vrax@gmail.com>
Date: Mon, 13 Mar 2017 22:24:29 +0200
Subject: [PATCH 2/7] minor template fixes updated readme

---
 README.md                                                | 2 +-
 composer.json                                            | 2 +-
 templates/partial/form-display-validationgroup.html.twig | 9 +++++----
 templates/partial/form-display.html.twig                 | 7 ++++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index c734ec5..eff492e 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Dotkernel web starter package suitable for admin applications.
 
 Create a new project directory and change dir to it. Run the following composer command
 ```bash
-$ composer create-project -s dev dotkernel/dot-admin .
+$ composer create-project dotkernel/dot-admin .
 ```
 
 ## Configuration
diff --git a/composer.json b/composer.json
index ef2be76..80bfc04 100644
--- a/composer.json
+++ b/composer.json
@@ -55,7 +55,7 @@
     "dotkernel/dot-rbac-guard": "^0.1",
     "dotkernel/dot-session": "^1.0",
     "dotkernel/dot-twigrenderer": "^0.1",
-    "dotkernel/dot-user": "^0.1",
+    "dotkernel/dot-user": "dev-develop as 0.2.x-dev",
     "dotkernel/dot-validator": "^1.0"
   },
   "require-dev": {
diff --git a/templates/partial/form-display-validationgroup.html.twig b/templates/partial/form-display-validationgroup.html.twig
index 13499d8..0e634df 100644
--- a/templates/partial/form-display-validationgroup.html.twig
+++ b/templates/partial/form-display-validationgroup.html.twig
@@ -27,7 +27,10 @@
 
                     {% set dummy = element.setAttribute('class', 'form-control') %}
 
-                    {{ formLabel(element) }}
+                    {% if showLabels and element.getLabel() is defined and element.getLabel() is not empty %}
+                        {{ formLabel(element) }}
+                    {% endif %}
+
                     {{ formCaptcha(element) }}
 
                 </div>
@@ -61,9 +64,7 @@
                     {% set dummy = element.setAttribute('class', 'form-control') %}
 
                     {% if showLabels and element.getLabel() is defined and element.getLabel() is not empty %}
-
                         {{ formLabel(element) }}
-
                     {% endif %}
 
                     {{ formElement(element) }}
@@ -76,4 +77,4 @@
 
     {% endif %}
 
-{% endfor %}
\ No newline at end of file
+{% endfor %}
diff --git a/templates/partial/form-display.html.twig b/templates/partial/form-display.html.twig
index 10fc131..3c20557 100644
--- a/templates/partial/form-display.html.twig
+++ b/templates/partial/form-display.html.twig
@@ -10,7 +10,10 @@
 
             {% set dummy = element.setAttribute('class', 'form-control') %}
 
-            {{ formLabel(element) }}
+            {% if showLabels and element.getLabel() is defined and element.getLabel() is not empty %}
+                {{ formLabel(element) }}
+            {% endif %}
+
             {{ formCaptcha(element) }}
 
         </div>
@@ -48,9 +51,7 @@
             {% set dummy = element.setAttribute('class', 'form-control') %}
 
             {% if showLabels and element.getLabel() is defined and element.getLabel() is not empty %}
-
                 {{ formLabel(element) }}
-
             {% endif %}
 
             {{ formElement(element) }}

From be61246586dce39b01fb1e9494ca598200ce465c Mon Sep 17 00:00:00 2001
From: n3vrax <n3vra@DESKTOP-4FJE6B6>
Date: Mon, 20 Mar 2017 15:18:36 +0200
Subject: [PATCH 3/7] refactoring for ZE2 migration

---
 bin/clear-config-cache.php                    | 16 +++-
 composer.json                                 | 93 ++++++++++---------
 config/autoload/controllers.global.php        | 11 ---
 config/autoload/dependencies.global.php       | 37 ++++++--
 config/autoload/development.local.php.dist    | 37 ++++++++
 config/autoload/ems.global.php                |  7 --
 config/autoload/errorhandler.local.php.dist   | 21 -----
 config/autoload/forms.global.php              | 16 ----
 config/autoload/local.php.dist                |  7 +-
 .../autoload/middleware-pipeline.global.php   | 83 -----------------
 config/autoload/navigation.global.php         | 32 +++++--
 config/autoload/router.global.php             | 12 +++
 config/autoload/routes.global.php             | 15 ---
 config/autoload/templates.global.php          | 35 ++++---
 config/autoload/zend-expressive.global.php    | 15 ++-
 config/config.php                             |  1 +
 config/development.config.php.dist            | 22 ++---
 config/pipeline.php                           | 77 +++++++++++++++
 config/routes.php                             | 54 +++++++++++
 public/index.php                              | 21 ++++-
 .../Authentication/AuthenticationListener.php |  0
 .../Authentication/UnauthorizedListener.php   |  0
 src/Admin/{ => src}/ConfigProvider.php        | 61 ++++++++----
 .../src}/Controller/AdminController.php       |  9 +-
 src/Admin/{ => src}/Entity/AdminEntity.php    |  0
 src/Admin/{ => src}/Entity/RoleEntity.php     |  0
 .../Factory/AdminHydratorFactory.php          |  2 +-
 src/Admin/{ => src}/Form/AccountForm.php      |  0
 src/Admin/{ => src}/Form/AdminFieldset.php    |  0
 src/Admin/{ => src}/Form/AdminForm.php        |  0
 .../{ => src}/Form/ChangePasswordForm.php     |  0
 .../{ => src}/Hydrator/AdminHydrator.php      |  0
 .../Hydrator/RolesHydratingStrategy.php       |  0
 src/Admin/{ => src}/Mapper/AdminDbMapper.php  |  0
 src/Admin/{ => src}/Mapper/RoleDbMapper.php   |  0
 src/Admin/{ => src}/Mapper/TokenDbMapper.php  |  0
 src/Admin/{ => src}/Service/AdminService.php  |  0
 .../Admin/templates/app}/account.html.twig    |  0
 .../templates/app}/admin-table.html.twig      |  0
 .../Admin/templates/app}/login.html.twig      |  0
 src/App/ConfigProvider.php                    | 87 -----------------
 src/App/src/ConfigProvider.php                | 64 +++++++++++++
 .../Controller/DashboardController.php        |  0
 .../Controller/EntityManageBaseController.php |  0
 .../Exception/ExceptionInterface.php          |  0
 .../Exception/InvalidArgumentException.php    |  0
 .../{ => src}/Exception/RuntimeException.php  |  0
 .../Factory/AnnotationsCacheFactory.php       |  2 +-
 src/App/{ => src}/Form/ConfirmDeleteForm.php  |  0
 .../Mapper/SearchFinderMapperTrait.php        |  0
 src/App/{ => src}/Messages.php                |  0
 .../Middleware/AdminIndexMiddleware.php       | 13 +--
 .../Service/AbstractEntityService.php         |  0
 .../Service/EntityServiceInterface.php        |  0
 .../App/templates}/app/bs-table.html.twig     |  0
 .../App/templates}/app/dashboard.html.twig    |  0
 .../App/templates}/error/404.html.twig        |  0
 .../App/templates}/error/error.html.twig      |  0
 .../App/templates}/layout/default.html.twig   |  0
 .../templates}/partial/account-menu.html.twig |  0
 .../templates}/partial/ajax-form.html.twig    |  0
 .../App/templates}/partial/alerts.html.twig   |  0
 .../partial/confirm-delete.html.twig          |  0
 .../form-display-validationgroup.html.twig    |  0
 .../templates}/partial/form-display.html.twig |  0
 .../App/templates}/partial/menu.html.twig     |  0
 .../App/templates}/partial/modals.html.twig   |  0
 src/User/{ => src}/ConfigProvider.php         | 27 ++++--
 .../src}/Controller/UserController.php        |  5 +-
 .../{ => src}/Entity/UserDetailsEntity.php    |  0
 src/User/{ => src}/Entity/UserEntity.php      |  0
 .../{ => src}/Factory/UserDbMapperFactory.php |  2 +-
 .../{ => src}/Factory/UserFieldsetFactory.php |  2 +-
 .../{ => src}/Factory/UserHydratorFactory.php |  2 +-
 .../{ => src}/Form/UserDetailsFieldset.php    |  0
 src/User/{ => src}/Form/UserFieldset.php      |  0
 src/User/{ => src}/Form/UserForm.php          |  0
 .../Hydrator/RolesHydratingStrategy.php       |  0
 src/User/{ => src}/Hydrator/UserHydrator.php  |  0
 src/User/{ => src}/Mapper/UserDbMapper.php    |  0
 src/User/{ => src}/Service/UserService.php    |  0
 .../User/templates/app}/user-table.html.twig  |  0
 templates/.gitkeep                            |  0
 83 files changed, 499 insertions(+), 389 deletions(-)
 delete mode 100644 config/autoload/controllers.global.php
 create mode 100644 config/autoload/development.local.php.dist
 delete mode 100644 config/autoload/ems.global.php
 delete mode 100644 config/autoload/errorhandler.local.php.dist
 delete mode 100644 config/autoload/forms.global.php
 delete mode 100644 config/autoload/middleware-pipeline.global.php
 create mode 100644 config/autoload/router.global.php
 delete mode 100644 config/autoload/routes.global.php
 create mode 100644 config/pipeline.php
 create mode 100644 config/routes.php
 rename src/Admin/{ => src}/Authentication/AuthenticationListener.php (100%)
 rename src/Admin/{ => src}/Authentication/UnauthorizedListener.php (100%)
 rename src/Admin/{ => src}/ConfigProvider.php (74%)
 rename src/{App => Admin/src}/Controller/AdminController.php (92%)
 rename src/Admin/{ => src}/Entity/AdminEntity.php (100%)
 rename src/Admin/{ => src}/Entity/RoleEntity.php (100%)
 rename src/Admin/{ => src}/Factory/AdminHydratorFactory.php (94%)
 rename src/Admin/{ => src}/Form/AccountForm.php (100%)
 rename src/Admin/{ => src}/Form/AdminFieldset.php (100%)
 rename src/Admin/{ => src}/Form/AdminForm.php (100%)
 rename src/Admin/{ => src}/Form/ChangePasswordForm.php (100%)
 rename src/Admin/{ => src}/Hydrator/AdminHydrator.php (100%)
 rename src/Admin/{ => src}/Hydrator/RolesHydratingStrategy.php (100%)
 rename src/Admin/{ => src}/Mapper/AdminDbMapper.php (100%)
 rename src/Admin/{ => src}/Mapper/RoleDbMapper.php (100%)
 rename src/Admin/{ => src}/Mapper/TokenDbMapper.php (100%)
 rename src/Admin/{ => src}/Service/AdminService.php (100%)
 rename {templates/app/admin => src/Admin/templates/app}/account.html.twig (100%)
 rename {templates/app/admin => src/Admin/templates/app}/admin-table.html.twig (100%)
 rename {templates/app/admin => src/Admin/templates/app}/login.html.twig (100%)
 delete mode 100644 src/App/ConfigProvider.php
 create mode 100644 src/App/src/ConfigProvider.php
 rename src/App/{ => src}/Controller/DashboardController.php (100%)
 rename src/App/{ => src}/Controller/EntityManageBaseController.php (100%)
 rename src/App/{ => src}/Exception/ExceptionInterface.php (100%)
 rename src/App/{ => src}/Exception/InvalidArgumentException.php (100%)
 rename src/App/{ => src}/Exception/RuntimeException.php (100%)
 rename src/App/{ => src}/Factory/AnnotationsCacheFactory.php (95%)
 rename src/App/{ => src}/Form/ConfirmDeleteForm.php (100%)
 rename src/App/{ => src}/Mapper/SearchFinderMapperTrait.php (100%)
 rename src/App/{ => src}/Messages.php (100%)
 rename src/App/{ => src}/Middleware/AdminIndexMiddleware.php (82%)
 rename src/App/{ => src}/Service/AbstractEntityService.php (100%)
 rename src/App/{ => src}/Service/EntityServiceInterface.php (100%)
 rename {templates => src/App/templates}/app/bs-table.html.twig (100%)
 rename {templates => src/App/templates}/app/dashboard.html.twig (100%)
 rename {templates => src/App/templates}/error/404.html.twig (100%)
 rename {templates => src/App/templates}/error/error.html.twig (100%)
 rename {templates => src/App/templates}/layout/default.html.twig (100%)
 rename {templates => src/App/templates}/partial/account-menu.html.twig (100%)
 rename {templates => src/App/templates}/partial/ajax-form.html.twig (100%)
 rename {templates => src/App/templates}/partial/alerts.html.twig (100%)
 rename {templates => src/App/templates}/partial/confirm-delete.html.twig (100%)
 rename {templates => src/App/templates}/partial/form-display-validationgroup.html.twig (100%)
 rename {templates => src/App/templates}/partial/form-display.html.twig (100%)
 rename {templates => src/App/templates}/partial/menu.html.twig (100%)
 rename {templates => src/App/templates}/partial/modals.html.twig (100%)
 rename src/User/{ => src}/ConfigProvider.php (78%)
 rename src/{App => User/src}/Controller/UserController.php (92%)
 rename src/User/{ => src}/Entity/UserDetailsEntity.php (100%)
 rename src/User/{ => src}/Entity/UserEntity.php (100%)
 rename src/User/{ => src}/Factory/UserDbMapperFactory.php (96%)
 rename src/User/{ => src}/Factory/UserFieldsetFactory.php (97%)
 rename src/User/{ => src}/Factory/UserHydratorFactory.php (94%)
 rename src/User/{ => src}/Form/UserDetailsFieldset.php (100%)
 rename src/User/{ => src}/Form/UserFieldset.php (100%)
 rename src/User/{ => src}/Form/UserForm.php (100%)
 rename src/User/{ => src}/Hydrator/RolesHydratingStrategy.php (100%)
 rename src/User/{ => src}/Hydrator/UserHydrator.php (100%)
 rename src/User/{ => src}/Mapper/UserDbMapper.php (100%)
 rename src/User/{ => src}/Service/UserService.php (100%)
 rename {templates/app/user => src/User/templates/app}/user-table.html.twig (100%)
 delete mode 100644 templates/.gitkeep

diff --git a/bin/clear-config-cache.php b/bin/clear-config-cache.php
index dd5516a..50a14ce 100644
--- a/bin/clear-config-cache.php
+++ b/bin/clear-config-cache.php
@@ -4,19 +4,23 @@
  *
  * Can also be invoked as `composer clear-config-cache`.
  *
- * @see https://github.com/dotkernel/dot-admin/ for the canonical source repository
- * @copyright Copyright (c) 2017 Apidemia (https://www.apidemia.com)
- * @license https://github.com/dotkernel/dot-admin/blob/master/LICENSE.md MIT License
+ * @see       https://github.com/zendframework/zend-expressive-skeleton for the canonical source repository
+ * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive-skeleton/blob/master/LICENSE.md New BSD License
  */
 
 chdir(__DIR__ . '/../');
+
 require 'vendor/autoload.php';
+
 $config = include 'config/config.php';
-if (!isset($config['config_cache_path'])) {
+
+if (! isset($config['config_cache_path'])) {
     echo "No configuration cache path found" . PHP_EOL;
     exit(0);
 }
-if (!file_exists($config['config_cache_path'])) {
+
+if (! file_exists($config['config_cache_path'])) {
     printf(
         "Configured config cache file '%s' not found%s",
         $config['config_cache_path'],
@@ -24,6 +28,7 @@
     );
     exit(0);
 }
+
 if (false === unlink($config['config_cache_path'])) {
     printf(
         "Error removing config cache file '%s'%s",
@@ -32,6 +37,7 @@
     );
     exit(1);
 }
+
 printf(
     "Removed configured config cache file '%s'%s",
     $config['config_cache_path'],
diff --git a/composer.json b/composer.json
index 80bfc04..7e51ab8 100644
--- a/composer.json
+++ b/composer.json
@@ -9,67 +9,70 @@
       "email": "tibi@apidemia.com"
     }
   ],
+  "config": {
+    "sort-packages": true
+  },
   "require": {
     "php": "^7.1",
     "roave/security-advisories": "dev-master",
-    "zendframework/zend-expressive": "^1.0",
-    "zendframework/zend-expressive-fastroute": "^1.0",
-    "zendframework/zend-servicemanager": "^3.0",
-    "zendframework/zend-expressive-twigrenderer": "^1.0",
+    "zendframework/zend-expressive": "^2.0.2",
+    "zendframework/zend-expressive-fastroute": "^2.0",
+    "zendframework/zend-expressive-twigrenderer": "^1.4",
+    "zendframework/zend-servicemanager": "^3.3.0",
     "zendframework/zend-db": "^2.8",
     "zendframework/zend-i18n": "^2.7",
     "zendframework/zend-i18n-resources": "^2.5",
     "zendframework/zend-captcha": "^2.6",
     "zendframework/zendservice-recaptcha": "^3.0",
     "zendframework/zend-text": "^2.6",
-    "zendframework/zend-stdlib": "^3.0",
+    "zendframework/zend-stdlib": "^3.1",
     "zendframework/zend-psr7bridge": "^0.2.2",
     "zendframework/zend-config": "^3.1",
     "zendframework/zend-config-aggregator": "^0.2.0",
-    "zendframework/zend-component-installer": "^0.6.0 || ~1.0",
+    "zendframework/zend-component-installer": "^1.0 || ^0.7.0",
 
-    "dotkernel/dot-annotated-services": "^1.0",
-    "dotkernel/dot-authentication-service": "^0.1",
-    "dotkernel/dot-authentication-web": "^0.1",
-    "dotkernel/dot-cache": "^1.0",
-    "dotkernel/dot-controller": "^0.1",
-    "dotkernel/dot-controller-plugin-flashmessenger": "^0.1",
-    "dotkernel/dot-controller-plugin-authentication": "^0.1",
-    "dotkernel/dot-controller-plugin-authorization": "^0.1",
-    "dotkernel/dot-controller-plugin-forms": "^0.1",
+    "dotkernel/dot-annotated-services": "^1.1",
+    "dotkernel/dot-authentication-service": "^0.2",
+    "dotkernel/dot-authentication-web": "^0.2",
+    "dotkernel/dot-cache": "^1.1",
+    "dotkernel/dot-controller": "^0.2",
+    "dotkernel/dot-controller-plugin-flashmessenger": "^0.2",
+    "dotkernel/dot-controller-plugin-authentication": "^0.2",
+    "dotkernel/dot-controller-plugin-authorization": "^0.2",
+    "dotkernel/dot-controller-plugin-forms": "^0.2",
     "dotkernel/dot-controller-plugin-mail": "^0.1",
-    "dotkernel/dot-controller-plugin-session": "^0.1",
-    "dotkernel/dot-mapper": "^0.1",
-    "dotkernel/dot-event": "^0.1",
-    "dotkernel/dot-filter": "^1.0",
-    "dotkernel/dot-flashmessenger": "^0.1",
-    "dotkernel/dot-form": "^1.0",
-    "dotkernel/dot-helpers": "^0.1",
-    "dotkernel/dot-hydrator": "^1.0",
-    "dotkernel/dot-inputfilter": "^1.0",
-    "dotkernel/dot-log": "^1.0",
+    "dotkernel/dot-controller-plugin-session": "^0.2",
+    "dotkernel/dot-mapper": "^0.3",
+    "dotkernel/dot-event": "^0.2",
+    "dotkernel/dot-filter": "^1.1",
+    "dotkernel/dot-flashmessenger": "^0.2",
+    "dotkernel/dot-form": "^1.1",
+    "dotkernel/dot-helpers": "^0.2",
+    "dotkernel/dot-hydrator": "^1.1",
+    "dotkernel/dot-inputfilter": "^1.1",
+    "dotkernel/dot-log": "^1.1",
     "dotkernel/dot-mail": "^0.1",
-    "dotkernel/dot-navigation": "^0.1",
-    "dotkernel/dot-paginator": "^1.0",
-    "dotkernel/dot-rbac": "^0.1",
-    "dotkernel/dot-rbac-guard": "^0.1",
-    "dotkernel/dot-session": "^1.0",
-    "dotkernel/dot-twigrenderer": "^0.1",
-    "dotkernel/dot-user": "dev-develop as 0.2.x-dev",
-    "dotkernel/dot-validator": "^1.0"
+    "dotkernel/dot-navigation": "^0.2",
+    "dotkernel/dot-paginator": "^1.1",
+    "dotkernel/dot-rbac": "^0.2",
+    "dotkernel/dot-rbac-guard": "0.2.x-dev",
+    "dotkernel/dot-session": "^2.0",
+    "dotkernel/dot-twigrenderer": "^0.2",
+    "dotkernel/dot-user": "0.2.x-dev",
+    "dotkernel/dot-validator": "^1.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.8",
-    "squizlabs/php_codesniffer": "^2.3",
-    "filp/whoops": "^1.1 || ^2.0",
-    "mikey179/vfsstream": "^1.6",
+    "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+    "squizlabs/php_codesniffer": "^2.8.1",
+    "zendframework/zend-expressive-tooling": "^0.3.2",
+    "filp/whoops": "^2.1.7",
     "zfcampus/zf-development-mode": "^3.1"
   },
   "autoload": {
     "psr-4": {
-      "Admin\\App\\": "src/App/",
-      "Admin\\Admin\\": "src/Admin/",
-      "Admin\\User\\": "src/User/"
+      "Admin\\App\\": "src/App/src",
+      "Admin\\Admin\\": "src/Admin/src",
+      "Admin\\User\\": "src/User/src"
     }
   },
   "autoload-dev": {
@@ -78,24 +81,28 @@
     }
   },
   "scripts": {
+    "post-create-project-cmd": [
+      "@development-enable"
+    ],
     "development-disable": "zf-development-mode disable",
     "development-enable": "zf-development-mode enable",
     "development-status": "zf-development-mode status",
     "check": [
-      "@cs",
+      "@cs-check",
       "@test"
     ],
     "clear-config-cache": "php bin/clear-config-cache.php",
     "cs-check": "phpcs",
     "cs-fix": "phpcbf",
-    "serve": "php -S 0.0.0.0:8080 -t public/ public/index.php",
+    "serve": "php -S 0.0.0.0:8080 -t public public/index.php",
     "test": "phpunit --colors=always",
     "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
     "upload-coverage": "coveralls -v"
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "0.2-dev"
+      "dev-master": "0.2-dev",
+      "dev-develop": "0.3-dev"
     }
   }
 }
diff --git a/config/autoload/controllers.global.php b/config/autoload/controllers.global.php
deleted file mode 100644
index a702621..0000000
--- a/config/autoload/controllers.global.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-return [
-    'dependencies' => [],
-
-    'dot_controller' => [
-        'plugin_manager' => [],
-
-        'event_listeners' => [],
-    ],
-];
diff --git a/config/autoload/dependencies.global.php b/config/autoload/dependencies.global.php
index f2f2ae6..4777cd7 100644
--- a/config/autoload/dependencies.global.php
+++ b/config/autoload/dependencies.global.php
@@ -1,20 +1,39 @@
 <?php
 
 use Zend\Expressive\Application;
-use Zend\Expressive\Container\ApplicationFactory;
+use Zend\Expressive\Container;
+use Zend\Expressive\Delegate;
 use Zend\Expressive\Helper;
+use Zend\Expressive\Middleware;
 
 return [
+    // Provides application-wide services.
+    // We recommend using fully-qualified class names whenever possible as
+    // service names.
     'dependencies' => [
-        'factories' => [
-            Application::class => ApplicationFactory::class,
-            Helper\UrlHelper::class => Helper\UrlHelperFactory::class,
-            Helper\ServerUrlHelper::class => \Zend\ServiceManager\Factory\InvokableFactory::class,
+        // Use 'aliases' to alias a service name to another service. The
+        // key is the alias name, the value is the service to which it points.
+        'aliases' => [
+            'Zend\Expressive\Delegate\DefaultDelegate' => Delegate\NotFoundDelegate::class,
         ],
+        // Use 'invokables' for constructor-less services, or services that do
+        // not require arguments to the constructor. Map a service name to the
+        // class name.
+        'invokables' => [
+            // Fully\Qualified\InterfaceName::class => Fully\Qualified\ClassName::class,
+            Helper\ServerUrlHelper::class => Helper\ServerUrlHelper::class,
+        ],
+        // Use 'factories' for services provided by callbacks/factory classes.
+        'factories'  => [
+            Application::class                => Container\ApplicationFactory::class,
+            Delegate\NotFoundDelegate::class  => Container\NotFoundDelegateFactory::class,
+            Helper\ServerUrlMiddleware::class => Helper\ServerUrlMiddlewareFactory::class,
+            Helper\UrlHelper::class           => Helper\UrlHelperFactory::class,
+            Helper\UrlHelperMiddleware::class => Helper\UrlHelperMiddlewareFactory::class,
 
-        'lazy_services' => [
-            'proxies_target_dir' => 'data/proxies',
-            'proxies_namespace' => 'DotProxy',
-        ]
+            Zend\Stratigility\Middleware\ErrorHandler::class => Container\ErrorHandlerFactory::class,
+            Middleware\ErrorResponseGenerator::class         => Container\ErrorResponseGeneratorFactory::class,
+            Middleware\NotFoundHandler::class                => Container\NotFoundHandlerFactory::class,
+        ],
     ],
 ];
diff --git a/config/autoload/development.local.php.dist b/config/autoload/development.local.php.dist
new file mode 100644
index 0000000..a3b3c0d
--- /dev/null
+++ b/config/autoload/development.local.php.dist
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Development-only configuration.
+ *
+ * Put settings you want enabled when under development mode in this file, and
+ * check it into your repository.
+ *
+ * Developers on your team will then automatically enable them by calling on
+ * `composer development-enable`.
+ */
+
+use Zend\Expressive\Container;
+use Zend\Expressive\Middleware\ErrorResponseGenerator;
+
+return [
+    'dependencies' => [
+        'invokables' => [
+        ],
+        'factories'  => [
+            ErrorResponseGenerator::class       => Container\WhoopsErrorResponseGeneratorFactory::class,
+            'Zend\Expressive\Whoops'            => Container\WhoopsFactory::class,
+            'Zend\Expressive\WhoopsPageHandler' => Container\WhoopsPageHandlerFactory::class,
+        ],
+        'lazy_services' => [
+            'write_proxy_files' => false,
+        ]
+    ],
+
+    'whoops' => [
+        'json_exceptions' => [
+            'display'    => true,
+            'show_trace' => true,
+            'ajax_only'  => true,
+        ],
+    ],
+];
diff --git a/config/autoload/ems.global.php b/config/autoload/ems.global.php
deleted file mode 100644
index e9ec1c5..0000000
--- a/config/autoload/ems.global.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    'dot_ems' => [
-        'default_adapter' => 'database',
-    ]
-];
diff --git a/config/autoload/errorhandler.local.php.dist b/config/autoload/errorhandler.local.php.dist
deleted file mode 100644
index de70e4f..0000000
--- a/config/autoload/errorhandler.local.php.dist
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-return [
-    'dependencies' => [
-        'invokables' => [
-            'Zend\Expressive\Whoops' => Whoops\Run::class,
-            'Zend\Expressive\WhoopsPageHandler' => Whoops\Handler\PrettyPageHandler::class,
-        ],
-        'factories' => [
-            'Zend\Expressive\FinalHandler' => Zend\Expressive\Container\WhoopsErrorHandlerFactory::class,
-        ],
-    ],
-
-    'whoops' => [
-        'json_exceptions' => [
-            'display'    => true,
-            'show_trace' => true,
-            'ajax_only'  => true,
-        ],
-    ],
-];
diff --git a/config/autoload/forms.global.php b/config/autoload/forms.global.php
deleted file mode 100644
index e27fd9e..0000000
--- a/config/autoload/forms.global.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-return [
-    'dot_hydrator' => [
-        'hydrator_manager' => [],
-    ],
-
-    'dot_input_filter' => [
-        'input_filter_manager' => [],
-    ],
-
-    'dot_form' => [
-        'form_manager' => [],
-        'forms' => [],
-    ],
-];
diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist
index 10483a0..8a14df0 100644
--- a/config/autoload/local.php.dist
+++ b/config/autoload/local.php.dist
@@ -1,7 +1,6 @@
 <?php
 
 return [
-    //zend-db database adapters
     'db' => [
         'adapters' => [
             'database' => [
@@ -15,9 +14,15 @@ return [
         ]
     ],
 
+    'dot_mapper' => [
+        'default_adapter' => 'database',
+    ],
+
     'dot_mail' => [
         'default' => [
             'smtp_options' => [
+                'host' => '',
+                'port' => 587,
                 'connection_config' => [
                     'username' => '',
                     'password' => ''
diff --git a/config/autoload/middleware-pipeline.global.php b/config/autoload/middleware-pipeline.global.php
deleted file mode 100644
index 1735bf0..0000000
--- a/config/autoload/middleware-pipeline.global.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-use Zend\Expressive\Container\ApplicationFactory;
-use Zend\Expressive\Helper;
-
-return [
-    'dependencies' => [
-        'factories' => [
-            Helper\ServerUrlMiddleware::class => Helper\ServerUrlMiddlewareFactory::class,
-            Helper\UrlHelperMiddleware::class => Helper\UrlHelperMiddlewareFactory::class,
-        ],
-    ],
-    // This can be used to seed pre- and/or post-routing middleware
-    'middleware_pipeline' => [
-        // An array of middleware to register. Each item is of the following
-        // specification:
-        //
-        // [
-        //  Required:
-        //     'middleware' => 'Name or array of names of middleware services and/or callables',
-        //  Optional:
-        //     'path'     => '/path/to/match', // string; literal path prefix to match
-        //                                     // middleware will not execute
-        //                                     // if path does not match!
-        //     'error'    => true, // boolean; true for error middleware
-        //     'priority' => 1, // int; higher values == register early;
-        //                      // lower/negative == register last;
-        //                      // default is 1, if none is provided.
-        // ],
-        //
-        // While the ApplicationFactory ignores the keys associated with
-        // specifications, they can be used to allow merging related values
-        // defined in multiple configuration files/locations. This file defines
-        // some conventional keys for middleware to execute early, routing
-        // middleware, and error middleware.
-        'always' => [
-            'middleware' => [
-                // Add more middleware here that you want to execute on
-                // every request:
-                // - bootstrapping
-                // - pre-conditions
-                // - modifications to outgoing responses
-                Helper\ServerUrlMiddleware::class,
-                \Dot\Session\SessionMiddleware::class,
-            ],
-            'priority' => 10000,
-        ],
-
-        'routing' => [
-            'middleware' => [
-                ApplicationFactory::ROUTING_MIDDLEWARE,
-                Helper\UrlHelperMiddleware::class,
-
-                \Admin\App\Middleware\AdminIndexMiddleware::class,
-
-                //DK after-routing middleware
-                \Dot\Navigation\NavigationMiddleware::class,
-                \Dot\Rbac\Guard\Middleware\RbacGuardMiddleware::class,
-
-                // Add more middleware here that needs to introspect the routing
-                // results; this might include:
-                // - route-based authentication
-                // - route-based validation
-                // - etc.
-                ApplicationFactory::DISPATCH_MIDDLEWARE,
-            ],
-            'priority' => 1,
-        ],
-
-        [
-            'middleware' => \Dot\Helpers\Middleware\NotFound::class,
-            'priority' => -1
-        ],
-
-        'error' => [
-            'middleware' => [
-                // Add error middleware here.
-            ],
-            'error' => true,
-            'priority' => -10000,
-        ],
-    ],
-];
diff --git a/config/autoload/navigation.global.php b/config/autoload/navigation.global.php
index 6ae352e..cf898f7 100644
--- a/config/autoload/navigation.global.php
+++ b/config/autoload/navigation.global.php
@@ -14,24 +14,30 @@
                         [
                             'options' => [
                                 'label' => 'Dashboard',
-                                'route' => 'dashboard',
-                                'params' => ['action' => ''],
+                                'route' => [
+                                    'route_name' => 'dashboard',
+                                    'route_params' => ['action' => '']
+                                ],
                                 'icon' => 'fa fa-tachometer',
                             ]
                         ],
                         [
                             'options' => [
                                 'label' => 'Manage admins',
-                                'route' => 'user',
-                                'params' => ['action' => 'manage'],
+                                'route' => [
+                                    'route_name' => 'user',
+                                    'route_params' => ['action' => 'manage']
+                                ],
                                 'icon' => 'fa fa-user-circle-o',
                             ],
                         ],
                         [
                             'options' => [
                                 'label' => 'Manage users',
-                                'route' => 'f_user',
-                                'params' => ['action' => 'manage'],
+                                'route' => [
+                                    'route_name' => 'f_user',
+                                    'route_params' => ['action' => 'manage']
+                                ],
                                 'icon' => 'fa fa-user-o',
                             ],
                         ],
@@ -46,22 +52,28 @@
                         [
                             'options' => [
                                 'label' => 'Profile',
-                                'route' => 'user',
-                                'params' => ['action' => 'account'],
+                                'route' => [
+                                    'route_name' => 'user',
+                                    'route_params' => ['action' => 'account']
+                                ],
                                 'icon' => 'fa fa-user',
                             ]
                         ],
                         [
                             'options' => [
                                 'label' => 'Settings',
-                                'route' => 'dashboard',
+                                'route' => [
+                                    'route_name' => 'dashboard',
+                                ],
                                 'icon' => 'fa fa-cog',
                             ]
                         ],
                         [
                             'options' => [
                                 'label' => 'Sign Out',
-                                'route' => 'logout',
+                                'route' => [
+                                    'route_name' => 'logout',
+                                ],
                                 'icon' => 'fa fa-sign-out',
                             ]
                         ]
diff --git a/config/autoload/router.global.php b/config/autoload/router.global.php
new file mode 100644
index 0000000..0505bee
--- /dev/null
+++ b/config/autoload/router.global.php
@@ -0,0 +1,12 @@
+<?php
+
+use Zend\Expressive\Router\FastRouteRouter;
+use Zend\Expressive\Router\RouterInterface;
+
+return [
+    'dependencies' => [
+        'invokables' => [
+            RouterInterface::class => FastRouteRouter::class,
+        ],
+    ],
+];
diff --git a/config/autoload/routes.global.php b/config/autoload/routes.global.php
deleted file mode 100644
index d047c27..0000000
--- a/config/autoload/routes.global.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-return [
-    'dependencies' => [
-        'invokables' => [
-            Zend\Expressive\Router\RouterInterface::class => Zend\Expressive\Router\FastRouteRouter::class,
-        ],
-        // Map middleware -> factories here
-        'factories' => [],
-    ],
-
-    'routes' => [
-        // see Admin\App\ConfigProvider or similar...
-    ],
-];
diff --git a/config/autoload/templates.global.php b/config/autoload/templates.global.php
index 92577f0..79bd6b1 100644
--- a/config/autoload/templates.global.php
+++ b/config/autoload/templates.global.php
@@ -1,37 +1,34 @@
 <?php
 
+use Zend\Expressive\Template\TemplateRendererInterface;
+use Zend\Expressive\Twig\TwigEnvironmentFactory;
+use Zend\Expressive\Twig\TwigRendererFactory;
+
 return [
     'dependencies' => [
         'factories' => [
-            'Zend\Expressive\FinalHandler' =>
-                Zend\Expressive\Container\TemplatedErrorHandlerFactory::class,
-
-            Zend\Expressive\Template\TemplateRendererInterface::class =>
-                Zend\Expressive\Twig\TwigRendererFactory::class,
-
-            Twig_Environment::class =>
-                \Zend\Expressive\Twig\TwigEnvironmentFactory::class,
+            Twig_Environment::class => TwigEnvironmentFactory::class,
+            TemplateRendererInterface::class => TwigRendererFactory::class,
         ],
     ],
 
     'templates' => [
         'extension' => 'html.twig',
-        'paths' => [
-            'app' => [__DIR__ . '/../../templates/app'],
-            'layout' => [__DIR__ . '/../../templates/layout'],
-            'error' => [__DIR__ . '/../../templates/error'],
-            'partial' => [__DIR__ . '/../../templates/partial'],
-            'admin' => [__DIR__ . '/../../templates/app/admin'],
-            'user' => [__DIR__ . '/../../templates/app/user'],
-        ],
     ],
 
     'twig' => [
-        'cache_dir' => __DIR__ . '/../../data/cache/twig',
-        'assets_url' => '/',
+        'cache_dir'      => 'data/cache/twig',
+        'assets_url'     => '/',
         'assets_version' => null,
-        'extensions' => [
+        'extensions'     => [
             // extension service names or instances
         ],
+        'runtime_loaders' => [
+            // runtime loader names or instances
+        ],
+        'globals' => [
+            // Variables to pass to all twig templates
+        ],
+        // 'timezone' => 'default timezone identifier; e.g. America/Chicago',
     ],
 ];
diff --git a/config/autoload/zend-expressive.global.php b/config/autoload/zend-expressive.global.php
index 49d01bb..136efc9 100644
--- a/config/autoload/zend-expressive.global.php
+++ b/config/autoload/zend-expressive.global.php
@@ -3,20 +3,27 @@
 use Zend\ConfigAggregator\ConfigAggregator;
 
 return [
-    // Enable debugging; typically used to provide debugging information within templates.
-    'debug' => false,
-
     // Toggle the configuration cache. Set this to boolean false, or remove the
     // directive, to disable configuration caching. Toggling development mode
     // will also disable it by default; clear the configuration cache using
     // `composer clear-config-cache`.
     ConfigAggregator::ENABLE_CACHE => true,
 
+    // Enable debugging; typically used to provide debugging information within templates.
+    'debug' => false,
+
     'zend-expressive' => [
+        // Enable exception-based error handling via standard middleware.
+        'raise_throwables' => true,
+
+        // Enable programmatic pipeline: Any `middleware_pipeline` or `routes`
+        // configuration will be ignored when creating the `Application` instance.
+        'programmatic_pipeline' => true,
+
         // Provide templates for the error handling middleware to use when
         // generating responses.
         'error_handler' => [
-            'template_404' => 'error::404',
+            'template_404'   => 'error::404',
             'template_error' => 'error::error',
         ],
     ],
diff --git a/config/config.php b/config/config.php
index 8c924ef..bebb3e3 100644
--- a/config/config.php
+++ b/config/config.php
@@ -64,4 +64,5 @@
     // Load development config if it exists
     new PhpFileProvider('config/development.config.php'),
 ], $cacheConfig['config_cache_path']);
+
 return $aggregator->getMergedConfig();
diff --git a/config/development.config.php.dist b/config/development.config.php.dist
index 30a6dfa..f9e594a 100644
--- a/config/development.config.php.dist
+++ b/config/development.config.php.dist
@@ -1,18 +1,24 @@
 <?php
 
 /**
- * Configuration file for the zf-development-mode tool.
+ * File required to allow enablement of development mode.
+ *
+ * For use with the zf-development-mode tool.
  *
  * Usage:
  *  $ composer development-disable
  *  $ composer development-enable
  *  $ composer development-status
  *
- * Put settings you want enabled when under development mode in this file, and
- * check it into your repository.
+ * DO NOT MODIFY THIS FILE.
+ *
+ * Provide your own development-mode settings by editing the file
+ * `config/autoload/development.local.php.dist`.
  *
- * Developers on your team will then automatically enable them by calling on
- * `composer development-enable`.
+ * Because this file is aggregated last, it simply ensures:
+ *
+ * - The `debug` flag is _enabled_.
+ * - Configuration caching is _disabled_.
  */
 
 use Zend\ConfigAggregator\ConfigAggregator;
@@ -20,10 +26,4 @@ use Zend\ConfigAggregator\ConfigAggregator;
 return [
     'debug' => true,
     ConfigAggregator::ENABLE_CACHE => false,
-
-    'dependencies' => [
-        'lazy_services' => [
-            'write_proxy_files' => false,
-        ]
-    ]
 ];
diff --git a/config/pipeline.php b/config/pipeline.php
new file mode 100644
index 0000000..1e53e5f
--- /dev/null
+++ b/config/pipeline.php
@@ -0,0 +1,77 @@
+<?php
+
+use Zend\Expressive\Helper\ServerUrlMiddleware;
+use Zend\Expressive\Helper\UrlHelperMiddleware;
+use Zend\Expressive\Middleware\ImplicitHeadMiddleware;
+use Zend\Expressive\Middleware\ImplicitOptionsMiddleware;
+use Zend\Expressive\Middleware\NotFoundHandler;
+use Zend\Stratigility\Middleware\ErrorHandler;
+use Dot\Rbac\Guard\Middleware\ForbiddenHandler;
+use Dot\Authentication\Web\ErrorHandler\UnauthorizedHandler;
+use Dot\Session\SessionMiddleware;
+use Dot\Navigation\NavigationMiddleware;
+use Dot\Rbac\Guard\Middleware\RbacGuardMiddleware;
+use Admin\App\Middleware\AdminIndexMiddleware;
+use Dot\User\Middleware\AutoLogin;
+
+/**
+ * Setup middleware pipeline:
+ */
+
+// The error handler should be the first (most outer) middleware to catch
+// all Exceptions.
+/** @var \Zend\Expressive\Application $app */
+$app->pipe(ErrorHandler::class);
+// authentication and authorization error handlers
+$app->pipe(ForbiddenHandler::class);
+$app->pipe(UnauthorizedHandler::class);
+
+$app->pipe(ServerUrlMiddleware::class);
+
+// starts the session and tracks session activity
+$app->pipe(SessionMiddleware::class);
+// automatically login the user if it has a valid remember token
+$app->pipe(AutoLogin::class);
+
+// Pipe more middleware here that you want to execute on every request:
+// - bootstrapping
+// - pre-conditions
+// - modifications to outgoing responses
+//
+// Piped Middleware may be either callables or service names. Middleware may
+// also be passed as an array; each item in the array must resolve to
+// middleware eventually (i.e., callable or service name).
+//
+// Middleware can be attached to specific paths, allowing you to mix and match
+// applications under a common domain.  The handlers in each middleware
+// attached this way will see a URI with the MATCHED PATH SEGMENT REMOVED!!!
+//
+// - $app->pipe('/api', $apiMiddleware);
+// - $app->pipe('/docs', $apiDocMiddleware);
+// - $app->pipe('/files', $filesMiddleware);
+
+// Register the routing middleware in the middleware pipeline
+$app->pipeRoutingMiddleware();
+$app->pipe(ImplicitHeadMiddleware::class);
+$app->pipe(ImplicitOptionsMiddleware::class);
+$app->pipe(UrlHelperMiddleware::class);
+
+// Add more middleware here that needs to introspect the routing results; this
+// might include:
+//
+// - route-based authentication
+// - route-based validation
+// - etc.
+
+$app->pipe(AdminIndexMiddleware::class);
+
+$app->pipe(NavigationMiddleware::class);
+$app->pipe(RbacGuardMiddleware::class);
+
+// Register the dispatch middleware in the middleware pipeline
+$app->pipeDispatchMiddleware();
+
+// At this point, if no Response is return by any middleware, the
+// NotFoundHandler kicks in; alternately, you can provide other fallback
+// middleware to execute.
+$app->pipe(NotFoundHandler::class);
diff --git a/config/routes.php b/config/routes.php
new file mode 100644
index 0000000..78f11ad
--- /dev/null
+++ b/config/routes.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Setup routes with a single request method:
+ *
+ * $app->get('/', App\Action\HomePageAction::class, 'home');
+ * $app->post('/album', App\Action\AlbumCreateAction::class, 'album.create');
+ * $app->put('/album/:id', App\Action\AlbumUpdateAction::class, 'album.put');
+ * $app->patch('/album/:id', App\Action\AlbumUpdateAction::class, 'album.patch');
+ * $app->delete('/album/:id', App\Action\AlbumDeleteAction::class, 'album.delete');
+ *
+ * Or with multiple request methods:
+ *
+ * $app->route('/contact', App\Action\ContactAction::class, ['GET', 'POST', ...], 'contact');
+ *
+ * Or handling all request methods:
+ *
+ * $app->route('/contact', App\Action\ContactAction::class)->setName('contact');
+ *
+ * or:
+ *
+ * $app->route(
+ *     '/contact',
+ *     App\Action\ContactAction::class,
+ *     Zend\Expressive\Router\Route::HTTP_METHOD_ANY,
+ *     'contact'
+ * );
+ */
+
+/** @var \Zend\Expressive\Application $app */
+$app->route(
+    '/dashboard[/{action}]',
+    \Admin\App\Controller\DashboardController::class,
+    ['GET', 'POST'],
+    'dashboard'
+);
+
+$app->route('/admin/login', \Dot\Authentication\Web\Action\LoginAction::class, ['GET', 'POST'], 'login');
+$app->route('/admin/logout', \Dot\Authentication\Web\Action\LogoutAction::class, ['GET'], 'logout');
+$app->route(
+    '/admin[/{action}]',
+    [
+        \Admin\Admin\Controller\AdminController::class,
+        \Dot\User\Controller\UserController::class
+    ],
+    ['GET', 'POST'],
+    'user'
+);
+
+$app->route(
+    '/user[/{action}]',
+    \Admin\User\Controller\UserController::class,
+    ['GET', 'POST'],
+    'f_user'
+);
diff --git a/public/index.php b/public/index.php
index f84c136..0fad61d 100644
--- a/public/index.php
+++ b/public/index.php
@@ -10,9 +10,20 @@
 chdir(dirname(__DIR__));
 require 'vendor/autoload.php';
 
-/** @var \Interop\Container\ContainerInterface $container */
-$container = require 'config/container.php';
+/**
+ * Self-called anonymous function that creates its own scope and keep the global namespace clean.
+ */
+call_user_func(function () {
+    /** @var \Interop\Container\ContainerInterface $container */
+    $container = require 'config/container.php';
 
-/** @var \Zend\Expressive\Application $app */
-$app = $container->get(\Zend\Expressive\Application::class);
-$app->run();
+    /** @var \Zend\Expressive\Application $app */
+    $app = $container->get(\Zend\Expressive\Application::class);
+
+    // Import programmatic/declarative middleware pipeline and routing
+    // configuration statements
+    require 'config/pipeline.php';
+    require 'config/routes.php';
+
+    $app->run();
+});
diff --git a/src/Admin/Authentication/AuthenticationListener.php b/src/Admin/src/Authentication/AuthenticationListener.php
similarity index 100%
rename from src/Admin/Authentication/AuthenticationListener.php
rename to src/Admin/src/Authentication/AuthenticationListener.php
diff --git a/src/Admin/Authentication/UnauthorizedListener.php b/src/Admin/src/Authentication/UnauthorizedListener.php
similarity index 100%
rename from src/Admin/Authentication/UnauthorizedListener.php
rename to src/Admin/src/Authentication/UnauthorizedListener.php
diff --git a/src/Admin/ConfigProvider.php b/src/Admin/src/ConfigProvider.php
similarity index 74%
rename from src/Admin/ConfigProvider.php
rename to src/Admin/src/ConfigProvider.php
index 4682033..a8577a6 100644
--- a/src/Admin/ConfigProvider.php
+++ b/src/Admin/src/ConfigProvider.php
@@ -10,6 +10,7 @@
 namespace Admin\Admin;
 
 use Admin\Admin\Authentication\AuthenticationListener;
+use Admin\Admin\Controller\AdminController;
 use Admin\Admin\Entity\AdminEntity;
 use Admin\Admin\Entity\RoleEntity;
 use Admin\Admin\Factory\AdminHydratorFactory;
@@ -21,7 +22,6 @@
 use Admin\Admin\Mapper\AdminDbMapper;
 use Admin\Admin\Mapper\RoleDbMapper;
 use Admin\Admin\Mapper\TokenDbMapper;
-use Admin\App\Controller\AdminController;
 use Dot\Mapper\Factory\DbMapperFactory;
 use Dot\User\Entity\ConfirmTokenEntity;
 use Dot\User\Entity\RememberTokenEntity;
@@ -39,22 +39,28 @@ class ConfigProvider
     public function __invoke(): array
     {
         return [
-            'dependencies' => $this->getDependenciesConfig(),
+            'dependencies' => $this->getDependencies(),
 
-            'dot_ems' => $this->getMapperConfig(),
+            'templates' => $this->getTemplates(),
 
-            'dot_authentication' => $this->getAuthenticationConfig(),
+            'dot_mapper' => $this->getMappers(),
 
-            'dot_form' => $this->getFormsConfig(),
+            'dot_authentication' => $this->getAuthentication(),
 
-            'dot_hydrator' => $this->getHydratorsConfig(),
+            'dot_form' => $this->getForms(),
+
+            'dot_hydrator' => $this->getHydrators(),
 
             'dot_user' => [
                 'user_entity' => AdminEntity::class,
                 'role_entity' => RoleEntity::class,
 
                 'default_roles' => ['admin'],
-                'route_default' => ['route_name' => 'dashboard', 'route_params' => ['action' => '']],
+
+                'route_default' => [
+                    'route_name' => 'dashboard',
+                    'route_params' => ['action' => '']
+                ],
 
                 'enable_account_confirmation' => false,
 
@@ -69,8 +75,8 @@ public function __invoke(): array
                     'enable_recovery' => false,
                 ],
                 'template_options' => [
-                    'login_template' => 'admin::login',
-                    'account_template' => 'admin::account',
+                    'login_template' => 'app::login',
+                    'account_template' => 'app::account',
                 ],
                 'messages_options' => [
                     'messages' => [
@@ -87,14 +93,23 @@ public function __invoke(): array
         ];
     }
 
-    public function getDependenciesConfig(): array
+    public function getDependencies(): array
     {
         return [
 
         ];
     }
 
-    public function getMapperConfig(): array
+    public function getTemplates(): array
+    {
+        return [
+            'paths' => [
+                'app' => [__DIR__ . '/../templates/app']
+            ]
+        ];
+    }
+
+    public function getMappers(): array
     {
         return [
             'mapper_manager' => [
@@ -115,7 +130,7 @@ public function getMapperConfig(): array
         ];
     }
 
-    public function getHydratorsConfig(): array
+    public function getHydrators(): array
     {
         return [
             'hydrator_manager' => [
@@ -129,7 +144,7 @@ public function getHydratorsConfig(): array
         ];
     }
 
-    public function getFormsConfig(): array
+    public function getForms(): array
     {
         return [
             'form_manager' => [
@@ -137,24 +152,36 @@ public function getFormsConfig(): array
                     AdminFieldset::class => UserFieldsetFactory::class,
                     AdminForm::class => InvokableFactory::class,
                     AccountForm::class => InvokableFactory::class,
-                    //ChangePasswordForm::class => InvokableFactory::class,
                 ],
                 'aliases' => [
                     'UserFieldset' => AdminFieldset::class,
                     'AdminFieldset' => AdminFieldset::class,
                     'Admin' => AdminForm::class,
                     'Account' => AccountForm::class,
-                    //'ChangePassword' => ChangePasswordForm::class,
                 ]
             ]
         ];
     }
 
-    public function getAuthenticationConfig(): array
+    public function getAuthentication(): array
     {
         return [
             'web' => [
-                'after_login_route' => ['route_name' => 'dashboard', 'route_params' => ['action' => '']],
+                'login_route' => [
+                    'route_name' => 'login',
+                ],
+
+                'logout_route' => [
+                    'route_name' => 'logout',
+                ],
+
+                'after_logout_route' => [
+                    'route_name' => 'login',
+                ],
+                'after_login_route' => [
+                    'route_name' => 'dashboard',
+                    'route_params' => ['action' => '']
+                ],
 
                 'event_listeners' => [
                     [
diff --git a/src/App/Controller/AdminController.php b/src/Admin/src/Controller/AdminController.php
similarity index 92%
rename from src/App/Controller/AdminController.php
rename to src/Admin/src/Controller/AdminController.php
index 0222e59..0502a78 100644
--- a/src/App/Controller/AdminController.php
+++ b/src/Admin/src/Controller/AdminController.php
@@ -5,11 +5,12 @@
  * @license https://github.com/dotkernel/dot-admin/blob/master/LICENSE.md MIT License
  */
 
-namespace Admin\App\Controller;
+namespace Admin\Admin\Controller;
 
 use Admin\Admin\Entity\AdminEntity;
 use Admin\Admin\Form\AdminForm;
 use Admin\Admin\Service\AdminService;
+use Admin\App\Controller\EntityManageBaseController;
 use Dot\AnnotatedServices\Annotation\Inject;
 use Dot\AnnotatedServices\Annotation\Service;
 use Dot\User\Event\UserControllerEvent;
@@ -32,7 +33,7 @@ class AdminController extends EntityManageBaseController implements UserControll
     const ENTITY_NAME_SINGULAR = 'admin';
     const ENTITY_NAME_PLURAL = 'admins';
     const ENTITY_ROUTE_NAME = 'user';
-    const ENTITY_TEMPLATE_NAME = 'admin::admin-table';
+    const ENTITY_TEMPLATE_NAME = 'app::admin-table';
 
     const ENTITY_FORM_NAME = 'Admin';
     const ENTITY_DELETE_FORM_NAME = 'ConfirmDelete';
@@ -79,8 +80,8 @@ public function changePasswordAction(): ResponseInterface
             return new RedirectResponse($this->url('user', ['action' => 'account']));
         }
 
-        $next = $this->getNext();
-        return $next($this->getRequest(), $this->getResponse());
+        $delegate = $this->getDelegate();
+        return $delegate->process($this->getRequest());
     }
 
     /**
diff --git a/src/Admin/Entity/AdminEntity.php b/src/Admin/src/Entity/AdminEntity.php
similarity index 100%
rename from src/Admin/Entity/AdminEntity.php
rename to src/Admin/src/Entity/AdminEntity.php
diff --git a/src/Admin/Entity/RoleEntity.php b/src/Admin/src/Entity/RoleEntity.php
similarity index 100%
rename from src/Admin/Entity/RoleEntity.php
rename to src/Admin/src/Entity/RoleEntity.php
diff --git a/src/Admin/Factory/AdminHydratorFactory.php b/src/Admin/src/Factory/AdminHydratorFactory.php
similarity index 94%
rename from src/Admin/Factory/AdminHydratorFactory.php
rename to src/Admin/src/Factory/AdminHydratorFactory.php
index 29c37b2..171f511 100644
--- a/src/Admin/Factory/AdminHydratorFactory.php
+++ b/src/Admin/src/Factory/AdminHydratorFactory.php
@@ -11,7 +11,7 @@
 
 use Admin\Admin\Hydrator\AdminHydrator;
 use Admin\Admin\Hydrator\RolesHydratingStrategy;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 /**
  * Class AdminHydratorFactory
diff --git a/src/Admin/Form/AccountForm.php b/src/Admin/src/Form/AccountForm.php
similarity index 100%
rename from src/Admin/Form/AccountForm.php
rename to src/Admin/src/Form/AccountForm.php
diff --git a/src/Admin/Form/AdminFieldset.php b/src/Admin/src/Form/AdminFieldset.php
similarity index 100%
rename from src/Admin/Form/AdminFieldset.php
rename to src/Admin/src/Form/AdminFieldset.php
diff --git a/src/Admin/Form/AdminForm.php b/src/Admin/src/Form/AdminForm.php
similarity index 100%
rename from src/Admin/Form/AdminForm.php
rename to src/Admin/src/Form/AdminForm.php
diff --git a/src/Admin/Form/ChangePasswordForm.php b/src/Admin/src/Form/ChangePasswordForm.php
similarity index 100%
rename from src/Admin/Form/ChangePasswordForm.php
rename to src/Admin/src/Form/ChangePasswordForm.php
diff --git a/src/Admin/Hydrator/AdminHydrator.php b/src/Admin/src/Hydrator/AdminHydrator.php
similarity index 100%
rename from src/Admin/Hydrator/AdminHydrator.php
rename to src/Admin/src/Hydrator/AdminHydrator.php
diff --git a/src/Admin/Hydrator/RolesHydratingStrategy.php b/src/Admin/src/Hydrator/RolesHydratingStrategy.php
similarity index 100%
rename from src/Admin/Hydrator/RolesHydratingStrategy.php
rename to src/Admin/src/Hydrator/RolesHydratingStrategy.php
diff --git a/src/Admin/Mapper/AdminDbMapper.php b/src/Admin/src/Mapper/AdminDbMapper.php
similarity index 100%
rename from src/Admin/Mapper/AdminDbMapper.php
rename to src/Admin/src/Mapper/AdminDbMapper.php
diff --git a/src/Admin/Mapper/RoleDbMapper.php b/src/Admin/src/Mapper/RoleDbMapper.php
similarity index 100%
rename from src/Admin/Mapper/RoleDbMapper.php
rename to src/Admin/src/Mapper/RoleDbMapper.php
diff --git a/src/Admin/Mapper/TokenDbMapper.php b/src/Admin/src/Mapper/TokenDbMapper.php
similarity index 100%
rename from src/Admin/Mapper/TokenDbMapper.php
rename to src/Admin/src/Mapper/TokenDbMapper.php
diff --git a/src/Admin/Service/AdminService.php b/src/Admin/src/Service/AdminService.php
similarity index 100%
rename from src/Admin/Service/AdminService.php
rename to src/Admin/src/Service/AdminService.php
diff --git a/templates/app/admin/account.html.twig b/src/Admin/templates/app/account.html.twig
similarity index 100%
rename from templates/app/admin/account.html.twig
rename to src/Admin/templates/app/account.html.twig
diff --git a/templates/app/admin/admin-table.html.twig b/src/Admin/templates/app/admin-table.html.twig
similarity index 100%
rename from templates/app/admin/admin-table.html.twig
rename to src/Admin/templates/app/admin-table.html.twig
diff --git a/templates/app/admin/login.html.twig b/src/Admin/templates/app/login.html.twig
similarity index 100%
rename from templates/app/admin/login.html.twig
rename to src/Admin/templates/app/login.html.twig
diff --git a/src/App/ConfigProvider.php b/src/App/ConfigProvider.php
deleted file mode 100644
index 979e95a..0000000
--- a/src/App/ConfigProvider.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * @see https://github.com/dotkernel/dot-admin/ for the canonical source repository
- * @copyright Copyright (c) 2017 Apidemia (https://www.apidemia.com)
- * @license https://github.com/dotkernel/dot-admin/blob/master/LICENSE.md MIT License
- */
-
-declare(strict_types = 1);
-
-namespace Admin\App;
-
-use Admin\App\Controller\AdminController;
-use Admin\App\Controller\DashboardController;
-use Admin\App\Controller\UserController as UserManageController;
-use Dot\User\Controller\UserController;
-use Admin\App\Form\ConfirmDeleteForm;
-use Zend\ServiceManager\Factory\InvokableFactory;
-
-/**
- * Class ConfigProvider
- * @package Admin\App
- */
-class ConfigProvider
-{
-    public function __invoke(): array
-    {
-        return [
-            'dependencies' => $this->getDependenciesConfig(),
-
-            'dot_form' => $this->getFormsConfig(),
-
-            'routes' => $this->getRoutesConfig(),
-        ];
-    }
-
-    public function getDependenciesConfig(): array
-    {
-        return [
-
-        ];
-    }
-
-    public function getFormsConfig(): array
-    {
-        return [
-            'form_manager' => [
-                'factories' => [
-                    ConfirmDeleteForm::class => InvokableFactory::class,
-                ],
-                'aliases' => [
-                    'ConfirmDelete' => ConfirmDeleteForm::class,
-                ]
-            ]
-        ];
-    }
-
-    public function getRoutesConfig(): array
-    {
-        return [
-            [
-                'name' => 'dashboard',
-                'path' => '/dashboard[/[{action}]]',
-                'middleware' => DashboardController::class,
-            ],
-            [
-                // there is already a route named `user` from dot-user package,
-                // so we use a diff one for the frontend user management
-                'name' => 'f_user',
-                'path' => '/user[/{action}[/{id:\d+}]]',
-                'middleware' => UserManageController::class,
-            ],
-
-            //change default route paths for user related stuff into admin
-            //we will use 'user' for frontend users
-            'login_route' => [
-                'path' => '/admin/login',
-            ],
-            'logout_route' => [
-                'path' => '/admin/logout',
-            ],
-            'user_route' => [
-                'path' => '/admin[/{action}[/{id:\d+}]]',
-                'middleware' => [AdminController::class, UserController::class],
-            ]
-        ];
-    }
-}
diff --git a/src/App/src/ConfigProvider.php b/src/App/src/ConfigProvider.php
new file mode 100644
index 0000000..c0f2e52
--- /dev/null
+++ b/src/App/src/ConfigProvider.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @see https://github.com/dotkernel/dot-admin/ for the canonical source repository
+ * @copyright Copyright (c) 2017 Apidemia (https://www.apidemia.com)
+ * @license https://github.com/dotkernel/dot-admin/blob/master/LICENSE.md MIT License
+ */
+
+declare(strict_types = 1);
+
+namespace Admin\App;
+
+use Admin\App\Form\ConfirmDeleteForm;
+use Zend\ServiceManager\Factory\InvokableFactory;
+
+/**
+ * Class ConfigProvider
+ * @package Admin\App
+ */
+class ConfigProvider
+{
+    public function __invoke(): array
+    {
+        return [
+            'dependencies' => $this->getDependencies(),
+
+            'dot_form' => $this->getForms(),
+
+            'templates' => $this->getTemplates(),
+        ];
+    }
+
+    public function getDependencies(): array
+    {
+        return [
+
+        ];
+    }
+
+    public function getForms(): array
+    {
+        return [
+            'form_manager' => [
+                'factories' => [
+                    ConfirmDeleteForm::class => InvokableFactory::class,
+                ],
+                'aliases' => [
+                    'ConfirmDelete' => ConfirmDeleteForm::class,
+                ]
+            ]
+        ];
+    }
+
+    public function getTemplates(): array
+    {
+        return [
+            'paths' => [
+                'app' => [__DIR__ . '/../templates/app'],
+                'error' => [__DIR__ . '/../templates/error'],
+                'layout' => [__DIR__ . '/../templates/layout'],
+                'partial' => [__DIR__ . '/../templates/partial']
+            ]
+        ];
+    }
+}
diff --git a/src/App/Controller/DashboardController.php b/src/App/src/Controller/DashboardController.php
similarity index 100%
rename from src/App/Controller/DashboardController.php
rename to src/App/src/Controller/DashboardController.php
diff --git a/src/App/Controller/EntityManageBaseController.php b/src/App/src/Controller/EntityManageBaseController.php
similarity index 100%
rename from src/App/Controller/EntityManageBaseController.php
rename to src/App/src/Controller/EntityManageBaseController.php
diff --git a/src/App/Exception/ExceptionInterface.php b/src/App/src/Exception/ExceptionInterface.php
similarity index 100%
rename from src/App/Exception/ExceptionInterface.php
rename to src/App/src/Exception/ExceptionInterface.php
diff --git a/src/App/Exception/InvalidArgumentException.php b/src/App/src/Exception/InvalidArgumentException.php
similarity index 100%
rename from src/App/Exception/InvalidArgumentException.php
rename to src/App/src/Exception/InvalidArgumentException.php
diff --git a/src/App/Exception/RuntimeException.php b/src/App/src/Exception/RuntimeException.php
similarity index 100%
rename from src/App/Exception/RuntimeException.php
rename to src/App/src/Exception/RuntimeException.php
diff --git a/src/App/Factory/AnnotationsCacheFactory.php b/src/App/src/Factory/AnnotationsCacheFactory.php
similarity index 95%
rename from src/App/Factory/AnnotationsCacheFactory.php
rename to src/App/src/Factory/AnnotationsCacheFactory.php
index 08586dd..e8da8fb 100644
--- a/src/App/Factory/AnnotationsCacheFactory.php
+++ b/src/App/src/Factory/AnnotationsCacheFactory.php
@@ -8,7 +8,7 @@
 namespace Admin\App\Factory;
 
 use Doctrine\Common\Cache\FilesystemCache;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 /**
  * Class AnnotationsCacheFactory
diff --git a/src/App/Form/ConfirmDeleteForm.php b/src/App/src/Form/ConfirmDeleteForm.php
similarity index 100%
rename from src/App/Form/ConfirmDeleteForm.php
rename to src/App/src/Form/ConfirmDeleteForm.php
diff --git a/src/App/Mapper/SearchFinderMapperTrait.php b/src/App/src/Mapper/SearchFinderMapperTrait.php
similarity index 100%
rename from src/App/Mapper/SearchFinderMapperTrait.php
rename to src/App/src/Mapper/SearchFinderMapperTrait.php
diff --git a/src/App/Messages.php b/src/App/src/Messages.php
similarity index 100%
rename from src/App/Messages.php
rename to src/App/src/Messages.php
diff --git a/src/App/Middleware/AdminIndexMiddleware.php b/src/App/src/Middleware/AdminIndexMiddleware.php
similarity index 82%
rename from src/App/Middleware/AdminIndexMiddleware.php
rename to src/App/src/Middleware/AdminIndexMiddleware.php
index 3637d6e..67bdd83 100644
--- a/src/App/Middleware/AdminIndexMiddleware.php
+++ b/src/App/src/Middleware/AdminIndexMiddleware.php
@@ -10,6 +10,8 @@
 use Dot\AnnotatedServices\Annotation\Inject;
 use Dot\AnnotatedServices\Annotation\Service;
 use Dot\Authentication\AuthenticationInterface;
+use Interop\Http\ServerMiddleware\DelegateInterface;
+use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Zend\Diactoros\Response\RedirectResponse;
@@ -21,7 +23,7 @@
  *
  * @Service
  */
-class AdminIndexMiddleware
+class AdminIndexMiddleware implements MiddlewareInterface
 {
     /** @var  AuthenticationInterface */
     protected $authentication;
@@ -44,11 +46,10 @@ public function __construct(AuthenticationInterface $authentication, UrlHelper $
 
     /**
      * @param ServerRequestInterface $request
-     * @param ResponseInterface $response
-     * @param callable|null $next
-     * @return RedirectResponse
+     * @param DelegateInterface $delegate
+     * @return ResponseInterface
      */
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $next = null)
+    public function process(ServerRequestInterface $request, DelegateInterface $delegate): ResponseInterface
     {
         //if root path is accessed and not authenticated send to login page
         //we do this to make interface more user-friendly, by bypassing the authorization guards
@@ -60,6 +61,6 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
             }
         }
 
-        return $next($request, $response);
+        return $delegate->process($request);
     }
 }
diff --git a/src/App/Service/AbstractEntityService.php b/src/App/src/Service/AbstractEntityService.php
similarity index 100%
rename from src/App/Service/AbstractEntityService.php
rename to src/App/src/Service/AbstractEntityService.php
diff --git a/src/App/Service/EntityServiceInterface.php b/src/App/src/Service/EntityServiceInterface.php
similarity index 100%
rename from src/App/Service/EntityServiceInterface.php
rename to src/App/src/Service/EntityServiceInterface.php
diff --git a/templates/app/bs-table.html.twig b/src/App/templates/app/bs-table.html.twig
similarity index 100%
rename from templates/app/bs-table.html.twig
rename to src/App/templates/app/bs-table.html.twig
diff --git a/templates/app/dashboard.html.twig b/src/App/templates/app/dashboard.html.twig
similarity index 100%
rename from templates/app/dashboard.html.twig
rename to src/App/templates/app/dashboard.html.twig
diff --git a/templates/error/404.html.twig b/src/App/templates/error/404.html.twig
similarity index 100%
rename from templates/error/404.html.twig
rename to src/App/templates/error/404.html.twig
diff --git a/templates/error/error.html.twig b/src/App/templates/error/error.html.twig
similarity index 100%
rename from templates/error/error.html.twig
rename to src/App/templates/error/error.html.twig
diff --git a/templates/layout/default.html.twig b/src/App/templates/layout/default.html.twig
similarity index 100%
rename from templates/layout/default.html.twig
rename to src/App/templates/layout/default.html.twig
diff --git a/templates/partial/account-menu.html.twig b/src/App/templates/partial/account-menu.html.twig
similarity index 100%
rename from templates/partial/account-menu.html.twig
rename to src/App/templates/partial/account-menu.html.twig
diff --git a/templates/partial/ajax-form.html.twig b/src/App/templates/partial/ajax-form.html.twig
similarity index 100%
rename from templates/partial/ajax-form.html.twig
rename to src/App/templates/partial/ajax-form.html.twig
diff --git a/templates/partial/alerts.html.twig b/src/App/templates/partial/alerts.html.twig
similarity index 100%
rename from templates/partial/alerts.html.twig
rename to src/App/templates/partial/alerts.html.twig
diff --git a/templates/partial/confirm-delete.html.twig b/src/App/templates/partial/confirm-delete.html.twig
similarity index 100%
rename from templates/partial/confirm-delete.html.twig
rename to src/App/templates/partial/confirm-delete.html.twig
diff --git a/templates/partial/form-display-validationgroup.html.twig b/src/App/templates/partial/form-display-validationgroup.html.twig
similarity index 100%
rename from templates/partial/form-display-validationgroup.html.twig
rename to src/App/templates/partial/form-display-validationgroup.html.twig
diff --git a/templates/partial/form-display.html.twig b/src/App/templates/partial/form-display.html.twig
similarity index 100%
rename from templates/partial/form-display.html.twig
rename to src/App/templates/partial/form-display.html.twig
diff --git a/templates/partial/menu.html.twig b/src/App/templates/partial/menu.html.twig
similarity index 100%
rename from templates/partial/menu.html.twig
rename to src/App/templates/partial/menu.html.twig
diff --git a/templates/partial/modals.html.twig b/src/App/templates/partial/modals.html.twig
similarity index 100%
rename from templates/partial/modals.html.twig
rename to src/App/templates/partial/modals.html.twig
diff --git a/src/User/ConfigProvider.php b/src/User/src/ConfigProvider.php
similarity index 78%
rename from src/User/ConfigProvider.php
rename to src/User/src/ConfigProvider.php
index 2baff46..294b716 100644
--- a/src/User/ConfigProvider.php
+++ b/src/User/src/ConfigProvider.php
@@ -29,24 +29,35 @@ class ConfigProvider
     public function __invoke(): array
     {
         return [
-            'dependencies' => $this->getDependenciesConfig(),
+            'dependencies' => $this->getDependencies(),
 
-            'dot_form' => $this->getFormsConfig(),
+            'dot_form' => $this->getForms(),
 
-            'dot_hydrator' => $this->getHydratorsConfig(),
+            'dot_hydrator' => $this->getHydrators(),
 
-            'dot_ems' => $this->getMappersConfig(),
+            'templates' => $this->getTemplates(),
+
+            'dot_mapper' => $this->getMappers(),
         ];
     }
 
-    public function getDependenciesConfig(): array
+    public function getDependencies(): array
     {
         return [
 
         ];
     }
 
-    public function getFormsConfig(): array
+    public function getTemplates(): array
+    {
+        return [
+            'paths' => [
+                'app' => [__DIR__ . '/../templates/app']
+            ]
+        ];
+    }
+
+    public function getForms(): array
     {
         return [
             'form_manager' => [
@@ -64,7 +75,7 @@ public function getFormsConfig(): array
         ];
     }
 
-    public function getHydratorsConfig(): array
+    public function getHydrators(): array
     {
         return [
             'hydrator_manager' => [
@@ -78,7 +89,7 @@ public function getHydratorsConfig(): array
         ];
     }
 
-    public function getMappersConfig(): array
+    public function getMappers(): array
     {
         return [
             'mapper_manager' => [
diff --git a/src/App/Controller/UserController.php b/src/User/src/Controller/UserController.php
similarity index 92%
rename from src/App/Controller/UserController.php
rename to src/User/src/Controller/UserController.php
index 8e55946..9923e3d 100644
--- a/src/App/Controller/UserController.php
+++ b/src/User/src/Controller/UserController.php
@@ -5,8 +5,9 @@
  * @license https://github.com/dotkernel/dot-admin/blob/master/LICENSE.md MIT License
  */
 
-namespace Admin\App\Controller;
+namespace Admin\User\Controller;
 
+use Admin\App\Controller\EntityManageBaseController;
 use Admin\User\Entity\UserEntity;
 use Admin\User\Form\UserForm;
 use Admin\User\Service\UserService;
@@ -24,7 +25,7 @@ class UserController extends EntityManageBaseController
     const ENTITY_NAME_SINGULAR = 'user';
     const ENTITY_NAME_PLURAL = 'users';
     const ENTITY_ROUTE_NAME = 'f_user';
-    const ENTITY_TEMPLATE_NAME = 'user::user-table';
+    const ENTITY_TEMPLATE_NAME = 'app::user-table';
 
     const ENTITY_FORM_NAME = 'User';
     const ENTITY_DELETE_FORM_NAME = 'ConfirmDelete';
diff --git a/src/User/Entity/UserDetailsEntity.php b/src/User/src/Entity/UserDetailsEntity.php
similarity index 100%
rename from src/User/Entity/UserDetailsEntity.php
rename to src/User/src/Entity/UserDetailsEntity.php
diff --git a/src/User/Entity/UserEntity.php b/src/User/src/Entity/UserEntity.php
similarity index 100%
rename from src/User/Entity/UserEntity.php
rename to src/User/src/Entity/UserEntity.php
diff --git a/src/User/Factory/UserDbMapperFactory.php b/src/User/src/Factory/UserDbMapperFactory.php
similarity index 96%
rename from src/User/Factory/UserDbMapperFactory.php
rename to src/User/src/Factory/UserDbMapperFactory.php
index ffb7a7f..033ae7b 100644
--- a/src/User/Factory/UserDbMapperFactory.php
+++ b/src/User/src/Factory/UserDbMapperFactory.php
@@ -13,7 +13,7 @@
 use Dot\Mapper\Factory\DbMapperFactory;
 use Dot\User\Entity\RoleEntity;
 use Dot\User\Options\UserOptions;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 /**
  * Class UserDbMapperFactory
diff --git a/src/User/Factory/UserFieldsetFactory.php b/src/User/src/Factory/UserFieldsetFactory.php
similarity index 97%
rename from src/User/Factory/UserFieldsetFactory.php
rename to src/User/src/Factory/UserFieldsetFactory.php
index e05fe15..f81ab91 100644
--- a/src/User/Factory/UserFieldsetFactory.php
+++ b/src/User/src/Factory/UserFieldsetFactory.php
@@ -12,7 +12,7 @@
 use Admin\User\Entity\UserEntity;
 use Dot\User\Entity\RoleEntity;
 use Dot\User\Form\UserFieldset;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Zend\Hydrator\HydratorPluginManager;
 
 /**
diff --git a/src/User/Factory/UserHydratorFactory.php b/src/User/src/Factory/UserHydratorFactory.php
similarity index 94%
rename from src/User/Factory/UserHydratorFactory.php
rename to src/User/src/Factory/UserHydratorFactory.php
index 9aa9a25..bce129c 100644
--- a/src/User/Factory/UserHydratorFactory.php
+++ b/src/User/src/Factory/UserHydratorFactory.php
@@ -11,7 +11,7 @@
 
 use Admin\User\Hydrator\UserHydrator;
 use Admin\User\Hydrator\RolesHydratingStrategy;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 /**
  * Class UserHydratorFactory
diff --git a/src/User/Form/UserDetailsFieldset.php b/src/User/src/Form/UserDetailsFieldset.php
similarity index 100%
rename from src/User/Form/UserDetailsFieldset.php
rename to src/User/src/Form/UserDetailsFieldset.php
diff --git a/src/User/Form/UserFieldset.php b/src/User/src/Form/UserFieldset.php
similarity index 100%
rename from src/User/Form/UserFieldset.php
rename to src/User/src/Form/UserFieldset.php
diff --git a/src/User/Form/UserForm.php b/src/User/src/Form/UserForm.php
similarity index 100%
rename from src/User/Form/UserForm.php
rename to src/User/src/Form/UserForm.php
diff --git a/src/User/Hydrator/RolesHydratingStrategy.php b/src/User/src/Hydrator/RolesHydratingStrategy.php
similarity index 100%
rename from src/User/Hydrator/RolesHydratingStrategy.php
rename to src/User/src/Hydrator/RolesHydratingStrategy.php
diff --git a/src/User/Hydrator/UserHydrator.php b/src/User/src/Hydrator/UserHydrator.php
similarity index 100%
rename from src/User/Hydrator/UserHydrator.php
rename to src/User/src/Hydrator/UserHydrator.php
diff --git a/src/User/Mapper/UserDbMapper.php b/src/User/src/Mapper/UserDbMapper.php
similarity index 100%
rename from src/User/Mapper/UserDbMapper.php
rename to src/User/src/Mapper/UserDbMapper.php
diff --git a/src/User/Service/UserService.php b/src/User/src/Service/UserService.php
similarity index 100%
rename from src/User/Service/UserService.php
rename to src/User/src/Service/UserService.php
diff --git a/templates/app/user/user-table.html.twig b/src/User/templates/app/user-table.html.twig
similarity index 100%
rename from templates/app/user/user-table.html.twig
rename to src/User/templates/app/user-table.html.twig
diff --git a/templates/.gitkeep b/templates/.gitkeep
deleted file mode 100644
index e69de29..0000000

From 781168d9c5eb5ee3b15682384b69844816840a5f Mon Sep 17 00:00:00 2001
From: n3vrax <n3vrax@gmail.com>
Date: Tue, 21 Mar 2017 04:11:36 +0200
Subject: [PATCH 4/7] updating

---
 config/autoload/navigation.global.php      |  1 -
 config/autoload/zend-expressive.global.php |  1 +
 src/Admin/src/ConfigProvider.php           |  4 +---
 src/App/templates/error/403.html.twig      | 15 +++++++++++++++
 4 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 src/App/templates/error/403.html.twig

diff --git a/config/autoload/navigation.global.php b/config/autoload/navigation.global.php
index cf898f7..f385711 100644
--- a/config/autoload/navigation.global.php
+++ b/config/autoload/navigation.global.php
@@ -16,7 +16,6 @@
                                 'label' => 'Dashboard',
                                 'route' => [
                                     'route_name' => 'dashboard',
-                                    'route_params' => ['action' => '']
                                 ],
                                 'icon' => 'fa fa-tachometer',
                             ]
diff --git a/config/autoload/zend-expressive.global.php b/config/autoload/zend-expressive.global.php
index 136efc9..6673e4c 100644
--- a/config/autoload/zend-expressive.global.php
+++ b/config/autoload/zend-expressive.global.php
@@ -24,6 +24,7 @@
         // generating responses.
         'error_handler' => [
             'template_404'   => 'error::404',
+            'template_403'   => 'error::403',
             'template_error' => 'error::error',
         ],
     ],
diff --git a/src/Admin/src/ConfigProvider.php b/src/Admin/src/ConfigProvider.php
index a8577a6..da880b8 100644
--- a/src/Admin/src/ConfigProvider.php
+++ b/src/Admin/src/ConfigProvider.php
@@ -58,8 +58,7 @@ public function __invoke(): array
                 'default_roles' => ['admin'],
 
                 'route_default' => [
-                    'route_name' => 'dashboard',
-                    'route_params' => ['action' => '']
+                    'route_name' => 'dashboard'
                 ],
 
                 'enable_account_confirmation' => false,
@@ -180,7 +179,6 @@ public function getAuthentication(): array
                 ],
                 'after_login_route' => [
                     'route_name' => 'dashboard',
-                    'route_params' => ['action' => '']
                 ],
 
                 'event_listeners' => [
diff --git a/src/App/templates/error/403.html.twig b/src/App/templates/error/403.html.twig
new file mode 100644
index 0000000..7040eea
--- /dev/null
+++ b/src/App/templates/error/403.html.twig
@@ -0,0 +1,15 @@
+{% extends '@layout/default.html.twig' %}
+
+{% block title %}{{ status }} {{ reason }}{% endblock %}
+
+{% block content %}
+    <h1 class="page-header">Oops!</h1>
+    <h2>This is awkward.</h2>
+    <p><b>We encountered a {{ status }} {{ reason }} error.</b></p>
+    <p>
+        You don't have enough permissions to view this page. You can <a href="{{ path('logout') }}">Sign out</a>
+        and try with a more permissive user. <br/>
+        Another reason for this error could be that the page you want to access is not available for authenticated
+        users. You should <a href="{{ path('logout') }}">Sign out</a> before.
+    </p>
+{% endblock %}

From fd11885f9a720e60c5bb386a4fd0969e1c6d6f33 Mon Sep 17 00:00:00 2001
From: n3vrax <n3vrax@gmail.com>
Date: Wed, 22 Mar 2017 03:20:11 +0200
Subject: [PATCH 5/7] ZE2 migration done

---
 config/autoload/authentication.global.php     | 10 +++--
 .../autoload/authorization-guards.global.php  | 11 +++--
 config/autoload/cache.global.php              |  6 ++-
 config/autoload/log.global.php                |  4 +-
 config/config.php                             |  8 +++-
 config/pipeline.php                           | 37 +++++++---------
 config/routes.php                             | 42 +++++++++----------
 .../Authentication/UnauthorizedListener.php   | 11 ++---
 src/Admin/src/ConfigProvider.php              |  7 +++-
 src/Admin/src/Form/AccountForm.php            |  1 +
 src/Admin/templates/app/account.html.twig     |  2 +-
 src/App/templates/error/403.html.twig         |  2 +-
 src/App/templates/error/error.html.twig       |  2 +-
 src/App/templates/layout/default.html.twig    |  5 +--
 src/App/templates/partial/ajax-form.html.twig | 17 ++++----
 src/App/templates/partial/menu.html.twig      |  5 +++
 16 files changed, 94 insertions(+), 76 deletions(-)

diff --git a/config/autoload/authentication.global.php b/config/autoload/authentication.global.php
index 859e9d6..4a00ff3 100644
--- a/config/autoload/authentication.global.php
+++ b/config/autoload/authentication.global.php
@@ -1,5 +1,9 @@
 <?php
 
+use Admin\Admin\Entity\AdminEntity;
+use Admin\Admin\Hydrator\AdminHydrator;
+use Dot\User\Service\PasswordCheck;
+
 return [
     'dot_authentication' => [
         'adapter' => [
@@ -7,15 +11,15 @@
             'options' => [
                 'adapter' => 'database',
 
-                'identity_prototype' => \Admin\Admin\Entity\AdminEntity::class,
-                'identity_hydrator' => \Dot\Hydrator\ClassMethodsCamelCase::class,
+                'identity_prototype' => AdminEntity::class,
+                'identity_hydrator' => AdminHydrator::class,
 
                 'table' => 'admin',
 
                 'identity_columns' => ['username', 'email'],
                 'credential_column' => 'password',
 
-                'callback_check' => \Dot\User\Service\PasswordCheck::class
+                'callback_check' => PasswordCheck::class
             ]
         ],
         'storage' => [
diff --git a/config/autoload/authorization-guards.global.php b/config/autoload/authorization-guards.global.php
index ceaea95..e13825a 100644
--- a/config/autoload/authorization-guards.global.php
+++ b/config/autoload/authorization-guards.global.php
@@ -1,8 +1,10 @@
 <?php
 
+use Dot\Rbac\Guard\Guard\GuardInterface;
+
 return [
     'dot_authorization' => [
-        'protection_policy' => \Dot\Rbac\Guard\Guard\GuardInterface::POLICY_DENY,
+        'protection_policy' => GuardInterface::POLICY_DENY,
 
         'event_listeners' => [],
 
@@ -35,7 +37,8 @@
                                         'confirm-account',
                                         'opt-out'
                                     ],
-                                    'roles' => ['guest'],
+                                    // no restriction on these actions because they handle the authentication check
+                                    'roles' => ['*'],
                                 ]
                             ]
                         ]
@@ -54,7 +57,7 @@
                                     'actions' => ['add', 'edit', 'delete'],
                                     'permissions' => [
                                         'permissions' => ['superuser', 'admin-manager'],
-                                        'condition' => \Dot\Rbac\Guard\Guard\GuardInterface::CONDITION_OR,
+                                        'condition' => GuardInterface::CONDITION_OR,
                                     ],
                                 ],
                                 [
@@ -67,7 +70,7 @@
                                     'actions' => [],
                                     'permissions' => [
                                         'permissions' => ['superuser', 'admin'],
-                                        'condition' => \Dot\Rbac\Guard\Guard\GuardInterface::CONDITION_OR
+                                        'condition' => GuardInterface::CONDITION_OR
                                     ]
                                 ],
                             ]
diff --git a/config/autoload/cache.global.php b/config/autoload/cache.global.php
index 2d4a904..63b6d57 100644
--- a/config/autoload/cache.global.php
+++ b/config/autoload/cache.global.php
@@ -1,5 +1,8 @@
 <?php
 
+use Dot\AnnotatedServices\Factory\AbstractAnnotatedFactory;
+use Admin\App\Factory\AnnotationsCacheFactory;
+
 return [
     'annotations_cache_dir' => __DIR__ . '/../../data/cache/annotations',
 
@@ -7,8 +10,7 @@
         'factories' => [
             // used by dot-annotated-services to cache annotations
             // needs to return a cache instance from Doctrine\Common\Cache
-            \Dot\AnnotatedServices\Factory\AbstractAnnotatedFactory::CACHE_SERVICE =>
-                \Admin\App\Factory\AnnotationsCacheFactory::class,
+            AbstractAnnotatedFactory::CACHE_SERVICE => AnnotationsCacheFactory::class,
         ]
     ],
 ];
diff --git a/config/autoload/log.global.php b/config/autoload/log.global.php
index acbdba7..9dfd6c9 100644
--- a/config/autoload/log.global.php
+++ b/config/autoload/log.global.php
@@ -1,5 +1,7 @@
 <?php
 
+use Zend\Log\Logger;
+
 return [
     'dot_log' => [
         'loggers' => [
@@ -7,7 +9,7 @@
                 'writers' => [
                     [
                         'name' => 'db',
-                        'priority' => \Zend\Log\Logger::INFO,
+                        'priority' => Logger::INFO,
                         'options' => [
 
                             'db' => 'database',
diff --git a/config/config.php b/config/config.php
index bebb3e3..5042616 100644
--- a/config/config.php
+++ b/config/config.php
@@ -13,11 +13,15 @@
     // Include cache configuration
     new ArrayProvider($cacheConfig),
 
-    //zend framework
+    //zend framework configs
     \Zend\Db\ConfigProvider::class,
     \Zend\Mail\ConfigProvider::class,
 
-    // dotkernel
+    // dotkernel components default configs
+    // some of these configs are overwriting and customizing the underlying zendframework configs
+    // in case the dotkernel package is heavily based on a zendframework package
+    // you should not include both zendframework config provider and dotkernel's config provider in this case
+    // e.g: dot-filter, dot-paginator, dot-session etc.
     \Dot\AnnotatedServices\ConfigProvider::class,
     \Dot\Authentication\ConfigProvider::class,
     \Dot\Authentication\Web\ConfigProvider::class,
diff --git a/config/pipeline.php b/config/pipeline.php
index 1e53e5f..a4c1ae9 100644
--- a/config/pipeline.php
+++ b/config/pipeline.php
@@ -22,14 +22,11 @@
 // all Exceptions.
 /** @var \Zend\Expressive\Application $app */
 $app->pipe(ErrorHandler::class);
-// authentication and authorization error handlers
-$app->pipe(ForbiddenHandler::class);
-$app->pipe(UnauthorizedHandler::class);
-
 $app->pipe(ServerUrlMiddleware::class);
 
 // starts the session and tracks session activity
 $app->pipe(SessionMiddleware::class);
+
 // automatically login the user if it has a valid remember token
 $app->pipe(AutoLogin::class);
 
@@ -37,35 +34,33 @@
 // - bootstrapping
 // - pre-conditions
 // - modifications to outgoing responses
-//
-// Piped Middleware may be either callables or service names. Middleware may
-// also be passed as an array; each item in the array must resolve to
-// middleware eventually (i.e., callable or service name).
-//
-// Middleware can be attached to specific paths, allowing you to mix and match
-// applications under a common domain.  The handlers in each middleware
-// attached this way will see a URI with the MATCHED PATH SEGMENT REMOVED!!!
-//
-// - $app->pipe('/api', $apiMiddleware);
-// - $app->pipe('/docs', $apiDocMiddleware);
-// - $app->pipe('/files', $filesMiddleware);
 
 // Register the routing middleware in the middleware pipeline
 $app->pipeRoutingMiddleware();
+
+// zend expressive middleware
 $app->pipe(ImplicitHeadMiddleware::class);
 $app->pipe(ImplicitOptionsMiddleware::class);
 $app->pipe(UrlHelperMiddleware::class);
 
+// authentication and authorization error handlers
+// this is piped here to have access to the route result
+// it should be ok, as these particular errors are generated from below middleware or routed middleware
+$app->pipe(ForbiddenHandler::class);
+$app->pipe(UnauthorizedHandler::class);
+
 // Add more middleware here that needs to introspect the routing results; this
-// might include:
-//
-// - route-based authentication
-// - route-based validation
-// - etc.
+// ...
 
+// this middleware redirects to login or dashboard, based on authentication status, if `/` path is accessed
+// this is just to make the UI more friendly, by by-passing the rbac guards in this particular case
 $app->pipe(AdminIndexMiddleware::class);
 
+// navigation middleware makes sure the navigation service is injected the RouteResult
 $app->pipe(NavigationMiddleware::class);
+
+// the RBAC guards protect chunks of the application(routes or controllers or controller actions)
+// the authorization service can be used together with the guards for maximum security and finer control
 $app->pipe(RbacGuardMiddleware::class);
 
 // Register the dispatch middleware in the middleware pipeline
diff --git a/config/routes.php b/config/routes.php
index 78f11ad..2ac6996 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -1,4 +1,12 @@
 <?php
+
+use Admin\App\Controller\DashboardController;
+use Admin\Admin\Controller\AdminController;
+use Dot\Authentication\Web\Action\LoginAction;
+use Dot\Authentication\Web\Action\LogoutAction;
+use Dot\User\Controller\UserController as UserController;
+use Admin\User\Controller\UserController as UserManagementController;
+
 /**
  * Setup routes with a single request method:
  *
@@ -27,28 +35,16 @@
  */
 
 /** @var \Zend\Expressive\Application $app */
-$app->route(
-    '/dashboard[/{action}]',
-    \Admin\App\Controller\DashboardController::class,
-    ['GET', 'POST'],
-    'dashboard'
-);
+// Dashboard controller route
+$app->route('/dashboard[/{action}]', DashboardController::class, ['GET', 'POST'], 'dashboard');
 
-$app->route('/admin/login', \Dot\Authentication\Web\Action\LoginAction::class, ['GET', 'POST'], 'login');
-$app->route('/admin/logout', \Dot\Authentication\Web\Action\LogoutAction::class, ['GET'], 'logout');
-$app->route(
-    '/admin[/{action}]',
-    [
-        \Admin\Admin\Controller\AdminController::class,
-        \Dot\User\Controller\UserController::class
-    ],
-    ['GET', 'POST'],
-    'user'
-);
+// following three routes are for user(in this case user refers to the admin user) authentication and management
+$app->route('/admin/login', LoginAction::class, ['GET', 'POST'], 'login');
+$app->route('/admin/logout', LogoutAction::class, ['GET'], 'logout');
+$app->route('/admin[/{action}[/{id}]]', [AdminController::class, UserController::class], ['GET', 'POST'], 'user');
 
-$app->route(
-    '/user[/{action}]',
-    \Admin\User\Controller\UserController::class,
-    ['GET', 'POST'],
-    'f_user'
-);
+// this route is for the frontend user management(hence the f_ prefix)
+// if this admin application is used without the frontend application(no frontend user management required)
+// you can remove the Admin\User module together with any configuration related to it
+// TODO: we'll offer the option to use admin package without frontend in future releases, as installation scripts
+$app->route('/user[/{action}[/{id}]]', UserManagementController::class, ['GET', 'POST'], 'f_user');
diff --git a/src/Admin/src/Authentication/UnauthorizedListener.php b/src/Admin/src/Authentication/UnauthorizedListener.php
index c1c3486..a5cc0f6 100644
--- a/src/Admin/src/Authentication/UnauthorizedListener.php
+++ b/src/Admin/src/Authentication/UnauthorizedListener.php
@@ -9,6 +9,7 @@
 
 use Dot\Authentication\Web\Event\AbstractAuthenticationEventListener;
 use Dot\Authentication\Web\Event\AuthenticationEvent;
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Zend\Diactoros\Response;
 use Zend\Expressive\Router\RouteResult;
@@ -30,7 +31,7 @@ class UnauthorizedListener extends AbstractAuthenticationEventListener
 
     /**
      * @param AuthenticationEvent $e
-     * @return bool|Response\EmptyResponse
+     * @return ResponseInterface|null
      */
     public function onUnauthorized(AuthenticationEvent $e)
     {
@@ -38,17 +39,17 @@ public function onUnauthorized(AuthenticationEvent $e)
         $request = $e->getParam('request');
         /** @var RouteResult $routeMatch */
         $routeMatch = $request->getAttribute(RouteResult::class);
-
         if ($routeMatch) {
             $routeName = $routeMatch->getMatchedRouteName();
             $params = $routeMatch->getMatchedParams();
-            $action = $params['action'] ?? '';
+            $action = $params['action'] ?? 'index';
 
             if (in_array($routeName, $this->routes) && in_array($action, $this->actions)) {
                 return new Response\EmptyResponse(401);
             }
         }
-
-        return true;
+        // just to make the IDE shut up about returning something
+        // only ResponseInterfaces return types are picked by the event trigger source
+        return null;
     }
 }
diff --git a/src/Admin/src/ConfigProvider.php b/src/Admin/src/ConfigProvider.php
index da880b8..d709f95 100644
--- a/src/Admin/src/ConfigProvider.php
+++ b/src/Admin/src/ConfigProvider.php
@@ -28,6 +28,7 @@
 use Dot\User\Entity\ResetTokenEntity;
 use Dot\User\Factory\UserDbMapperFactory;
 use Dot\User\Factory\UserFieldsetFactory;
+use Dot\User\Options\MessagesOptions;
 use Zend\ServiceManager\Factory\InvokableFactory;
 
 /**
@@ -58,7 +59,8 @@ public function __invoke(): array
                 'default_roles' => ['admin'],
 
                 'route_default' => [
-                    'route_name' => 'dashboard'
+                    'route_name' => 'user',
+                    'route_params' => ['action' => 'account']
                 ],
 
                 'enable_account_confirmation' => false,
@@ -79,7 +81,8 @@ public function __invoke(): array
                 ],
                 'messages_options' => [
                     'messages' => [
-
+                        MessagesOptions::SIGN_OUT_FIRST =>
+                            '<a href="/admin/logout">Sign out</a> first in order to access the requested content'
                     ]
                 ],
 
diff --git a/src/Admin/src/Form/AccountForm.php b/src/Admin/src/Form/AccountForm.php
index fb7df6a..83874c4 100644
--- a/src/Admin/src/Form/AccountForm.php
+++ b/src/Admin/src/Form/AccountForm.php
@@ -52,6 +52,7 @@ public function init()
 
         $this->add([
             'name' => 'submit',
+            'type' => 'submit',
             'attributes' => [
                 'type' => 'submit',
                 'value' => 'Update account'
diff --git a/src/Admin/templates/app/account.html.twig b/src/Admin/templates/app/account.html.twig
index ee97f7c..58d6f25 100644
--- a/src/Admin/templates/app/account.html.twig
+++ b/src/Admin/templates/app/account.html.twig
@@ -3,7 +3,7 @@
 {% block title %}Account{% endblock %}
 
 {% block content %}
-    {{ messagesPartial('partial::alerts') }}
+    {{ messagesPartial('partial::alerts', {dismissible: true}) }}
     <div class="row">
         <div class="col-md-6 col-sm-10 col-lg-5">
             <div class="panel panel-default">
diff --git a/src/App/templates/error/403.html.twig b/src/App/templates/error/403.html.twig
index 7040eea..213e45e 100644
--- a/src/App/templates/error/403.html.twig
+++ b/src/App/templates/error/403.html.twig
@@ -10,6 +10,6 @@
         You don't have enough permissions to view this page. You can <a href="{{ path('logout') }}">Sign out</a>
         and try with a more permissive user. <br/>
         Another reason for this error could be that the page you want to access is not available for authenticated
-        users. You should <a href="{{ path('logout') }}">Sign out</a> before.
+        users. You should <a href="{{ path('logout') }}">Sign out</a> before and try again.
     </p>
 {% endblock %}
diff --git a/src/App/templates/error/error.html.twig b/src/App/templates/error/error.html.twig
index 34dc146..05b39e5 100644
--- a/src/App/templates/error/error.html.twig
+++ b/src/App/templates/error/error.html.twig
@@ -16,7 +16,7 @@
             You don't have enough permissions to view this page. You can <a href="{{ path('logout') }}">Sign out</a>
             and try with a more permissive user. <br/>
             Another reason for this error could be that the page you want to access is not available for authenticated
-            users. You should <a href="{{ path('logout') }}">Sign out</a> before.
+            users. You should <a href="{{ path('logout') }}">Sign out</a> before and try again.
         </p>
     {% endif %}
 {% endblock %}
diff --git a/src/App/templates/layout/default.html.twig b/src/App/templates/layout/default.html.twig
index dfc94ad..76b515b 100644
--- a/src/App/templates/layout/default.html.twig
+++ b/src/App/templates/layout/default.html.twig
@@ -34,7 +34,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="{{ url('dashboard', {'action': ''}) }}"><span>&nbsp;DotKernel</span>Admin</a>
+            <a class="navbar-brand" href="/"><span>&nbsp;DotKernel</span>Admin</a>
             <div class="collapse navbar-collapse">
 
                 {% if hasIdentity() %}
@@ -72,8 +72,7 @@
         {% if hasIdentity() %}
             <div class="row">
                 <ol class="breadcrumb">
-                    <li><a href="#"><i class="fa fa-home"></i></a></li>
-                    <li class="active">Icons</li>
+                    <li><a href="{{ path('dashboard') }}"><i class="fa fa-home"></i></a></li>
                 </ol>
             </div><!--/.row-->
         {% endif %}
diff --git a/src/App/templates/partial/ajax-form.html.twig b/src/App/templates/partial/ajax-form.html.twig
index ca7ea4e..d3404f9 100644
--- a/src/App/templates/partial/ajax-form.html.twig
+++ b/src/App/templates/partial/ajax-form.html.twig
@@ -9,12 +9,15 @@
 
 <script type="application/javascript">
     $(document).ready(function() {
-        $('#rolesSelect').multiselect({
-            buttonContainer: '<div class="input-group"></div>',
-            nonSelectedText: 'Select at least one user role...',
-            allSelectedText: false,
-            numberDisplayed: 4,
-            maxHeight: 200
-        });
+        var roleSelect = $('#rolesSelect');
+        if (roleSelect.length) {
+            roleSelect.multiselect({
+                buttonContainer: '<div class="input-group"></div>',
+                nonSelectedText: 'Select at least one user role...',
+                allSelectedText: false,
+                numberDisplayed: 4,
+                maxHeight: 200
+            });
+        }
     });
 </script>
diff --git a/src/App/templates/partial/menu.html.twig b/src/App/templates/partial/menu.html.twig
index 7b1ef2c..d88250c 100644
--- a/src/App/templates/partial/menu.html.twig
+++ b/src/App/templates/partial/menu.html.twig
@@ -15,16 +15,21 @@
             {% endif %}
 
             {% if page.getOption('type') and page.getOption('type') == 'separator' %}
+
                 <li role="presentation" class="divider"></li>
+
             {% else %}
+
                 <li class="{{ liClass }}">
                     <a href="{{ navigation.getHref(page) }}" {% autoescape false %}{{ pageAttributes(page) ~ extraAttributes }}{% endautoescape %} >
                         {% if page.hasChildren() and depth == 0 %}
+
                             <div data-toggle="collapse" href="#sub-item-{{ loop.index }}">
                                 <i class="{{ page.getOption('icon') }}"></i>&nbsp;
                                 {{ page.getOption('label') }}
                                 <i class="fa fa-chevron-circle-down pull-right"></i>
                             </div>
+
                         {% else %}
                             {% if page.getOption('icon') %}
 

From c058275f68061c7b22c88e1e27d41653f1f23679 Mon Sep 17 00:00:00 2001
From: n3vrax <n3vrax@gmail.com>
Date: Wed, 22 Mar 2017 03:32:38 +0200
Subject: [PATCH 6/7] updated CHANGELOG.md updated user and rbac guard
 dependencies to newly released versions

---
 CHANGELOG.md  | 23 +++++++++++++++++++++++
 composer.json |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90810fb..87a199f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,26 @@
+## 0.2.0 - unreleased
+
+ZE2 migration
+
+### Changed
+* updated factories to PSR11 container and middleware to PSR15
+* refactored folder structure to follow modular application design a la ZE2
+* programmatic pipeline and routes
+* restructured application to match ZE2 structure
+
+### Added
+* Nothing
+
+### Deprecated
+* Nothing
+
+### Removed
+* Nothing
+
+### Fixed
+* Nothing
+
+
 ## 0.1.1 - 2017-03-12
 
 ### Added
diff --git a/composer.json b/composer.json
index 7e51ab8..db93044 100644
--- a/composer.json
+++ b/composer.json
@@ -55,10 +55,10 @@
     "dotkernel/dot-navigation": "^0.2",
     "dotkernel/dot-paginator": "^1.1",
     "dotkernel/dot-rbac": "^0.2",
-    "dotkernel/dot-rbac-guard": "0.2.x-dev",
+    "dotkernel/dot-rbac-guard": "^0.2",
     "dotkernel/dot-session": "^2.0",
     "dotkernel/dot-twigrenderer": "^0.2",
-    "dotkernel/dot-user": "0.2.x-dev",
+    "dotkernel/dot-user": "^0.2",
     "dotkernel/dot-validator": "^1.1"
   },
   "require-dev": {

From 0d8c179b54130a670781f60854c3482023f3457e Mon Sep 17 00:00:00 2001
From: n3vrax <n3vrax@gmail.com>
Date: Wed, 22 Mar 2017 03:38:40 +0200
Subject: [PATCH 7/7] prepare for release

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87a199f..76faf73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.2.0 - unreleased
+## 0.2.0 - 2017-03-22
 
 ZE2 migration