diff --git a/.env.example b/.env.example
new file mode 100644
index 00000000..c3caec60
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,64 @@
+APP_ENV=local
+APP_DEBUG=true
+APP_KEY=SomeRandomString
+APP_URL=http://localhost
+APP_OAUTH_2_0_CLIENT_ID=clientid
+APP_OAUTH_2_0_CLIENT_SECRET=clientsecret
+APP_OAUTH_2_0_AUTH_SERVER_BASE_URL=http://localhost
+
+DB_HOST=localhost
+DB_DATABASE=homestead
+DB_USERNAME=homestead
+DB_PASSWORD=secret
+
+SS_DB_DRIVER=mysql
+SS_DB_HOST=localhost
+SS_DB_DATABASE=homestead
+SS_DB_USERNAME=homestead
+SS_DB_PASSWORD=secret
+
+REDIS_HOST=127.0.0.1
+REDIS_PORT=port
+REDIS_DB=0
+REDIS_PASSWORD=
+
+CACHE_DRIVER=file
+
+SESSION_DRIVER=redis
+SESSION_COOKIE_DOMAIN=
+SESSION_COOKIE_SECURE=false
+
+QUEUE_DRIVER=sync
+
+MAIL_DRIVER=smtp
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+
+CORS_ALLOWED_HEADERS=origin, content-type, accept, authorization, x-requested-with
+CORS_ALLOWED_METHODS=GET, POST, OPTIONS, PUT, DELETE
+CORS_USE_PRE_FLIGHT_CACHING=true
+CORS_MAX_AGE=3200
+CORS_EXPOSED_HEADERS=
+
+CURL_TIMEOUT=3600
+CURL_ALLOWS_REDIRECT=false
+CURL_VERIFY_SSL_CERT=false
+
+ASSETS_BASE_URL=http://www.openstack.org
+SSL_ENABLED=true
+DB_LOG_ENABLED=true
+ACCESS_TOKEN_CACHE_LIFETIME=300
+API_RESPONSE_CACHE_LIFETIME=600
+
+LOG_EMAIL_TO=smarcet@gmail.com
+LOG_EMAIL_FROM=smarcet@gmail.com
+LOG_LEVEL=info
+
+EVENTBRITE_OAUTH2_PERSONAL_TOKEN=
+
+RECAPTCHA_PUBLIC_KEY=
+RECAPTCHA_PRIVATE_KEY=
+
+BANNING_ENABLE=
\ No newline at end of file
diff --git a/.gitattributes b/.gitattributes
index 21256661..f2920314 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,3 @@
-* text=auto
\ No newline at end of file
+* text=auto
+*.css linguist-vendored
+*.less linguist-vendored
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 8141b7fa..df3fa515 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,7 @@
 /vendor
 composer.phar
 composer.lock
-.DS_Storeapp/storage
-/app/storage/*
 .idea/*
-app/config/dev/*
-app/config/testing/*
-app/config/local/*
-app/config/production/*
-app/config/staging/*
-app/config/packages/greggilbert/recaptcha/dev/*
-app/config/packages/greggilbert/recaptcha/local/*
-app/config/packages/greggilbert/recaptcha/production/*
-app/config/packages/greggilbert/recaptcha/staging/*
-/bootstrap/compiled.php
-/bootstrap/environment.php
 .tox
 AUTHORS
 ChangeLog
@@ -23,4 +10,11 @@ doc/build
 *.egg-info
 public/bower_assets
 public/bower_assets/*
-*.log
\ No newline at end of file
+*.log
+/node_modules
+/public/storage
+Homestead.yaml
+Homestead.json
+.env
+.env.testing
+
diff --git a/app/Console/Commands/Inspire.php b/app/Console/Commands/Inspire.php
new file mode 100644
index 00000000..db9ab854
--- /dev/null
+++ b/app/Console/Commands/Inspire.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Foundation\Inspiring;
+
+class Inspire extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'inspire';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Display an inspiring quote';
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $this->comment(PHP_EOL.Inspiring::quote().PHP_EOL);
+    }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
new file mode 100644
index 00000000..71c519d3
--- /dev/null
+++ b/app/Console/Kernel.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Console;
+
+use Illuminate\Console\Scheduling\Schedule;
+use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+
+class Kernel extends ConsoleKernel
+{
+    /**
+     * The Artisan commands provided by your application.
+     *
+     * @var array
+     */
+    protected $commands = [
+        // Commands\Inspire::class,
+    ];
+
+    /**
+     * Define the application's command schedule.
+     *
+     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
+     * @return void
+     */
+    protected function schedule(Schedule $schedule)
+    {
+        // $schedule->command('inspire')
+        //          ->hourly();
+    }
+}
diff --git a/app/Events/Event.php b/app/Events/Event.php
new file mode 100644
index 00000000..ba2f8883
--- /dev/null
+++ b/app/Events/Event.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Events;
+
+abstract class Event
+{
+    //
+}
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
new file mode 100644
index 00000000..53617ef4
--- /dev/null
+++ b/app/Exceptions/Handler.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+use Illuminate\Validation\ValidationException;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+
+class Handler extends ExceptionHandler
+{
+    /**
+     * A list of the exception types that should not be reported.
+     *
+     * @var array
+     */
+    protected $dontReport = [
+        AuthorizationException::class,
+        HttpException::class,
+        ModelNotFoundException::class,
+        ValidationException::class,
+    ];
+
+    /**
+     * Report or log an exception.
+     *
+     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
+     *
+     * @param  \Exception  $e
+     * @return void
+     */
+    public function report(Exception $e)
+    {
+        parent::report($e);
+    }
+
+    /**
+     * Render an exception into an HTTP response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Exception  $e
+     * @return \Illuminate\Http\Response
+     */
+    public function render($request, Exception $e)
+    {
+        return parent::render($request, $e);
+    }
+}
diff --git a/app/factories/FactoriesProvider.php b/app/Factories/FactoriesProvider.php
similarity index 67%
rename from app/factories/FactoriesProvider.php
rename to app/Factories/FactoriesProvider.php
index 65a014af..97f05774 100644
--- a/app/factories/FactoriesProvider.php
+++ b/app/Factories/FactoriesProvider.php
@@ -1,6 +1,4 @@
-<?php
-
-namespace factories;
+<?php namespace Factories;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,15 +11,16 @@ namespace factories;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-use App;
+
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\ServiceProvider;
 
 /**
  * Class FactoriesProvider
  */
-class FactoriesProvider extends ServiceProvider
+final class FactoriesProvider extends ServiceProvider
 {
-    protected $defer = false;
+    protected $defer = true;
 
     public function boot()
     {
@@ -29,6 +28,11 @@ class FactoriesProvider extends ServiceProvider
 
     public function register()
     {
-        App::singleton('oauth2\factories\IOAuth2ClientFactory', 'factories\OAuth2ClientFactory');
+        App::singleton(\OAuth2\Factories\IOAuth2ClientFactory::class, \Factories\OAuth2ClientFactory::class);
+    }
+
+    public function provides()
+    {
+        return [\OAuth2\Factories\IOAuth2ClientFactory::class];
     }
 }
\ No newline at end of file
diff --git a/app/factories/OAuth2ClientFactory.php b/app/Factories/OAuth2ClientFactory.php
similarity index 89%
rename from app/factories/OAuth2ClientFactory.php
rename to app/Factories/OAuth2ClientFactory.php
index 826b07ec..dac5feb2 100644
--- a/app/factories/OAuth2ClientFactory.php
+++ b/app/Factories/OAuth2ClientFactory.php
@@ -1,10 +1,4 @@
-<?php
-namespace factories;
-
-use oauth2\factories\IOAuth2ClientFactory;
-use oauth2\models\IClient;
-use oauth2\OAuth2Protocol;
-
+<?php namespace Factories;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +11,16 @@ use oauth2\OAuth2Protocol;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+
+use OAuth2\Factories\IOAuth2ClientFactory;
+use OAuth2\Models\IClient;
+use Models\OAuth2\Client;
+use OAuth2\OAuth2Protocol;
+
+/**
+ * Class OAuth2ClientFactory
+ * @package Factories
+ */
 final class OAuth2ClientFactory implements IOAuth2ClientFactory
 {
 
@@ -28,7 +32,7 @@ final class OAuth2ClientFactory implements IOAuth2ClientFactory
      */
     public function build($app_name, $owner, $application_type)
     {
-        $client = new \Client
+        $client = new Client
         (
             array
             (
diff --git a/app/controllers/AdminController.php b/app/Http/Controllers/AdminController.php
similarity index 62%
rename from app/controllers/AdminController.php
rename to app/Http/Controllers/AdminController.php
index 22ed92d8..0f5cb2b0 100644
--- a/app/controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -1,23 +1,48 @@
-<?php
-
-use oauth2\services\IApiScopeService;
-use oauth2\services\IApiService;
-use oauth2\services\IClientService;
-use oauth2\services\ITokenService;
-use oauth2\services\IResourceServerService;
-use oauth2\services\IApiEndpointService;
-use utils\services\IAuthService;
-use openid\services\IUserService;
-use utils\services\IServerConfigurationService;
-use utils\services\IBannedIPService;
-use oauth2\repositories\IServerPrivateKeyRepository;
-use oauth2\repositories\IApiScopeGroupRepository;
-use auth\User;
+<?php namespace App\Http\Controllers;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Auth\Repositories\IUserRepository;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Facades\View;
+use Illuminate\Support\Facades\Redirect;
+use OAuth2\Repositories\IAccessTokenRepository;
+use OAuth2\Repositories\IApiEndpointRepository;
+use OAuth2\Repositories\IApiRepository;
+use OAuth2\Repositories\IApiScopeRepository;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Repositories\IRefreshTokenRepository;
+use OAuth2\Repositories\IResourceServerRepository;
+use OAuth2\Services\ITokenService;
+use OAuth2\Repositories\IApiScopeGroupRepository;
+use OAuth2\Repositories\IServerPrivateKeyRepository;
+use OAuth2\Services\IApiEndpointService;
+use OAuth2\Services\IApiScopeService;
+use OAuth2\Services\IApiService;
+use OAuth2\Services\IClientService;
+use OAuth2\Services\IResourceServerService;
+use OpenId\Services\IUserService;
+use Utils\Services\IAuthService;
+use Utils\Services\IBannedIPService;
+use Utils\Services\IServerConfigurationService;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class AdminController
+ * @package App\Http\Controllers
  */
-class AdminController extends BaseController {
+class AdminController extends Controller {
 
     /**
      * @var IClientService
@@ -27,10 +52,17 @@ class AdminController extends BaseController {
      * @var IApiScopeService
      */
     private $scope_service;
+
     /**
-     * @var ITokenService
+     * @var IAccessTokenRepository
      */
-    private $token_service;
+    private $access_token_repository;
+
+    /**
+     * @var IRefreshTokenRepository
+     */
+    private $refresh_token_repository;
+
     /**
      * @var IResourceServerService
      */
@@ -60,6 +92,9 @@ class AdminController extends BaseController {
      */
     private $banned_ips_service;
 
+    /**
+     * @var IServerPrivateKeyRepository
+     */
     private $private_keys_repository;
 
     /**
@@ -67,42 +102,90 @@ class AdminController extends BaseController {
      */
     private $group_repository;
 
-    public function __construct( IClientService $client_service,
-                                 IApiScopeService $scope_service,
-                                 ITokenService $token_service,
-                                 IResourceServerService $resource_server_service,
-                                 IApiService $api_service,
-                                 IApiEndpointService $endpoint_service,
-                                 IAuthService $auth_service,
-                                 IUserService $user_service,
-                                 IServerConfigurationService $configuration_service,
-                                 IBannedIPService $banned_ips_service,
-                                 IServerPrivateKeyRepository $private_keys_repository,
-                                 IApiScopeGroupRepository $group_repository)
+    /**
+     * @var IClientRepository
+     */
+    private $client_repository;
+
+    /**
+     * @var IUserRepository
+     */
+    private $user_repository;
+
+    /**
+     * @var IApiEndpointRepository
+     */
+    private $endpoint_repository;
+
+    /**
+     * @var IApiScopeRepository
+     */
+    private $scope_repository;
+
+    /**
+     * @var IApiRepository
+     */
+    private $api_repository;
+
+    /**
+     * @var IResourceServerRepository
+     */
+    private $resource_server_repository;
+
+    const TokenPageSize = 25;
+
+    public function __construct(
+        IClientService $client_service,
+        IApiScopeService $scope_service,
+        IAccessTokenRepository $access_token_repository,
+        IRefreshTokenRepository $refresh_token_repository,
+        IResourceServerService $resource_server_service,
+        IApiService $api_service,
+        IApiEndpointService $endpoint_service,
+        IAuthService $auth_service,
+        IUserService $user_service,
+        IServerConfigurationService $configuration_service,
+        IBannedIPService $banned_ips_service,
+        IServerPrivateKeyRepository $private_keys_repository,
+        IApiScopeGroupRepository $group_repository,
+        IClientRepository $client_repository,
+        IUserRepository $user_repository,
+        IApiEndpointRepository $endpoint_repository,
+        IApiScopeRepository $scope_repository,
+        IApiRepository $api_repository,
+        IResourceServerRepository $resource_server_repository
+    )
     {
 
-        $this->client_service          = $client_service;
-        $this->scope_service           = $scope_service;
-        $this->token_service           = $token_service;
-        $this->resource_server_service = $resource_server_service;
-        $this->api_service             = $api_service;
-        $this->endpoint_service        = $endpoint_service;
-        $this->auth_service            = $auth_service;
-        $this->user_service            = $user_service;
-        $this->configuration_service   = $configuration_service;
-        $this->banned_ips_service      = $banned_ips_service;
-        $this->private_keys_repository = $private_keys_repository;
-        $this->group_repository        = $group_repository;
+        $this->client_service             = $client_service;
+        $this->scope_service              = $scope_service;
+        $this->access_token_repository    = $access_token_repository;
+        $this->refresh_token_repository   = $refresh_token_repository;
+        $this->resource_server_service    = $resource_server_service;
+        $this->api_service                = $api_service;
+        $this->endpoint_service           = $endpoint_service;
+        $this->auth_service               = $auth_service;
+        $this->user_service               = $user_service;
+        $this->configuration_service      = $configuration_service;
+        $this->banned_ips_service         = $banned_ips_service;
+        $this->private_keys_repository    = $private_keys_repository;
+        $this->group_repository           = $group_repository;
+        $this->client_repository          = $client_repository;
+        $this->user_repository            = $user_repository;
+        $this->endpoint_repository        = $endpoint_repository;
+        $this->scope_repository           = $scope_repository;
+        $this->api_repository             = $api_repository;
+        $this->resource_server_repository = $resource_server_repository;
     }
 
     public function editRegisteredClient($id)
     {
-        $user   = $this->auth_service->getCurrentUser();
-        $client = $this->client_service->getClientByIdentifier($id);
+        $user    = $this->auth_service->getCurrentUser();
+        $client  = $this->client_repository->getClientByIdentifier($id);
 
         if (is_null($client)) {
             Log::warning(sprintf("invalid oauth2 client id %s", $id));
-            return View::make("404");
+            return View::make("errors.404");
         }
 
         $selected_scopes = $client->getClientScopes();
@@ -115,31 +198,33 @@ class AdminController extends BaseController {
         $scopes        = $this->scope_service->getAvailableScopes();
         $group_scopes  = $user->getGroupScopes();
 
-        $access_tokens = $this->token_service->getAccessTokenByClient($client->client_id);
+        $access_tokens = $this->access_token_repository->getAllValidByClientIdentifier($client->getId(), 1 , self::TokenPageSize);
 
-        foreach ($access_tokens as $token) {
+        foreach ($access_tokens->items() as $token) {
             $friendly_scopes = $this->scope_service->getFriendlyScopesByName(explode(' ', $token->scope));
             $token->setFriendlyScopes(implode(',', $friendly_scopes));
         }
 
-        $refresh_tokens = $this->token_service->getRefreshTokenByClient($client->client_id);
+        $refresh_tokens = $this->refresh_token_repository->getAllValidByClientIdentifier($client->getId(), 1 , self::TokenPageSize);
 
-        foreach ($refresh_tokens as $token) {
+        foreach ($refresh_tokens->items() as $token) {
             $friendly_scopes = $this->scope_service->getFriendlyScopesByName(explode(' ', $token->scope));
             $token->setFriendlyScopes(implode(',', $friendly_scopes));
         }
 
         return View::make("oauth2.profile.edit-client",
-            array(
+            [
                 'client'               => $client,
                 'selected_scopes'      => $aux_scopes,
                 'scopes'               => array_merge($scopes, $group_scopes),
-                'access_tokens'        => $access_tokens,
+                'access_tokens'        => $access_tokens->items(),
+                'access_tokens_pages'  => $access_tokens->total() > 0 ? intval(ceil($access_tokens->total() / self::TokenPageSize)) : 0,
                 "is_oauth2_admin"      => $user->isOAuth2ServerAdmin(),
                 "is_openstackid_admin" => $user->isOpenstackIdAdmin(),
                 "use_system_scopes"    => $user->canUseSystemScopes(),
-                'refresh_tokens'       => $refresh_tokens,
-            ));
+                'refresh_tokens'       => $refresh_tokens->items(),
+                'refresh_tokens_pages' => $refresh_tokens->total() > 0 ? intval(ceil($refresh_tokens->total() / self::TokenPageSize)) : 0,
+            ]);
     }
 
     // Api Scope Groups
@@ -147,7 +232,7 @@ class AdminController extends BaseController {
     public function listApiScopeGroups()
     {
         $user                = $this->auth_service->getCurrentUser();
-        $groups              = $this->group_repository->getAll(1,1000);
+        $groups              = $this->group_repository->getAll(1, PHP_INT_MAX);
         $non_selected_scopes = $this->scope_service->getAssignedByGroups();
         return View::make("oauth2.profile.admin.api-scope-groups",array
         (
@@ -162,7 +247,7 @@ class AdminController extends BaseController {
         $group = $this->group_repository->get($id);
 
         if(is_null($group))
-            return Response::view('404', array(), 404);
+            return Response::view('errors.404', array(), 404);
         $user   = $this->auth_service->getCurrentUser();
         $non_selected_scopes = $this->scope_service->getAssignedByGroups();
         return View::make("oauth2.profile.admin.edit-api-scope-group",
@@ -179,7 +264,7 @@ class AdminController extends BaseController {
     // Resource servers
     public function listResourceServers() {
         $user             = $this->auth_service->getCurrentUser();
-        $resource_servers = $this->resource_server_service->getAll(1,1000);
+        $resource_servers = $this->resource_server_repository->getAll(1, PHP_INT_MAX);
         return View::make("oauth2.profile.admin.resource-servers",array(
             "is_oauth2_admin"      => $user->isOAuth2ServerAdmin(),
             "is_openstackid_admin" => $user->isOpenstackIdAdmin(),
@@ -187,9 +272,9 @@ class AdminController extends BaseController {
     }
 
     public function editResourceServer($id){
-        $resource_server = $this->resource_server_service->get($id);
+        $resource_server = $this->resource_server_repository->get($id);
         if(is_null($resource_server))
-            return Response::view('404', array(), 404);
+            return Response::view('errors.404', array(), 404);
         $user   = $this->auth_service->getCurrentUser();
         return View::make("oauth2.profile.admin.edit-resource-server",array(
             "is_oauth2_admin" => $user->isOAuth2ServerAdmin(),
@@ -199,9 +284,9 @@ class AdminController extends BaseController {
     }
 
     public function editApi($id){
-        $api = $this->api_service->get($id);
+        $api = $this->api_repository->get($id);
         if(is_null($api))
-            return Response::view('404', array(), 404);
+            return Response::view('errors.404', array(), 404);
         $user   = $this->auth_service->getCurrentUser();
         return View::make("oauth2.profile.admin.edit-api",array(
             "is_oauth2_admin" => $user->isOAuth2ServerAdmin(),
@@ -210,9 +295,9 @@ class AdminController extends BaseController {
     }
 
     public function editScope($id){
-        $scope = $this->scope_service->get($id);
+        $scope = $this->scope_repository->get($id);
         if(is_null($scope))
-            return Response::view('404', array(), 404);
+            return Response::view('errors.404', array(), 404);
         $user   = $this->auth_service->getCurrentUser();
         return View::make("oauth2.profile.admin.edit-scope",array(
             "is_oauth2_admin" => $user->isOAuth2ServerAdmin(),
@@ -221,18 +306,17 @@ class AdminController extends BaseController {
     }
 
     public function editEndpoint($id){
-        $endpoint = $this->endpoint_service->get($id);
-        if(is_null($endpoint))
-            return Response::view('404', array(), 404);
+        $endpoint = $this->endpoint_repository->get($id);
+        if(is_null($endpoint)) return Response::view('errors.404', array(), 404);
         $user   = $this->auth_service->getCurrentUser();
         $selected_scopes = array();
         $list = $endpoint->scopes()->get(array('id'));
         foreach($list as $selected_scope){
             array_push($selected_scopes,$selected_scope->id);
         }
-        return View::make("oauth2.profile.admin.edit-endpoint",array(
-            "is_oauth2_admin" => $user->isOAuth2ServerAdmin(),
-            "is_openstackid_admin" => $user->isOpenstackIdAdmin(),
+        return View::make('oauth2.profile.admin.edit-endpoint',array(
+            'is_oauth2_admin' => $user->isOAuth2ServerAdmin(),
+            'is_openstackid_admin' => $user->isOpenstackIdAdmin(),
             'endpoint' => $endpoint ,
             'selected_scopes' => $selected_scopes));
     }
@@ -240,15 +324,15 @@ class AdminController extends BaseController {
     public function editIssuedGrants(){
 
         $user           = $this->auth_service->getCurrentUser();
-        $access_tokens  = $this->token_service->getAccessTokenByUserId($user->getId());
-        $refresh_tokens = $this->token_service->getRefreshTokenByUserId($user->getId());
+        $access_tokens  = $this->access_token_repository->getAllValidByUserId($user->getId(), 1, self::TokenPageSize);
+        $refresh_tokens = $this->refresh_token_repository->getAllValidByUserId($user->getId(), 1, self::TokenPageSize);
 
-        foreach($access_tokens as $access_token){
+        foreach($access_tokens->items() as $access_token){
             $friendly_scopes = $this->scope_service->getFriendlyScopesByName(explode(' ',$access_token->scope));
             $access_token->setFriendlyScopes(implode(', ',$friendly_scopes));
         }
 
-        foreach($refresh_tokens as $refresh_token){
+        foreach($refresh_tokens->items() as $refresh_token){
             $friendly_scopes = $this->scope_service->getFriendlyScopesByName(explode(' ',$refresh_token->scope));
             $refresh_token->setFriendlyScopes(implode(', ',$friendly_scopes));
         }
@@ -257,8 +341,10 @@ class AdminController extends BaseController {
             array
             (
                 'user_id'              => $user->getId(),
-                'access_tokens'        => $access_tokens ,
-                'refresh_tokens'       => $refresh_tokens ,
+                'access_tokens'        => $access_tokens->items() ,
+                'access_tokens_pages'  => $access_tokens->total() > 0 ? intval(ceil($access_tokens->total() / self::TokenPageSize)) : 0,
+                'refresh_tokens'       => $refresh_tokens->items(),
+                'refresh_tokens_pages' => $refresh_tokens->total() > 0 ? intval(ceil($refresh_tokens->total() / self::TokenPageSize)) : 0,
                 'is_oauth2_admin'      => $user->isOAuth2ServerAdmin(),
                 'is_openstackid_admin' => $user->isOpenstackIdAdmin(),
             )
@@ -281,13 +367,13 @@ class AdminController extends BaseController {
 
     public function listLockedClients(){
         $user    = $this->auth_service->getCurrentUser();
-        $clients = $this->client_service->getAll(1,1000,array(
-            array(
+        $clients = $this->client_repository->getAll(1, PHP_INT_MAX,[
+            [
                 'name'=>'locked',
                 'op' => '=',
                 'value'=> true
-            )
-        ));
+            ]
+        ]);
 
         return View::make("oauth2.profile.admin.clients", array(
             "username" => $user->getFullName(),
@@ -300,28 +386,28 @@ class AdminController extends BaseController {
 
     public function listLockedUsers(){
         $user    = $this->auth_service->getCurrentUser();
-        $users   = $this->user_service->getAll(1,1000,array(
-            array(
-                'name'=>'lock',
-                'op' => '=',
-                'value'=> true
-            )
-        ));
+        $users   = $this->user_repository->getAll(1, PHP_INT_MAX,[
+            [
+                'name'  => 'lock',
+                'op'    => '=',
+                'value' => true
+            ]
+        ]);
 
-        return View::make("admin.users", array(
-            "username" => $user->getFullName(),
-            "user_id" => $user->getId(),
-            "is_oauth2_admin" => $user->isOAuth2ServerAdmin(),
-            "is_openstackid_admin" => $user->isOpenstackIdAdmin(),
-            'users' => $users,
-        ));
+        return View::make('admin.users', [
+                'username'             => $user->getFullName(),
+                'user_id'              => $user->getId(),
+                'is_oauth2_admin'      => $user->isOAuth2ServerAdmin(),
+                'is_openstackid_admin' => $user->isOpenstackIdAdmin(),
+                'users'                => $users,
+        ]);
     }
 
     public function listServerConfig(){
 
-        $user    = $this->auth_service->getCurrentUser();
+        $user          = $this->auth_service->getCurrentUser();
         $config_values = array();
-        $dictionary = array
+        $dictionary    = array
         (
             'MaxFailed.Login.Attempts',
             'MaxFailed.LoginAttempts.2ShowCaptcha',
@@ -422,14 +508,17 @@ class AdminController extends BaseController {
 
     public function listBannedIPs(){
         $user    = $this->auth_service->getCurrentUser();
-        $ips     = $this->banned_ips_service->getByPage(1,1000);
-        return View::make("admin.banned-ips", array(
-            "username" => $user->getFullName(),
-            "user_id" => $user->getId(),
-            "is_oauth2_admin" => $user->isOAuth2ServerAdmin(),
-            "is_openstackid_admin" => $user->isOpenstackIdAdmin(),
-            "ips" =>$ips
-        ));
+        $ips     = $this->banned_ips_service->getByPage(1, PHP_INT_MAX);
+        return View::make("admin.banned-ips",
+            array
+            (
+                "username"             => $user->getFullName(),
+                "user_id"              => $user->getId(),
+                "is_oauth2_admin"      => $user->isOAuth2ServerAdmin(),
+                "is_openstackid_admin" => $user->isOpenstackIdAdmin(),
+                "ips"                  => $ips
+            )
+        );
     }
 
     public function listServerPrivateKeys(){
@@ -437,7 +526,7 @@ class AdminController extends BaseController {
         $user = $this->auth_service->getCurrentUser();
 
         return View::make("oauth2.profile.admin.server-private-keys", array(
-            'private_keys'         => $this->private_keys_repository->getAll(1,4294967296),
+            'private_keys'         => $this->private_keys_repository->getAll(1, PHP_INT_MAX),
             "is_oauth2_admin"      => $user->isOAuth2ServerAdmin(),
             "is_openstackid_admin" => $user->isOpenstackIdAdmin(),
         ));
diff --git a/app/controllers/apis/AbstractRESTController.php b/app/Http/Controllers/Api/AbstractRESTController.php
similarity index 57%
rename from app/controllers/apis/AbstractRESTController.php
rename to app/Http/Controllers/Api/AbstractRESTController.php
index 3375481b..889af6e8 100644
--- a/app/controllers/apis/AbstractRESTController.php
+++ b/app/Http/Controllers/Api/AbstractRESTController.php
@@ -1,9 +1,21 @@
-<?php
-
-use utils\services\ILogService;
+<?php namespace App\Http\Controllers\Api;
 
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Services\ILogService;
 /**
  * Class AbstractRESTController
+ * @package App\Http\Controllers\Apis
  */
 abstract class AbstractRESTController extends JsonController
 {
@@ -15,8 +27,10 @@ abstract class AbstractRESTController extends JsonController
     protected $filter_delimiter;
     protected $field_delimiter;
 
-
-
+    /**
+     * AbstractRESTController constructor.
+     * @param ILogService $log_service
+     */
     public function __construct(ILogService $log_service)
     {
         parent::__construct($log_service);
@@ -46,7 +60,7 @@ abstract class AbstractRESTController extends JsonController
         $res = array();
         foreach($filters as $fieldname=>$value){
             if(in_array($fieldname,$this->allowed_filter_fields)){
-                array_push($res,array('name'=>$fieldname,'op'=>'=','value'=>$value));
+                array_push($res,['name' => $fieldname, 'op' => '=','value' => $value]);
             }
         }
         return $res;
diff --git a/app/controllers/apis/ApiBannedIPController.php b/app/Http/Controllers/Api/ApiBannedIPController.php
similarity index 67%
rename from app/controllers/apis/ApiBannedIPController.php
rename to app/Http/Controllers/Api/ApiBannedIPController.php
index 0aebce40..52dbd40f 100644
--- a/app/controllers/apis/ApiBannedIPController.php
+++ b/app/Http/Controllers/Api/ApiBannedIPController.php
@@ -1,10 +1,25 @@
-<?php
-
-use utils\services\IBannedIPService;
-use utils\services\ILogService;
+<?php namespace App\Http\Controllers\Api;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Services\IBannedIPService;
+use Utils\Services\ILogService;
+use App\Http\Controllers\ICRUDController;
+use Illuminate\Support\Facades\Input;
+use Exception;
 
 /**
  * Class ApiBannedIPController
+ * @package App\Http\Controllers\Api
  */
 class ApiBannedIPController extends AbstractRESTController implements ICRUDController
 {
@@ -20,8 +35,8 @@ class ApiBannedIPController extends AbstractRESTController implements ICRUDContr
 
         parent::__construct($log_service);
 
-        $this->banned_ip_service = $banned_ip_service;
-        $this->allowed_filter_fields = array();
+        $this->banned_ip_service         = $banned_ip_service;
+        $this->allowed_filter_fields     = array();
         $this->allowed_projection_fields = array('*');
     }
 
@@ -56,9 +71,9 @@ class ApiBannedIPController extends AbstractRESTController implements ICRUDContr
     {
         try {
             //check for optional filters param on querystring
-            $fields = $this->getProjection(Input::get('fields', null));
-            $filters = $this->getFilters(Input::except('fields', 'limit', 'offset'));
-            $page_nbr = intval(Input::get('offset', 1));
+            $fields    = $this->getProjection(Input::get('fields', null));
+            $filters   = $this->getFilters(Input::except('fields', 'limit', 'offset'));
+            $page_nbr  = intval(Input::get('offset', 1));
             $page_size = intval(Input::get('limit', 10));
 
             $list = $this->banned_ip_service->getByPage($page_nbr, $page_size, $filters, $fields);
@@ -67,7 +82,7 @@ class ApiBannedIPController extends AbstractRESTController implements ICRUDContr
                 array_push($items, $ip->toArray());
             }
             return $this->ok(array(
-                'page' => $items,
+                'page'        => $items,
                 'total_items' => $list->getTotal()
             ));
         } catch (Exception $ex) {
@@ -83,7 +98,7 @@ class ApiBannedIPController extends AbstractRESTController implements ICRUDContr
                 $ip = Input::get("ip", null);
             } else {
                 $banned_ip = $this->banned_ip_service->get($id);
-                $ip = $banned_ip->ip;
+                $ip        = $banned_ip->ip;
             }
             if (is_null($ip))
                 return $this->error400('invalid request');
diff --git a/app/controllers/apis/ApiController.php b/app/Http/Controllers/Api/ApiController.php
similarity index 66%
rename from app/controllers/apis/ApiController.php
rename to app/Http/Controllers/Api/ApiController.php
index 6a9a48e9..509c09ad 100644
--- a/app/controllers/apis/ApiController.php
+++ b/app/Http/Controllers/Api/ApiController.php
@@ -1,31 +1,67 @@
-<?php
+<?php namespace App\Http\Controllers\Api;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-use utils\services\ILogService;
-use oauth2\services\IApiService;
-use oauth2\exceptions\InvalidApi;
+use OAuth2\Repositories\IApiRepository;
+use Utils\Services\ILogService;
+use OAuth2\Services\IApiService;
+use OAuth2\Exceptions\InvalidApi;
+use App\Http\Controllers\ICRUDController;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Validator;
+use Exception;
 
 /**
  * Class ApiController
- * REST controller for Api entity CRUD Ops
+ * @package App\Http\Controllers\Api
  */
 class ApiController extends AbstractRESTController implements ICRUDController
 {
-
+    /**
+     * @var IApiService
+     */
     private $api_service;
 
-    public function __construct(IApiService $api_service, ILogService $log_service)
+    /**
+     * @var IApiRepository
+     */
+    private $api_repository;
+
+    /**
+     * ApiController constructor.
+     * @param IApiRepository $api_repository
+     * @param IApiService $api_service
+     * @param ILogService $log_service
+     */
+    public function __construct
+    (
+        IApiRepository $api_repository,
+        IApiService $api_service,
+        ILogService $log_service
+    )
     {
         parent::__construct($log_service);
-        $this->api_service = $api_service;
+        $this->api_repository = $api_repository;
+        $this->api_service    = $api_service;
         //set filters allowed values
-        $this->allowed_filter_fields     = array('resource_server_id');
-        $this->allowed_projection_fields = array('*');
+        $this->allowed_filter_fields     = ['resource_server_id'];
+        $this->allowed_projection_fields = ['*'];
     }
 
     public function get($id)
     {
         try {
-            $api       = $this->api_service->get($id);
+            $api       = $this->api_repository->get($id);
             if(is_null($api)){
                 return $this->error404(array('error' => 'api not found'));
             }
@@ -45,20 +81,28 @@ class ApiController extends AbstractRESTController implements ICRUDController
     {
         try {
             //check for optional filters param on querystring
-            $fields  =  $this->getProjection(Input::get('fields',null));
-            $filters = $this->getFilters(Input::except('fields','limit','offset'));
-            $page_nbr = intval(Input::get('offset',1));
+            $fields    =  $this->getProjection(Input::get('fields',null));
+            $filters   = $this->getFilters(Input::except('fields','limit','offset'));
+            $page_nbr  = intval(Input::get('offset',1));
             $page_size = intval(Input::get('limit',10));
-            $list    = $this->api_service->getAll($page_nbr,$page_size, $filters,$fields);
-            $items   = array();
-            foreach ($list->getItems() as $api) {
+            $list      = $this->api_repository->getAll($page_nbr,$page_size, $filters,$fields);
+            $items     = array();
+            foreach ($list->items() as $api)
+            {
                 array_push($items, $api->toArray());
             }
-            return $this->ok( array(
-                'page' => $items,
-                'total_items' => $list->getTotal()
-            ));
-        } catch (Exception $ex) {
+
+            return $this->ok
+            (
+                array
+                (
+                    'page'        => $items,
+                    'total_items' => $list->total()
+                )
+            );
+        }
+        catch (Exception $ex)
+        {
             $this->log_service->error($ex);
             return $this->error500($ex);
         }
@@ -134,9 +178,9 @@ class ApiController extends AbstractRESTController implements ICRUDController
                 return $this->error400(array('error'=>'validation','messages' => $messages));
             }
 
-            $res = $this->api_service->update(intval($values['id']),$values);
+            $this->api_service->update(intval($values['id']),$values);
 
-            return $res?$this->ok():$this->error400(array('error'=>'operation failed'));
+            return $this->ok();
 
         }
         catch(InvalidApi $ex1){
diff --git a/app/controllers/apis/ApiEndpointController.php b/app/Http/Controllers/Api/ApiEndpointController.php
similarity index 79%
rename from app/controllers/apis/ApiEndpointController.php
rename to app/Http/Controllers/Api/ApiEndpointController.php
index 94fd7cf0..246c946c 100644
--- a/app/controllers/apis/ApiEndpointController.php
+++ b/app/Http/Controllers/Api/ApiEndpointController.php
@@ -1,9 +1,26 @@
-<?php
+<?php namespace App\Http\Controllers\Api;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-use utils\services\ILogService;
-use oauth2\services\IApiEndpointService;
-use  oauth2\exceptions\InvalidApiEndpoint;
-use  oauth2\exceptions\InvalidApiScope;
+use App\Http\Controllers\ICRUDController;
+use Exception;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Validator;
+use OAuth2\Exceptions\InvalidApiEndpoint;
+use OAuth2\Exceptions\InvalidApiScope;
+use OAuth2\Repositories\IApiEndpointRepository;
+use OAuth2\Services\IApiEndpointService;
+use Utils\Services\ILogService;
 
 /**
  * Class ApiEndpointController
@@ -11,12 +28,27 @@ use  oauth2\exceptions\InvalidApiScope;
  */
 class ApiEndpointController extends AbstractRESTController implements ICRUDController {
 
+    /**
+     * @var IApiEndpointService
+     */
     private $api_endpoint_service;
 
-    public function __construct(IApiEndpointService $api_endpoint_service, ILogService $log_service)
+    /**
+     * @var IApiEndpointRepository
+     */
+    private $endpoint_repository;
+
+
+    public function __construct
+    (
+        IApiEndpointService $api_endpoint_service,
+        IApiEndpointRepository $endpoint_repository,
+        ILogService $log_service
+    )
     {
         parent::__construct($log_service);
         $this->api_endpoint_service = $api_endpoint_service;
+        $this->endpoint_repository  = $endpoint_repository;
         //set filters allowed values
         $this->allowed_filter_fields     = array('api_id');
         $this->allowed_projection_fields = array('*');
@@ -43,20 +75,27 @@ class ApiEndpointController extends AbstractRESTController implements ICRUDContr
     {
         try {
             //check for optional filters param on querystring
-            $fields  =  $this->getProjection(Input::get('fields',null));
-            $filters = $this->getFilters(Input::except('fields','limit','offset'));
-            $page_nbr = intval(Input::get('offset',1));
+            $fields    =  $this->getProjection(Input::get('fields',null));
+            $filters   = $this->getFilters(Input::except('fields','limit','offset'));
+            $page_nbr  = intval(Input::get('offset',1));
             $page_size = intval(Input::get('limit',10));
-            $list = $this->api_endpoint_service->getAll($page_nbr, $page_size, $filters,$fields);
-            $items = array();
-            foreach ($list->getItems() as $api_endpoint) {
+            $list      = $this->endpoint_repository->getAll($page_nbr, $page_size, $filters, $fields);
+            $items     = array();
+
+            foreach ($list->items() as $api_endpoint) {
                 array_push($items, $api_endpoint->toArray());
             }
-            return $this->ok( array(
-                'page' => $items,
-                'total_items' => $list->getTotal()
-            ));
-        } catch (Exception $ex) {
+            return $this->ok
+            (
+                array
+                (
+                    'page'        => $items,
+                    'total_items' => $list->total()
+                )
+            );
+        }
+        catch (Exception $ex)
+        {
             $this->log_service->error($ex);
             return $this->error500($ex);
         }
diff --git a/app/controllers/apis/ApiResourceServerController.php b/app/Http/Controllers/Api/ApiResourceServerController.php
similarity index 50%
rename from app/controllers/apis/ApiResourceServerController.php
rename to app/Http/Controllers/Api/ApiResourceServerController.php
index 560e65a4..9fed3938 100644
--- a/app/controllers/apis/ApiResourceServerController.php
+++ b/app/Http/Controllers/Api/ApiResourceServerController.php
@@ -1,11 +1,28 @@
-<?php
-
-use oauth2\exceptions\InvalidResourceServer;
-use oauth2\services\IResourceServerService;
-use utils\services\ILogService;
-
+<?php namespace App\Http\Controllers\Api;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\Exceptions\InvalidResourceServer;
+use OAuth2\Repositories\IResourceServerRepository;
+use OAuth2\Services\IResourceServerService;
+use Utils\Exceptions\EntityNotFoundException;
+use Utils\Services\ILogService;
+use App\Http\Controllers\ICRUDController;
+use Exception;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Validator;
 /**
  * Class ApiResourceServerController
+ * @package App\Http\Controllers\Api
  */
 class ApiResourceServerController extends AbstractRESTController implements ICRUDController
 {
@@ -14,27 +31,43 @@ class ApiResourceServerController extends AbstractRESTController implements ICRU
      */
     private $resource_server_service;
 
-    public function __construct(IResourceServerService $resource_server_service, ILogService $log_service)
+    /**
+     * @var IResourceServerRepository
+     */
+    private $repository;
+
+    /**
+     * ApiResourceServerController constructor.
+     * @param IResourceServerRepository $repository
+     * @param IResourceServerService $resource_server_service
+     * @param ILogService $log_service
+     */
+    public function __construct
+    (
+        IResourceServerRepository $repository,
+        IResourceServerService $resource_server_service,
+        ILogService $log_service
+    )
     {
         parent::__construct($log_service);
-        $this->resource_server_service = $resource_server_service;
-        $this->allowed_filter_fields = array('');
-        $this->allowed_projection_fields = array('*');
+        $this->repository                = $repository;
+        $this->resource_server_service   = $resource_server_service;
+        $this->allowed_filter_fields     = [''];
+        $this->allowed_projection_fields = ['*'];
     }
 
     public function get($id)
     {
         try {
-            $resource_server = $this->resource_server_service->get($id);
+            $resource_server = $this->repository->get($id);
             if (is_null($resource_server)) {
                 return $this->error404(array('error' => 'resource server not found'));
             }
 
-            $data = $resource_server->toArray();
-            $apis = $resource_server->apis()->get(array('id', 'name'));
+            $data         = $resource_server->toArray();
+            $apis         = $resource_server->apis()->get(array('id', 'name'));
             $data['apis'] = $apis->toArray();
-
-            $client = $resource_server->getClient();
+            $client       = $resource_server->getClient();
 
             if (!is_null($client)) {
                 $data['client_id'] = $client->getClientId();
@@ -42,9 +75,9 @@ class ApiResourceServerController extends AbstractRESTController implements ICRU
             }
 
             return $this->ok($data);
-        } catch (Exception $ex) {
+        }
+        catch (Exception $ex) {
             $this->log_service->error($ex);
-
             return $this->error500($ex);
         }
     }
@@ -52,24 +85,25 @@ class ApiResourceServerController extends AbstractRESTController implements ICRU
     public function getByPage()
     {
         try {
-            $fields = $this->getProjection(Input::get('fields', null));
-            $filters = $this->getFilters(Input::except('fields', 'limit', 'offset'));
-            $page_nbr = intval(Input::get('offset', 1));
+            $fields    = $this->getProjection(Input::get('fields', null));
+            $filters   = $this->getFilters(Input::except('fields', 'limit', 'offset'));
+            $page_nbr  = intval(Input::get('offset', 1));
             $page_size = intval(Input::get('limit', 10));
 
-            $list = $this->resource_server_service->getAll($page_nbr, $page_size, $filters, $fields);
-            $items = array();
-            foreach ($list->getItems() as $rs) {
-                array_push($items, $rs->toArray());
+            $paginator = $this->repository->getAll($page_nbr, $page_size, $filters, $fields);
+            $items     = [];
+
+            foreach ($paginator->items() as $rs) {
+                $items[] = $rs->toArray();
             }
 
-            return $this->ok(array(
-                'page' => $items,
-                'total_items' => $list->getTotal()
-            ));
-        } catch (Exception $ex) {
+            return $this->ok([
+                'page'        => $items,
+                'total_items' => $paginator->total()
+            ]);
+        }
+        catch (Exception $ex) {
             $this->log_service->error($ex);
-
             return $this->error500($ex);
         }
     }
@@ -115,12 +149,15 @@ class ApiResourceServerController extends AbstractRESTController implements ICRU
     public function delete($id)
     {
         try {
-            $res = $this->resource_server_service->delete($id);
-
-            return $res ? $this->deleted() : $this->error404(array('error' => 'operation failed'));
-        } catch (Exception $ex) {
+            $this->resource_server_service->delete($id);
+            return $this->deleted();
+        }
+        catch (EntityNotFoundException $ex1) {
+            $this->log_service->warning($ex1);
+            return $this->error404(['message' => $ex1->getMessage()]);
+        }
+        catch (Exception $ex) {
             $this->log_service->error($ex);
-
             return $this->error500($ex);
         }
     }
@@ -131,9 +168,13 @@ class ApiResourceServerController extends AbstractRESTController implements ICRU
             $res = $this->resource_server_service->regenerateClientSecret($id);
 
             return !is_null($res) ? $this->ok(array('new_secret' => $res)) : $this->error404(array('error' => 'operation failed'));
-        } catch (Exception $ex) {
+        }
+        catch (EntityNotFoundException $ex1) {
+            $this->log_service->warning($ex1);
+            return $this->error404(['message' => $ex1->getMessage()]);
+        }
+        catch (Exception $ex) {
             $this->log_service->error($ex);
-
             return $this->error500($ex);
         }
     }
@@ -159,14 +200,18 @@ class ApiResourceServerController extends AbstractRESTController implements ICRU
             }
             $res = $this->resource_server_service->update(intval($values['id']), $values);
 
-            return $res ? $this->ok() : $this->error400(array('error' => 'operation failed'));
-        } catch (InvalidResourceServer $ex1) {
+            return $this->ok();
+        }
+        catch (EntityNotFoundException $ex1) {
+            $this->log_service->warning($ex1);
+            return $this->error404(['message' => $ex1->getMessage()]);
+        }
+        catch (InvalidResourceServer $ex1) {
             $this->log_service->error($ex1);
-
-            return $this->error404(array('error' => $ex1->getMessage()));
-        } catch (Exception $ex) {
+            return $this->error404(array('message' => $ex1->getMessage()));
+        }
+        catch (Exception $ex) {
             $this->log_service->error($ex);
-
             return $this->error500($ex);
         }
     }
@@ -174,12 +219,15 @@ class ApiResourceServerController extends AbstractRESTController implements ICRU
     public function activate($id)
     {
         try {
-            $res = $this->resource_server_service->setStatus($id, true);
-
-            return $res ? $this->ok() : $this->error400(array('error' => 'operation failed'));
-        } catch (Exception $ex) {
+            $this->resource_server_service->setStatus($id, true);
+            return $this->ok();
+        }
+        catch (EntityNotFoundException $ex1) {
+            $this->log_service->warning($ex1);
+            return $this->error404(['message' => $ex1->getMessage()]);
+        }
+        catch (Exception $ex) {
             $this->log_service->error($ex);
-
             return $this->error500($ex);
         }
     }
@@ -187,12 +235,16 @@ class ApiResourceServerController extends AbstractRESTController implements ICRU
     public function deactivate($id)
     {
         try {
-            $res = $this->resource_server_service->setStatus($id, false);
+            $this->resource_server_service->setStatus($id, false);
 
-            return $res ? $this->ok() : $this->error400(array('error' => 'operation failed'));
-        } catch (Exception $ex) {
+            return $this->ok();
+        }
+        catch (EntityNotFoundException $ex1) {
+            $this->log_service->warning($ex1);
+            return $this->error404(['message' => $ex1->getMessage()]);
+        }
+        catch (Exception $ex) {
             $this->log_service->error($ex);
-
             return $this->error500($ex);
         }
     }
diff --git a/app/controllers/apis/ApiScopeController.php b/app/Http/Controllers/Api/ApiScopeController.php
similarity index 75%
rename from app/controllers/apis/ApiScopeController.php
rename to app/Http/Controllers/Api/ApiScopeController.php
index 306290b0..fe301a3a 100644
--- a/app/controllers/apis/ApiScopeController.php
+++ b/app/Http/Controllers/Api/ApiScopeController.php
@@ -1,9 +1,26 @@
-<?php
+<?php namespace App\Http\Controllers\Api;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-use utils\services\ILogService;
-use oauth2\services\IApiScopeService;
-use oauth2\exceptions\InvalidApi;
-use oauth2\exceptions\InvalidApiScope;
+use OAuth2\Repositories\IApiScopeRepository;
+use Utils\Services\ILogService;
+use OAuth2\Services\IApiScopeService;
+use OAuth2\Exceptions\InvalidApi;
+use OAuth2\Exceptions\InvalidApiScope;
+use App\Http\Controllers\ICRUDController;
+use Exception;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Validator;
 
 /**
  * Class ApiScopeController
@@ -15,9 +32,20 @@ class ApiScopeController extends AbstractRESTController implements ICRUDControll
      */
     private $api_scope_service;
 
-    public function __construct(IApiScopeService $api_scope_service,  ILogService $log_service)
+    /**
+     * @var IApiScopeRepository
+     */
+    private $scope_repository;
+
+    public function __construct
+    (
+        IApiScopeRepository $scope_repository,
+        IApiScopeService $api_scope_service,
+        ILogService $log_service
+    )
     {
         parent::__construct($log_service);
+        $this->scope_repository  = $scope_repository;
         $this->api_scope_service = $api_scope_service;
         //set filters allowed values
         $this->allowed_filter_fields     = array('api_id');
@@ -27,7 +55,7 @@ class ApiScopeController extends AbstractRESTController implements ICRUDControll
     public function get($id)
     {
         try {
-            $scope     = $this->api_scope_service->get($id);
+            $scope     = $this->scope_repository->get($id);
             if(is_null($scope)){
                 return $this->error404(array('error' => 'scope not found'));
             }
@@ -43,20 +71,27 @@ class ApiScopeController extends AbstractRESTController implements ICRUDControll
     {
         try {
             //check for optional filters param on querystring
-            $fields  =  $this->getProjection(Input::get('fields',null));
-            $filters = $this->getFilters(Input::except('fields','limit','offset'));
-            $page_nbr = intval(Input::get('offset',1));
+            $fields    =  $this->getProjection(Input::get('fields',null));
+            $filters   = $this->getFilters(Input::except('fields','limit','offset'));
+            $page_nbr  = intval(Input::get('offset',1));
             $page_size = intval(Input::get('limit',10));
 
-            $list = $this->api_scope_service->getAll($page_nbr, $page_size, $filters,$fields);
+            $list  = $this->scope_repository->getAll($page_nbr, $page_size, $filters,$fields);
             $items = array();
-            foreach ($list->getItems() as $scope) {
+
+            foreach ($list->items() as $scope)
+            {
                 array_push($items, $scope->toArray());
             }
-            return $this->ok( array(
-                'page' => $items,
-                'total_items' => $list->getTotal()
-            ));
+
+            return $this->ok
+            (
+                array
+                (
+                    'page'        => $items,
+                    'total_items' => $list->total()
+                )
+            );
         } catch (Exception $ex) {
             $this->log_service->error($ex);
             return $this->error500($ex);
diff --git a/app/controllers/apis/ApiScopeGroupController.php b/app/Http/Controllers/Api/ApiScopeGroupController.php
similarity index 92%
rename from app/controllers/apis/ApiScopeGroupController.php
rename to app/Http/Controllers/Api/ApiScopeGroupController.php
index 1a886497..f3962800 100644
--- a/app/controllers/apis/ApiScopeGroupController.php
+++ b/app/Http/Controllers/Api/ApiScopeGroupController.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Http\Controllers\Api;
 
 /**
  * Copyright 2015 OpenStack Foundation
@@ -13,16 +13,20 @@
  * limitations under the License.
  **/
 
-use utils\services\ILogService;
-use oauth2\repositories\IApiScopeGroupRepository;
-use oauth2\exceptions\InvalidApiScopeGroup;
-use oauth2\services\IApiScopeGroupService;
-use auth\IUserRepository;
-use oauth2\services\IApiScopeService;
-use utils\exceptions\EntityNotFoundException;
+use App\Http\Controllers\ICRUDController;
+use Auth\Repositories\IUserRepository;
+use OAuth2\Exceptions\InvalidApiScopeGroup;
+use OAuth2\Repositories\IApiScopeGroupRepository;
+use OAuth2\Services\IApiScopeGroupService;
+use OAuth2\Services\IApiScopeService;
+use Utils\Services\ILogService;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Facades\Input;
+use Exception;
 
 /**
  * Class ApiScopeGroupController
+ * @package App\Http\Controllers
  */
 final class ApiScopeGroupController extends AbstractRESTController implements ICRUDController
 {
@@ -143,7 +147,7 @@ final class ApiScopeGroupController extends AbstractRESTController implements IC
             $list = $this->repository->getAll($page_nbr, $page_size, $filters, $fields);
             $items = array();
 
-            foreach ($list->getItems() as $g)
+            foreach ($list->items() as $g)
             {
                 array_push($items, $g->toArray());
             }
@@ -152,7 +156,7 @@ final class ApiScopeGroupController extends AbstractRESTController implements IC
                 array
                 (
                     'page'        => $items,
-                    'total_items' => $list->getTotal()
+                    'total_items' => $list->total()
                 )
             );
         } catch (Exception $ex) {
diff --git a/app/controllers/apis/AssymetricKeyApiController.php b/app/Http/Controllers/Api/AsymmetricKeyApiController.php
similarity index 75%
rename from app/controllers/apis/AssymetricKeyApiController.php
rename to app/Http/Controllers/Api/AsymmetricKeyApiController.php
index 6ecb87d6..bd62e0af 100644
--- a/app/controllers/apis/AssymetricKeyApiController.php
+++ b/app/Http/Controllers/Api/AsymmetricKeyApiController.php
@@ -1,5 +1,4 @@
-<?php
-
+<?php namespace App\Http\Controllers\Api;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,30 +11,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-use oauth2\services\IAssymetricKeyService;
-use utils\services\ILogService;
-use oauth2\repositories\IAssymetricKeyRepository;
+use OAuth2\Services\IAsymmetricKeyService;
+use Utils\Exceptions\EntityNotFoundException;
+use Utils\Services\ILogService;
+use OAuth2\Repositories\IAsymmetricKeyRepository;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Facades\Input;
+use Exception;
 
-class AssymetricKeyApiController extends AbstractRESTController
+class AsymmetricKeyApiController extends AbstractRESTController
 {
     /**
-     * @var IAssymetricKeyService
+     * @var IAsymmetricKeyService
      */
     protected $service;
 
     /**
-     * @var IAssymetricKeyRepository
+     * @var IAsymmetricKeyRepository
      */
     protected $repository;
 
     /**
-     * @param IAssymetricKeyRepository $repository
-     * @param IAssymetricKeyService $service
+     * @param IAsymmetricKeyRepository $repository
+     * @param IAsymmetricKeyService $service
      * @param ILogService $log_service
      */
     public function __construct(
-        IAssymetricKeyRepository $repository,
-        IAssymetricKeyService $service,
+        IAsymmetricKeyRepository $repository,
+        IAsymmetricKeyService $service,
         ILogService $log_service
     ) {
         parent::__construct($log_service);
@@ -83,11 +86,11 @@ class AssymetricKeyApiController extends AbstractRESTController
                 return $this->error400(array('error' => 'validation', 'messages' => $messages));
             }
 
-            $res = $this->service->update(intval($id), $values);
+            $this->service->update(intval($id), $values);
 
-            return $res ? $this->ok() : $this->error400(array('error' => 'operation failed'));
+            return $this->ok();
 
-        } catch (AbsentClientException $ex1) {
+        } catch (EntityNotFoundException $ex1) {
             $this->log_service->error($ex1);
 
             return $this->error404(array('error' => $ex1->getMessage()));
@@ -111,16 +114,20 @@ class AssymetricKeyApiController extends AbstractRESTController
 
             $list = $this->repository->getAll($page_nbr, $page_size, $filters, $fields);
             $items = array();
-            foreach ($list->getItems() as $private_key) {
+            foreach ($list->items() as $private_key) {
                 $data = $private_key->toArray();
                 $data['sha_256'] = $private_key->getSHA_256_Thumbprint();
                 array_push($items, $data);
             }
 
-            return $this->ok(array(
-                'page' => $items,
-                'total_items' => $list->getTotal()
-            ));
+            return $this->ok
+            (
+                array
+                (
+                    'page'        => $items,
+                    'total_items' => $list->total()
+                )
+            );
         } catch (Exception $ex) {
             $this->log_service->error($ex);
 
diff --git a/app/Http/Controllers/Api/ClientApiController.php b/app/Http/Controllers/Api/ClientApiController.php
new file mode 100644
index 00000000..1fe132db
--- /dev/null
+++ b/app/Http/Controllers/Api/ClientApiController.php
@@ -0,0 +1,754 @@
+<?php namespace App\Http\Controllers\Api;
+
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use App\Http\Controllers\ICRUDController;
+use Exception;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Validator;
+use OAuth2\Exceptions\ExpiredAccessTokenException;
+use OAuth2\Exceptions\InvalidApiScope;
+use OAuth2\Repositories\IAccessTokenRepository;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Repositories\IRefreshTokenRepository;
+use OAuth2\Services\ITokenService;
+use OAuth2\Services\IApiScopeService;
+use OAuth2\Services\IClientService;
+use Utils\Exceptions\EntityNotFoundException;
+use Utils\Services\IAuthService;
+use Utils\Services\ILogService;
+use Services\Exceptions\ValidationException;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Class ClientApiController
+ * @package App\Http\Controllers\Api
+ */
+final class ClientApiController extends AbstractRESTController implements ICRUDController
+{
+
+    /**
+     * @var IClientService
+     */
+    private $client_service;
+
+    /**
+     * @var IApiScopeService
+     */
+    private $scope_service;
+
+    /**
+     * @var ITokenService
+     */
+    private $token_service;
+
+    /**
+     * @var IAuthService
+     */
+    private $auth_service;
+
+    /**
+     * @var IClientRepository
+     */
+    private $client_repository;
+
+    /**
+     * @var IAccessTokenRepository
+     */
+    private $access_token_repository;
+
+    /**
+     * @var IRefreshTokenRepository
+     */
+    private $refresh_token_repository;
+
+
+    /**
+     * ClientApiController constructor.
+     * @param IApiScopeService $scope_service
+     * @param ITokenService $token_service
+     * @param IClientService $client_service
+     * @param IAuthService $auth_service
+     * @param ILogService $log_service
+     * @param IClientRepository $client_repository
+     * @param IAccessTokenRepository $access_token_repository
+     * @param IRefreshTokenRepository $refresh_token_repository
+     */
+    public function __construct
+    (
+        IApiScopeService  $scope_service,
+        ITokenService     $token_service,
+        IClientService    $client_service,
+        IAuthService      $auth_service,
+        ILogService       $log_service,
+        IClientRepository $client_repository,
+        IAccessTokenRepository $access_token_repository,
+        IRefreshTokenRepository $refresh_token_repository
+    )
+    {
+        parent::__construct($log_service);
+
+        $this->client_service            = $client_service;
+        $this->scope_service             = $scope_service;
+        $this->token_service             = $token_service;
+        $this->auth_service              = $auth_service;
+        $this->access_token_repository   = $access_token_repository;
+        $this->refresh_token_repository  = $refresh_token_repository;
+        $this->client_repository         = $client_repository;
+
+        //set filters allowed values
+        $this->allowed_filter_fields     = ['user_id'];
+        $this->allowed_projection_fields = ['*'];
+    }
+
+    public function get($id)
+    {
+        try {
+            $client = $this->client_repository->getClientByIdentifier($id);
+            if (is_null($client))
+            {
+                return $this->error404(array('error' => 'client not found'));
+            }
+            return $this->ok($client->toArray());
+        } catch (Exception $ex) {
+            $this->log_service->error($ex);
+            return $this->error500($ex);
+        }
+    }
+
+    /**
+     * Deletes an existing client
+     * @param $id
+     * @return mixed
+     */
+    public function delete($id)
+    {
+        try {
+            $res = $this->client_service->deleteClientByIdentifier($id);
+            return $res ? $this->deleted() : $this->error404(array('error' => 'operation failed'));
+        } catch (Exception $ex) {
+            $this->log_service->error($ex);
+
+            return $this->error500($ex);
+        }
+    }
+
+    /**
+     * Creates an existing client
+     * @return mixed
+     */
+    public function create()
+    {
+        try
+        {
+
+            $values = Input::All();
+
+            // Build the validation constraint set.
+            $rules = array
+            (
+                'app_name'         => 'required|freetext|max:255',
+                'app_description'  => 'required|freetext|max:512',
+                'application_type' => 'required|applicationtype',
+                'website'          => 'sometimes|required|url',
+                'admin_users'      => 'sometimes|required|user_ids',
+            );
+
+            // Create a new validator instance.
+            $validation = Validator::make($values, $rules);
+
+            if ($validation->fails()) {
+                $messages = $validation->messages()->toArray();
+
+                return $this->error412(array('error' => 'validation', 'messages' => $messages));
+            }
+
+
+            $admin_users = isset($values['admin_users']) ? trim($values['admin_users']): null;
+            $admin_users = empty($admin_users) ? array() : explode(',',$admin_users);
+            $website     = isset($values['website']) ? trim($values['website']): null;
+
+            $new_client = $this->client_service->register
+            (
+                $values['application_type'],
+                trim($values['app_name']),
+                trim($values['app_description']),
+                $website,
+                $admin_users
+            );
+
+            return $this->created
+            (
+                array
+                (
+                    'id'            => $new_client->id,
+                    'client_id'     => $new_client->client_id,
+                    'client_secret' => $new_client->client_secret,
+                )
+            );
+
+        }
+        catch(ValidationException $ex2)
+        {
+            $this->log_service->error($ex2);
+            return $this->error412(array($ex2->getMessage()));
+        }
+        catch (Exception $ex) {
+            $this->log_service->error($ex);
+            return $this->error500($ex);
+        }
+    }
+
+    /**
+     * @return mixed
+     */
+    public function update()
+    {
+        try {
+
+            $values = Input::all();
+
+            $rules = array(
+                'id'                              => 'required|integer',
+                //'application_type'                => 'required|application_type',
+                'app_name'                        => 'sometimes|required|freetext|max:255',
+                'app_description'                 => 'sometimes|required|freetext|max:512',
+                'website'                         => 'sometimes|required|url',
+                'active'                          => 'sometimes|required|boolean',
+                'locked'                          => 'sometimes|required|boolean',
+                'use_refresh_token'               => 'sometimes|required|boolean',
+                'rotate_refresh_token'            => 'sometimes|required|boolean',
+                'contacts'                        => 'sometimes|required|email_set',
+                'logo_uri'                        => 'sometimes|required|url',
+                'tos_uri'                         => 'sometimes|required|url',
+                'redirect_uris'                   => 'sometimes|required|custom_url_set:application_type',
+                'post_logout_redirect_uris'       => 'sometimes|required|ssl_url_set',
+                'allowed_origins'                 => 'sometimes|required|ssl_url_set',
+                'logout_uri'                      => 'sometimes|required|url',
+                'logout_session_required'         => 'sometimes|required|boolean',
+                'logout_use_iframe'               => 'sometimes|required|boolean',
+                'policy_uri'                      => 'sometimes|required|url',
+                'jwks_uri'                        => 'sometimes|required|url',
+                'default_max_age'                 => 'sometimes|required|integer',
+                'logout_use_iframe'               => 'sometimes|required|boolean',
+                'require_auth_time'               => 'sometimes|required|boolean',
+                'token_endpoint_auth_method'      => 'sometimes|required|token_endpoint_auth_method',
+                'token_endpoint_auth_signing_alg' => 'sometimes|required|signing_alg',
+                'subject_type'                    => 'sometimes|required|subject_type',
+                'userinfo_signed_response_alg'    => 'sometimes|required|signing_alg',
+                'userinfo_encrypted_response_alg' => 'sometimes|required|encrypted_alg',
+                'userinfo_encrypted_response_enc' => 'sometimes|required|encrypted_enc',
+                'id_token_signed_response_alg'    => 'sometimes|required|signing_alg',
+                'id_token_encrypted_response_alg' => 'sometimes|required|encrypted_alg',
+                'id_token_encrypted_response_enc' => 'sometimes|required|encrypted_enc',
+                'admin_users'                     => 'sometimes|required|user_ids',
+            );
+
+            // Creates a Validator instance and validates the data.
+            $validation = Validator::make($values, $rules);
+
+            if ($validation->fails()) {
+                $messages = $validation->messages()->toArray();
+
+                return $this->error412(array('error' => 'validation', 'messages' => $messages));
+            }
+
+            $this->client_service->update(intval($values['id']), $values);
+
+            return $this->ok();
+
+        }
+        catch (EntityNotFoundException $ex1)
+        {
+            $this->log_service->error($ex1);
+            return $this->error404(array('error' => $ex1->getMessage()));
+        }
+        catch(ValidationException $ex2)
+        {
+            $this->log_service->error($ex2);
+            return $this->error412(array($ex2->getMessage()));
+        }
+        catch (Exception $ex) {
+            $this->log_service->error($ex);
+            return $this->error500($ex);
+        }
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getByPage()
+    {
+        try {
+
+            $items   = array();
+            $user    = $this->auth_service->getCurrentUser();
+            if(is_null($user)) return $this->error403();
+            $clients = $user->getClients();
+
+            foreach ($clients as $client)
+            {
+                $data = $client->toArray();
+                $data['application_type'] = $client->getFriendlyApplicationType();
+                $data['is_own']           = $client->isOwner($this->auth_service->getCurrentUser());
+                $data['modified_by']      = $client->getEditedByNice();
+                array_push($items, $data);
+            }
+
+            return $this->ok
+            (
+                array
+                (
+                    'page'        => $items,
+                    'total_items' => count($items)
+                )
+            );
+
+        }
+        catch (Exception $ex)
+        {
+            $this->log_service->error($ex);
+            return $this->error500($ex);
+        }
+    }
+
+    /**
+     * @param $id
+     * @param $scope_id
+     * @return mixed
+     */
+    public function addAllowedScope($id, $scope_id)
+    {
+        try
+        {
+            $this->client_service->addClientScope($id, $scope_id);
+            return $this->ok();
+        }
+        catch (EntityNotFoundException $ex1)
+        {
+            $this->log_service->error($ex1);
+            return $this->error404(array('error' => $ex1->getMessage()));
+        }
+        catch (InvalidApiScope $ex2)
+        {
+            $this->log_service->error($ex2);
+            return $this->error412(array('messages' => $ex2->getMessage()));
+        }
+        catch (Exception $ex)
+        {
+            $this->log_service->error($ex);
+            return $this->error500($ex);
+        }
+    }
+
+    /**
+     * @param $id
+     * @param $scope_id
+     * @return mixed
+     */
+    public function removeAllowedScope($id, $scope_id)
+    {
+        try
+        {
+            $this->client_service->deleteClientScope($id, $scope_id);
+            return $this->ok();
+        } catch (EntityNotFoundException $ex1) {
+            $this->log_service->error($ex1);
+
+            return $this->error404(array('error' => $ex1->getMessage()));
+        } catch (Exception $ex) {
+            $this->log_service->error($ex);
+
+            return $this->error500($ex);
+        }
+    }
+
+    /**
+     * @param $id
+     * @return mixed
+     */
+    public function activate($id)
+    {
+        try {
+            $this->client_service->activateClient($id, true);
+            return $this->ok();
+        } catch (EntityNotFoundException $ex1) {
+            $this->log_service->error($ex1);
+            return $this->error404(array('error' => $ex1->getMessage()));
+        } catch (Exception $ex) {
+            $this->log_service->error($ex);
+            return $this->error500($ex);
+        }
+    }
+
+    /**
+     * @param $id
+     * @return mixed
+     */
+    public function deactivate($id)
+    {
+        try {
+            $this->client_service->activateClient($id, false);
+            return $this->ok();
+        } catch (EntityNotFoundException $ex1) {
+            $this->log_service->error($ex1);
+
+            return $this->error404(array('error' => $ex1->getMessage()));
+        } catch (Exception $ex) {
+            $this->log_service->error($ex);
+
+            return $this->error500($ex);
+        }
+    }
+
+    /**
+     * @param $id
+     * @return mixed
+     */
+    public function regenerateClientSecret($id)
+    {
+        try
+        {
+            $client = $this->client_service->regenerateClientSecret($id);
+
+            return !is_null($client) ?
+                $this->ok
+                (
+                    array
+                    (
+                        'new_secret'          => $client->getClientSecret(),
+                        'new_expiration_date' => $client->getClientSecretExpiration(),
+                    )
+                ) : $this->error404(array('error' => 'operation failed'));
+        }
+        catch (Exception $ex)
+        {
+            $this->log_service->error($ex);
+            return $this->error500($ex);
+        }
+    }
+
+    /**
+     * @param $id
+     * @return mixed
+     */
+    public function setRefreshTokenClient($id)
+    {
+        try {
+            $values = Input::All();
+
+            // Build the validation constraint set.
+            $rules = array(
+                'use_refresh_token' => 'required|boolean'
+            );
+
+            // Creates a Validator instance and validates the data.
+            $validation = Validator::make($values, $rules);
+            if ($validation->fails()) {
+                $messages = $validation->messages()->toArray();
+
+                return $this->error400(array('error' => 'validation', 'messages' => $messages));
+            }
+
+            $this->client_service->setRefreshTokenUsage($id, $values['use_refresh_token']);
+
+            return $this->ok();
+
+        } catch (EntityNotFoundException $ex1) {
+            $this->log_service->error($ex1);
+
+            return $this->error404(array('error' => $ex1->getMessage()));
+        } catch (Exception $ex) {
+            $this->log_service->error($ex);
+
+            return $this->error500($ex);
+        }
+    }
+
+    /**
+     * @param $id
+     * @return mixed
+     */
+    public function setRotateRefreshTokenPolicy($id)
+    {
+        try {
+            $values = Input::All();
+
+            // Build the validation constraint set.
+            $rules = array(
+                'rotate_refresh_token' => 'required|boolean'
+            );
+            // Creates a Validator instance and validates the data.
+            $validation = Validator::make($values, $rules);
+            if ($validation->fails()) {
+                $messages = $validation->messages()->toArray();
+
+                return $this->error400(array('error' => 'validation', 'messages' => $messages));
+            }
+
+            $this->client_service->setRotateRefreshTokenPolicy($id, $values['rotate_refresh_token']);
+
+            return $this->ok();
+
+        } catch (EntityNotFoundException $ex1) {
+            $this->log_service->error($ex1);
+
+            return $this->error404(array('error' => $ex1->getMessage()));
+        } catch (Exception $ex) {
+            $this->log_service->error($ex);
+
+            return $this->error500($ex);
+        }
+    }
+
+    /**
+     * @param $id
+     * @param $value
+     * @param $hint
+     * @return mixed
+     */
+    public function revokeToken($id, $value, $hint)
+    {
+        try {
+            $res = false;
+            $client = $this->client_repository->getClientByIdentifier($id);
+            switch ($hint) {
+                case 'access-token': {
+                    $token = $this->token_service->getAccessToken($value, true);
+                    if (is_null($token)) {
+                        return $this->error404(array('error' => sprintf('access token %s does not exists!', $value)));
+                    }
+                    Log::debug(sprintf('access token client id %s - client id %s ',$token->getClientId() , $client->client_id));
+                    if ($token->getClientId() !== $client->client_id) {
+                        return $this->error412(array(
+                            'error' => sprintf('access token %s does not belongs to client id !', $value, $id)
+                        ));
+                    }
+                    $res = $this->token_service->revokeAccessToken($value, true);
+                }
+                    break;
+                case 'refresh-token': {
+                    $token = $this->token_service->getRefreshToken($value, true);
+                    if (is_null($token)) {
+                        return $this->error404(array('error' => sprintf('refresh token %s does not exists!', $value)));
+                    }
+                    Log::debug(sprintf('refresh token client id %s - client id %s ',$token->getClientId() , $client->client_id));
+                    if ($token->getClientId() !== $client->client_id) {
+                        return $this->error412(array(
+                            'error' => sprintf('refresh token %s does not belongs to client id !', $value, $id)
+                        ));
+                    }
+                    $res = $this->token_service->revokeRefreshToken($value, true);
+                }
+                    break;
+                default:
+                    break;
+            }
+
+            return $res ? $this->ok() : $this->error404(array('error' => 'operation failed'));
+        }
+        catch(ExpiredAccessTokenException $ex1){
+            $this->log_service->warning($ex1);
+            return $this->error404();
+        }
+        catch(Exception $ex) {
+            $this->log_service->error($ex);
+            return $this->error500($ex);
+        }
+    }
+
+    /**
+     * @param $id
+     * @return mixed
+     */
+    public function getAccessTokens($id)
+    {
+        try {
+            $page_nbr  = intval(Input::get('offset', 1));
+            $page_size = intval(Input::get('limit', 10));
+
+            $client    = $this->client_repository->getClientByIdentifier($id);
+
+            if(is_null($client))
+                throw new EntityNotFoundException();
+
+            $paginator = $this->access_token_repository->getAllValidByClientIdentifier($id, $page_nbr, $page_size);
+            $res       = [];
+
+            foreach ($paginator->items() as $token) {
+                $res[] =  [
+                    'value'    => $token->value,
+                    'scope'    => $token->scope,
+                    'lifetime' => $token->getRemainingLifetime(),
+                    'issued'   => $token->created_at->format('Y-m-d H:i:s')
+                ];
+            }
+            return $this->ok([
+                'total' => $paginator->total(),
+                'pages' => $paginator->total() > 0 ? ceil($paginator->total()/$page_size) : 0,
+                'items' => $res
+            ]);
+        }
+        catch (EntityNotFoundException $ex1) {
+            $this->log_service->warning($ex1);
+            return $this->error404();
+        }
+        catch (Exception $ex) {
+            $this->log_service->error($ex);
+            return $this->error500($ex);
+        }
+    }
+
+    /**
+     * @param $id
+     * @return mixed
+     */
+    public function getRefreshTokens($id)
+    {
+        try {
+            $page_nbr  = intval(Input::get('offset', 1));
+            $page_size = intval(Input::get('limit', 10));
+
+            $client    = $this->client_repository->getClientByIdentifier($id);
+
+            if(is_null($client))
+                throw new EntityNotFoundException();
+
+            $paginator = $this->refresh_token_repository->getAllValidByClientIdentifier($id, $page_nbr, $page_size);
+            $res       = [];
+
+            foreach ($paginator->items() as $token) {
+                $res[] = [
+                    'value'    => $token->value,
+                    'scope'    => $token->scope,
+                    'lifetime' => $token->getRemainingLifetime(),
+                    'issued'   => $token->created_at->format('Y-m-d H:i:s')
+                ];
+            }
+
+            return $this->ok([
+                'total' => $paginator->total(),
+                'pages' => $paginator->total() > 0 ? ceil($paginator->total()/$page_size) : 0,
+                'items' => $res
+            ]);
+        }
+        catch (EntityNotFoundException $ex1) {
+            $this->log_service->warning($ex1);
+            return $this->error404();
+        }
+        catch (Exception $ex) {
+            $this->log_service->error($ex);
+            return $this->error500($ex);
+        }
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getAccessTokensByCurrentUser()
+    {
+        try {
+            $user      = $this->auth_service->getCurrentUser();
+            $page_nbr  = intval(Input::get('offset', 1));
+            $page_size = intval(Input::get('limit', 10));
+
+
+            $paginator = $this->access_token_repository->getAllValidByUserId($user->getId(), $page_nbr, $page_size);
+            $res       = [];
+
+            foreach ($paginator->items() as $token) {
+                $res[] =  [
+                    'value'    => $token->value,
+                    'scope'    => $token->scope,
+                    'lifetime' => $token->getRemainingLifetime(),
+                    'issued'   => $token->created_at->format('Y-m-d H:i:s')
+                ];
+            }
+            return $this->ok([
+                'total' => $paginator->total(),
+                'pages' => $paginator->total() > 0 ? ceil($paginator->total()/$page_size) : 0,
+                'items' => $res
+            ]);
+        }
+        catch (EntityNotFoundException $ex1) {
+            $this->log_service->warning($ex1);
+            return $this->error404();
+        }
+        catch (Exception $ex) {
+            $this->log_service->error($ex);
+            return $this->error500($ex);
+        }
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getRefreshTokensByCurrentUser()
+    {
+        try {
+            $user      = $this->auth_service->getCurrentUser();
+            $page_nbr  = intval(Input::get('offset', 1));
+            $page_size = intval(Input::get('limit', 10));
+
+            $paginator = $this->refresh_token_repository->getAllValidByUserId($user->getId(), $page_nbr, $page_size);
+            $res       = [];
+
+            foreach ($paginator->items() as $token) {
+                $res[] = [
+                    'value'    => $token->value,
+                    'scope'    => $token->scope,
+                    'lifetime' => $token->getRemainingLifetime(),
+                    'issued'   => $token->created_at->format('Y-m-d H:i:s')
+                ];
+            }
+
+            return $this->ok([
+                'total' => $paginator->total(),
+                'pages' => $paginator->total() > 0 ? ceil($paginator->total()/$page_size) : 0,
+                'items' => $res
+            ]);
+        }
+        catch (EntityNotFoundException $ex1) {
+            $this->log_service->warning($ex1);
+            return $this->error404();
+        }
+        catch (Exception $ex) {
+            $this->log_service->error($ex);
+            return $this->error500($ex);
+        }
+    }
+
+    /**
+     * @param $id
+     * @return mixed
+     */
+    public function unlock($id)
+    {
+        try {
+            $this->client_service->unlockClient($id);
+            return $this->ok();
+
+        } catch (EntityNotFoundException $ex1) {
+
+            $this->log_service->error($ex1);
+
+            return $this->error404(array('error' => $ex1->getMessage()));
+        } catch (Exception $ex) {
+            $this->log_service->error($ex);
+
+            return $this->error500($ex);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/controllers/apis/ClientPublicKeyApiController.php b/app/Http/Controllers/Api/ClientPublicKeyApiController.php
similarity index 73%
rename from app/controllers/apis/ClientPublicKeyApiController.php
rename to app/Http/Controllers/Api/ClientPublicKeyApiController.php
index 3a9c1bf5..9c3fd4c8 100644
--- a/app/controllers/apis/ClientPublicKeyApiController.php
+++ b/app/Http/Controllers/Api/ClientPublicKeyApiController.php
@@ -1,33 +1,40 @@
-<?php
+<?php namespace App\Http\Controllers\Api;
+
 /**
-* Copyright 2015 OpenStack Foundation
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-**/
-use oauth2\services\IClienPublicKeyService;
-use utils\services\ILogService;
-use oauth2\repositories\IClientPublicKeyRepository;
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\Services\IClientPublicKeyService;
+use Utils\Services\ILogService;
+use OAuth2\Repositories\IClientPublicKeyRepository;
+use Exception;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Validator;
+use Services\Exceptions\ValidationException;
 /**
  * Class ClientPublicKeyApiController
+ * @package App\Http\Controllers\Api
  */
-final class ClientPublicKeyApiController extends AssymetricKeyApiController
+final class ClientPublicKeyApiController extends AsymmetricKeyApiController
 {
     /**
      * @param IClientPublicKeyRepository $repository
-     * @param IClienPublicKeyService $service
+     * @param IClientPublicKeyService $service
      * @param ILogService $log_service
      */
     public function __construct
     (
         IClientPublicKeyRepository $repository,
-        IClienPublicKeyService $service,
+        IClientPublicKeyService $service,
         ILogService $log_service
     )
     {
@@ -60,8 +67,8 @@ final class ClientPublicKeyApiController extends AssymetricKeyApiController
                 'client_id'   => 'required|integer',
                 'kid'         => 'required|text|max:255',
                 'active'      => 'required|boolean',
-                'valid_from'  => 'date_format:m/d/Y',
-                'valid_to'    => 'date_format:m/d/Y|after:valid_from',
+                'valid_from'  => 'required|date_format:m/d/Y',
+                'valid_to'    => 'required|date_format:m/d/Y|after:valid_from',
                 'pem_content' => 'required|public_key_pem|public_key_pem_length',
                 'usage'       => 'required|public_key_usage',
                 'type'        => 'required|public_key_type',
@@ -115,7 +122,7 @@ final class ClientPublicKeyApiController extends AssymetricKeyApiController
             );
             $list = $this->repository->getAll($page_nbr, $page_size, $filters, $fields);
             $items = array();
-            foreach ($list->getItems() as $private_key) {
+            foreach ($list->items() as $private_key) {
                 $data = $private_key->toArray();
                 $data['sha_256'] = $private_key->getSHA_256_Thumbprint();
                 array_push($items, $data);
@@ -123,7 +130,7 @@ final class ClientPublicKeyApiController extends AssymetricKeyApiController
 
             return $this->ok(array(
                 'page' => $items,
-                'total_items' => $list->getTotal()
+                'total_items' => $list->total()
             ));
         } catch (Exception $ex) {
             $this->log_service->error($ex);
diff --git a/app/controllers/apis/ICRUDController.php b/app/Http/Controllers/Api/ICRUDController.php
similarity index 86%
rename from app/controllers/apis/ICRUDController.php
rename to app/Http/Controllers/Api/ICRUDController.php
index bfc96b6c..c6a68136 100644
--- a/app/controllers/apis/ICRUDController.php
+++ b/app/Http/Controllers/Api/ICRUDController.php
@@ -1,7 +1,7 @@
-<?php
-
+<?php namespace App\Http\Controllers;
 /**
  * Interface ICRUDController
+ * @package App\Http\Controllers
  */
 interface ICRUDController {
 
diff --git a/app/controllers/apis/JsonController.php b/app/Http/Controllers/Api/JsonController.php
similarity index 64%
rename from app/controllers/apis/JsonController.php
rename to app/Http/Controllers/Api/JsonController.php
index 1ab36dcd..5318c828 100644
--- a/app/controllers/apis/JsonController.php
+++ b/app/Http/Controllers/Api/JsonController.php
@@ -1,11 +1,27 @@
-<?php
-
-use utils\services\ILogService;
+<?php namespace App\Http\Controllers\Api;
 
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use App\Http\Controllers\Controller;
+use Utils\Services\ILogService;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\Input;
+use Exception;
 /**
  * Class JsonController
+ * @package App\Http\Controllers
  */
-abstract class JsonController extends BaseController  {
+abstract class JsonController extends Controller  {
 
     protected $log_service;
 
@@ -60,6 +76,11 @@ abstract class JsonController extends BaseController  {
         return Response::json($data, 404);
     }
 
+    protected function error403($data = array('message' => 'Forbidden'))
+    {
+        return Response::json($data, 403);
+    }
+
     /**
      *  {
         "message": "Validation Failed",
diff --git a/app/Http/Controllers/Api/OAuth2/OAuth2ProtectedController.php b/app/Http/Controllers/Api/OAuth2/OAuth2ProtectedController.php
new file mode 100644
index 00000000..b7cc635d
--- /dev/null
+++ b/app/Http/Controllers/Api/OAuth2/OAuth2ProtectedController.php
@@ -0,0 +1,50 @@
+<?php namespace App\Http\Controllers\Api\OAuth2;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\IResourceServerContext;
+use Utils\Services\ILogService;
+use App\Http\Controllers\Api\JsonController;
+
+/**
+ * Class OAuth2ProtectedController
+ * @package App\Http\Controllers\Api\OAuth2
+ */
+abstract class OAuth2ProtectedController extends JsonController
+{
+
+    /**
+     * @var IResourceServerContext
+     */
+    protected $resource_server_context;
+
+    /**
+     * @var
+     */
+    protected $repository;
+
+    /**
+     * OAuth2ProtectedController constructor.
+     * @param IResourceServerContext $resource_server_context
+     * @param ILogService $log_service
+     */
+    public function __construct
+    (
+        IResourceServerContext $resource_server_context,
+        ILogService $log_service
+    )
+    {
+        parent::__construct($log_service);
+        $this->resource_server_context = $resource_server_context;
+    }
+}
\ No newline at end of file
diff --git a/app/controllers/apis/protected/OAuth2UserApiController.php b/app/Http/Controllers/Api/OAuth2/OAuth2UserApiController.php
similarity index 66%
rename from app/controllers/apis/protected/OAuth2UserApiController.php
rename to app/Http/Controllers/Api/OAuth2/OAuth2UserApiController.php
index 3e9b1c2e..af08117a 100644
--- a/app/controllers/apis/protected/OAuth2UserApiController.php
+++ b/app/Http/Controllers/Api/OAuth2/OAuth2UserApiController.php
@@ -1,17 +1,28 @@
-<?php
-
-use oauth2\IResourceServerContext;
-use utils\services\ILogService;
-use oauth2\resource_server\IUserService;
-use oauth2\services\IClientService;
-use oauth2\heuristics\SigningKeyFinder;
-use oauth2\heuristics\EncryptionKeyFinder;
-use oauth2\builders\IdTokenBuilder;
-use utils\http\HttpContentType;
+<?php namespace App\Http\Controllers\Api\OAuth2;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Support\Facades\Response;
+use OAuth2\Builders\IdTokenBuilder;
+use OAuth2\IResourceServerContext;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\ResourceServer\IUserService;
+use OAuth2\Services\IClientService;
+use Utils\Http\HttpContentType;
+use Utils\Services\ILogService;
 
 /**
  * Class OAuth2UserApiController
- * OAUTH2 Protected User REST API
+ * @package App\Http\Controllers\Api\OAuth2
  */
 class OAuth2UserApiController extends OAuth2ProtectedController
 {
@@ -21,9 +32,9 @@ class OAuth2UserApiController extends OAuth2ProtectedController
     private $user_service;
 
     /**
-     * @var IClientService
+     * @var IClientRepository
      */
-    private $client_service;
+    private $client_repository;
 
     /**
      * @var IdTokenBuilder
@@ -34,7 +45,7 @@ class OAuth2UserApiController extends OAuth2ProtectedController
      * @param IUserService $user_service
      * @param IResourceServerContext $resource_server_context
      * @param ILogService $log_service
-     * @param IClientService $client_service
+     * @param IClientRepository $client_repository
      * @param IdTokenBuilder $id_token_builder
      */
     public function __construct
@@ -42,15 +53,15 @@ class OAuth2UserApiController extends OAuth2ProtectedController
         IUserService $user_service,
         IResourceServerContext $resource_server_context,
         ILogService $log_service,
-        IClientService $client_service,
+        IClientRepository $client_repository,
         IdTokenBuilder $id_token_builder
     )
     {
         parent::__construct($resource_server_context,$log_service);
 
-        $this->user_service     = $user_service;
-        $this->client_service   = $client_service;
-        $this->id_token_builder = $id_token_builder;
+        $this->user_service      = $user_service;
+        $this->client_repository = $client_repository;
+        $this->id_token_builder  = $id_token_builder;
     }
 
     /**
@@ -77,7 +88,7 @@ class OAuth2UserApiController extends OAuth2ProtectedController
         {
             $claims    = $this->user_service->getCurrentUserInfoClaims();
             $client_id = $this->resource_server_context->getCurrentClientId();
-            $client    = $this->client_service->getClientById($client_id);
+            $client    = $this->client_repository->getClientById($client_id);
 
             // The UserInfo Claims MUST be returned as the members of a JSON object unless a signed or encrypted response
             // was requested during Client Registration.
diff --git a/app/controllers/apis/ServerPrivateKeyApiController.php b/app/Http/Controllers/Api/ServerPrivateKeyApiController.php
similarity index 87%
rename from app/controllers/apis/ServerPrivateKeyApiController.php
rename to app/Http/Controllers/Api/ServerPrivateKeyApiController.php
index 5e3a786c..a2241641 100644
--- a/app/controllers/apis/ServerPrivateKeyApiController.php
+++ b/app/Http/Controllers/Api/ServerPrivateKeyApiController.php
@@ -1,5 +1,4 @@
-<?php
-
+<?php namespace App\Http\Controllers\Api;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,13 +12,19 @@
  * limitations under the License.
  **/
 
-use oauth2\services\IServerPrivateKeyService;
-use oauth2\repositories\IServerPrivateKeyRepository;
-use utils\services\ILogService;
+use Exception;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Validator;
+use OAuth2\Repositories\IServerPrivateKeyRepository;
+use OAuth2\Services\IServerPrivateKeyService;
+use Services\Exceptions\ValidationException;
+use Utils\Services\ILogService;
+
 /**
  * Class ServerPrivateKeyApiController
+ * @package App\Http\Controllers\Api
  */
-final class ServerPrivateKeyApiController extends AssymetricKeyApiController
+final class ServerPrivateKeyApiController extends AsymmetricKeyApiController
 {
     /**
      * @param IServerPrivateKeyRepository $repository
diff --git a/app/controllers/apis/UserApiController.php b/app/Http/Controllers/Api/UserApiController.php
similarity index 85%
rename from app/controllers/apis/UserApiController.php
rename to app/Http/Controllers/Api/UserApiController.php
index ce9385b7..5ddb775c 100644
--- a/app/controllers/apis/UserApiController.php
+++ b/app/Http/Controllers/Api/UserApiController.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Http\Controllers\Api;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,13 +12,19 @@
  * limitations under the License.
  **/
 
-use utils\services\ILogService;
-use openid\services\IUserService;
-use oauth2\services\ITokenService;
-use oauth2\exceptions\ExpiredAccessTokenException;
-use auth\IUserRepository;
+use App\Http\Controllers\ICRUDController;
+use Auth\Repositories\IUserRepository;
+use Exception;
+use Illuminate\Support\Facades\Input;
+use OAuth2\Exceptions\ExpiredAccessTokenException;
+use OAuth2\Services\ITokenService;
+use OpenId\Services\IUserService;
+use Utils\Exceptions\EntityNotFoundException;
+use Utils\Services\ILogService;
+
 /**
  * Class UserApiController
+ * @package App\Http\Controllers\Api
  */
 class UserApiController extends AbstractRESTController implements ICRUDController {
 
@@ -36,6 +42,13 @@ class UserApiController extends AbstractRESTController implements ICRUDControlle
      */
     private $user_repository;
 
+    /**
+     * UserApiController constructor.
+     * @param IUserRepository $user_repository
+     * @param ILogService $log_service
+     * @param IUserService $user_service
+     * @param ITokenService $token_service
+     */
     public function __construct
     (
         IUserRepository $user_repository,
@@ -59,7 +72,7 @@ class UserApiController extends AbstractRESTController implements ICRUDControlle
             $this->user_service->unlockUser($id);
             return $this->updated();
         }
-        catch (AbsentClientException $ex1) {
+        catch (EntityNotFoundException $ex1) {
             $this->log_service->error($ex1);
             return $this->error404(array('error' => $ex1->getMessage()));
         }
@@ -117,7 +130,7 @@ class UserApiController extends AbstractRESTController implements ICRUDControlle
     public function get($id)
     {
         try {
-            $user       = $this->user_service->get($id);
+            $user       = $this->user_repository->get($id);
             if(is_null($user)){
                 return $this->error404(array('error' => 'user not found'));
             }
@@ -153,11 +166,14 @@ class UserApiController extends AbstractRESTController implements ICRUDControlle
     {
         $values = Input::all();
         if(!isset($values['t'])) return $this->error404();
+
         $term  = $values['t'];
         $users = $this->user_repository->getByEmailOrName($term);
+        $list  = array();
+
         if(count($users) > 0)
         {
-            $list = array();
+
             foreach($users as $u)
             {
                 array_push($list, array
@@ -167,8 +183,8 @@ class UserApiController extends AbstractRESTController implements ICRUDControlle
                     )
                 );
             }
-            return $this->ok($list);
+
         }
-        return $this->updated();
+        return $this->ok($list);
     }
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
new file mode 100644
index 00000000..6979db15
--- /dev/null
+++ b/app/Http/Controllers/Controller.php
@@ -0,0 +1,27 @@
+<?php namespace App\Http\Controllers;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Auth\Access\AuthorizesResources;
+
+/**
+ * Class Controller
+ * @package App\Http\Controllers
+ */
+class Controller extends BaseController
+{
+    use AuthorizesRequests, AuthorizesResources, DispatchesJobs, ValidatesRequests;
+}
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
new file mode 100644
index 00000000..d48ae05c
--- /dev/null
+++ b/app/Http/Controllers/HomeController.php
@@ -0,0 +1,48 @@
+<?php namespace App\Http\Controllers;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\View;
+use Illuminate\Support\Facades\Redirect;
+use App\Http\Controllers\OpenId\OpenIdController;
+use App\Http\Controllers\OpenId\DiscoveryController;
+
+/**
+ * Class HomeController
+ * @package App\Http\Controllers
+ */
+class HomeController extends OpenIdController
+{
+
+    private $discovery;
+
+    public function __construct(DiscoveryController $discovery)
+    {
+        $this->discovery = $discovery;
+    }
+
+    public function index()
+    {
+
+        if ($this->isDiscoveryRequest())
+            return $this->discovery->idp();
+        if (Auth::guest()) {
+            Session::flush();
+            Session::regenerate();
+            return View::make("home");
+        }
+        else
+            return Redirect::action("UserController@getProfile");
+    }
+}
\ No newline at end of file
diff --git a/app/controllers/oauth2/OAuth2ProviderController.php b/app/Http/Controllers/OAuth2/OAuth2ProviderController.php
similarity index 72%
rename from app/controllers/oauth2/OAuth2ProviderController.php
rename to app/Http/Controllers/OAuth2/OAuth2ProviderController.php
index 5517e431..8d0ef625 100644
--- a/app/controllers/oauth2/OAuth2ProviderController.php
+++ b/app/Http/Controllers/OAuth2/OAuth2ProviderController.php
@@ -1,24 +1,43 @@
-<?php
+<?php namespace App\Http\Controllers\OAuth2;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\View;
+use OAuth2\Exceptions\UriNotAllowedException;
+use OAuth2\Factories\OAuth2AuthorizationRequestFactory;
+use OAuth2\IOAuth2Protocol;
+use OAuth2\OAuth2Message;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Requests\OAuth2AccessTokenValidationRequest;
+use OAuth2\Requests\OAuth2LogoutRequest;
+use OAuth2\Requests\OAuth2TokenRequest;
+use OAuth2\Requests\OAuth2TokenRevocationRequest;
+use OAuth2\Responses\OAuth2Response;
+use OAuth2\Services\IClientService;
+use OAuth2\Strategies\OAuth2ResponseStrategyFactoryMethod;
+use Utils\Http\HttpContentType;
+use Utils\Services\IAuthService;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Redirect;
 
-use oauth2\IOAuth2Protocol;
-use oauth2\requests\OAuth2TokenRequest;
-use oauth2\strategies\OAuth2ResponseStrategyFactoryMethod;
-use oauth2\OAuth2Message;
-use oauth2\requests\OAuth2TokenRevocationRequest;
-use oauth2\requests\OAuth2AccessTokenValidationRequest;
-use oauth2\responses\OAuth2Response;
-use oauth2\factories\OAuth2AuthorizationRequestFactory;
-use oauth2\services\IMementoOAuth2SerializerService;
-use oauth2\exceptions\InvalidAuthorizationRequestException;
-use utils\services\IAuthService;
-use utils\http\HttpContentType;
-use oauth2\requests\OAuth2LogoutRequest;
-use oauth2\exceptions\UriNotAllowedException;
-use \oauth2\services\IClientService;
 /**
  * Class OAuth2ProviderController
  */
-final class OAuth2ProviderController extends BaseController
+final class OAuth2ProviderController extends Controller
 {
     /**
      * @var IOAuth2Protocol
@@ -31,25 +50,25 @@ final class OAuth2ProviderController extends BaseController
     private $auth_service;
 
     /**
-     * @var IClientService
+     * @var IClientRepository
      */
-    private $client_service;
+    private $client_repository;
 
     /**
      * @param IOAuth2Protocol $oauth2_protocol
-     * @param IClientService $client_service
+     * @param IClientRepository $client_repository
      * @param IAuthService $auth_service
      */
     public function __construct
     (
         IOAuth2Protocol $oauth2_protocol,
-        IClientService $client_service,
+        IClientRepository $client_repository,
         IAuthService $auth_service
     )
     {
-        $this->oauth2_protocol = $oauth2_protocol;
-        $this->auth_service    = $auth_service;
-        $this->client_service  = $client_service;
+        $this->oauth2_protocol    = $oauth2_protocol;
+        $this->auth_service       = $auth_service;
+        $this->client_repository = $client_repository;
     }
 
     /**
@@ -59,7 +78,7 @@ final class OAuth2ProviderController extends BaseController
      * use of the "POST" method as well.
      * @return mixed
      */
-    public function authorize()
+    public function auth()
     {
         try
         {
@@ -89,10 +108,10 @@ final class OAuth2ProviderController extends BaseController
         {
             return Response::view
             (
-                '400',
+                'errors.400',
                 array
                 (
-                    'error_code' => $ex1->getError(),
+                    'error_code'        => $ex1->getError(),
                     'error_description' => $ex1->getMessage()
                 ),
                 400
@@ -162,7 +181,7 @@ final class OAuth2ProviderController extends BaseController
     }
 
     /**
-     * http://tools.ietf.org/html/draft-richer-oauth-introspection-04
+     * @see http://tools.ietf.org/html/draft-richer-oauth-introspection-04
      * Introspection Token HTTP Endpoint
      * @return mixed
      */
@@ -218,7 +237,7 @@ final class OAuth2ProviderController extends BaseController
     }
 
     /**
-     *  http://openid.net/specs/openid-connect-session-1_0.html#OPiframe
+     *  @see http://openid.net/specs/openid-connect-session-1_0.html#OPiframe
      */
     public function checkSessionIFrame()
     {
@@ -227,12 +246,12 @@ final class OAuth2ProviderController extends BaseController
     }
 
     /**
-     * http://openid.net/specs/openid-connect-session-1_0.html#RPLogout
+     * @see http://openid.net/specs/openid-connect-session-1_0.html#RPLogout
      */
     public function endSession()
     {
         if(!$this->auth_service->isUserLogged())
-            return Response::view('404', array(), 404);
+            return Response::view('errors.404', array(), 404);
 
         $request = new OAuth2LogoutRequest
         (
@@ -245,7 +264,7 @@ final class OAuth2ProviderController extends BaseController
         if(!$request->isValid())
         {
             Log::error('invalid OAuth2LogoutRequest!');
-            return Response::view('404', array(), 404);
+            return Response::view('errors.404', array(), 404);
         }
 
         if(Request::isMethod('get') )
@@ -254,7 +273,7 @@ final class OAuth2ProviderController extends BaseController
             $clients = array();
             foreach($this->auth_service->getLoggedRPs() as $client_id)
             {
-                $client = $this->client_service->getClientById($client_id);
+                $client = $this->client_repository->getClientById($client_id);
                 if(!is_null($client)) array_push($clients, $client);
             }
 
@@ -285,7 +304,7 @@ final class OAuth2ProviderController extends BaseController
         }
 
         Log::error('invalid consent response!');
-        return Response::view('404', array(), 404);
+        return Response::view('errors.404', array(), 404);
     }
 
     public function cancelLogout()
diff --git a/app/Http/Controllers/OpenId/DiscoveryController.php b/app/Http/Controllers/OpenId/DiscoveryController.php
new file mode 100644
index 00000000..8a77df4e
--- /dev/null
+++ b/app/Http/Controllers/OpenId/DiscoveryController.php
@@ -0,0 +1,90 @@
+<?php namespace App\Http\Controllers\OpenId;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OpenId\IOpenIdProtocol;
+use OpenId\Services\IServerConfigurationService;
+use Utils\Services\IAuthService;
+use Illuminate\Support\Facades\View;
+use Illuminate\Support\Facades\Response;
+
+/**
+ * Class DiscoveryController
+ * @package App\Http\Controllers\OpenId
+ */
+class DiscoveryController extends OpenIdController
+{
+    /**
+     * @var IOpenIdProtocol
+     */
+    private $openid_protocol;
+    /**
+     * @var IAuthService
+     */
+    private $auth_service;
+    /**
+     * @var IServerConfigurationService
+     */
+    private $server_config_service;
+
+    /**
+     * DiscoveryController constructor.
+     * @param IOpenIdProtocol $openid_protocol
+     * @param IAuthService $auth_service
+     * @param IServerConfigurationService $server_config_service
+     */
+    public function __construct
+    (
+        IOpenIdProtocol $openid_protocol,
+        IAuthService $auth_service,
+        IServerConfigurationService $server_config_service
+    )
+    {
+        $this->openid_protocol       = $openid_protocol;
+        $this->auth_service          = $auth_service;
+        $this->server_config_service = $server_config_service;
+    }
+
+    /**
+     * XRDS discovery(eXtensible Resource Descriptor Sequence)
+     * @return xrds document on response
+     */
+    public function idp()
+    {
+        $response = Response::make($this->openid_protocol->getXRDSDiscovery(IOpenIdProtocol::OpenIdXRDSModeIdp), 200);
+        $this->setDiscoveryResponseType($response);
+        return $response;
+    }
+
+    /**
+     * If the Claimed Identifier was not previously discovered by the Relying Party
+     * (the "openid.identity" in the request was "http://specs.openid.net/auth/2.0/identifier_select"
+     * or a different Identifier, or if the OP is sending an unsolicited positive assertion),
+     * the Relying Party MUST perform discovery on the Claimed Identifier in
+     * the response to make sure that the OP is authorized to make assertions about the Claimed Identifier.
+     * @param $identifier
+     * @return mixed
+     */
+    public function user($identifier)
+    {
+        $user = $this->auth_service->getUserByOpenId($identifier);
+        if (is_null($user))
+            return View::make("errors.404");
+
+        $local_identifier = $this->server_config_service->getUserIdentityEndpointURL($identifier);
+        $response = Response::make($this->openid_protocol->getXRDSDiscovery(IOpenIdProtocol::OpenIdXRDSModeUser, $local_identifier), 200);
+        $this->setDiscoveryResponseType($response);
+        return $response;
+    }
+
+}
\ No newline at end of file
diff --git a/app/controllers/openid/OpenIdController.php b/app/Http/Controllers/OpenId/OpenIdController.php
similarity index 82%
rename from app/controllers/openid/OpenIdController.php
rename to app/Http/Controllers/OpenId/OpenIdController.php
index 10db8def..069e736e 100644
--- a/app/controllers/openid/OpenIdController.php
+++ b/app/Http/Controllers/OpenId/OpenIdController.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Http\Controllers\OpenId;
 /**
  * Copyright 2015 Openstack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,12 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-use openid\XRDS\XRDSDocumentBuilder;
+use Illuminate\Support\Facades\Request;
+use OpenId\Xrds\XRDSDocumentBuilder;
+use App\Http\Controllers\Controller;
 
 /**
  * Class OpenIdController
+ * @package App\Http\Controllers\OpenId
  */
-abstract class OpenIdController extends BaseController {
+abstract class OpenIdController extends Controller {
 
     /**
      * @return bool
diff --git a/app/Http/Controllers/OpenId/OpenIdProviderController.php b/app/Http/Controllers/OpenId/OpenIdProviderController.php
new file mode 100644
index 00000000..a9adcf0c
--- /dev/null
+++ b/app/Http/Controllers/OpenId/OpenIdProviderController.php
@@ -0,0 +1,76 @@
+<?php namespace App\Http\Controllers\OpenId;
+
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use App\Http\Controllers\Controller;
+use Exception;
+use Illuminate\Support\Facades\Input;
+use OpenId\Exceptions\InvalidOpenIdMessageException;
+use OpenId\Helpers\OpenIdErrorMessages;
+use OpenId\IOpenIdProtocol;
+use OpenId\OpenIdMessage;
+use OpenId\Responses\OpenIdResponse;
+use OpenId\Services\IMementoOpenIdSerializerService;
+use OpenId\Strategies\OpenIdResponseStrategyFactoryMethod;
+
+/**
+ * Class OpenIdProviderController
+ * @package App\Http\Controllers\OpenId
+ */
+class OpenIdProviderController extends Controller
+{
+    /**
+     * @var IOpenIdProtocol
+     */
+    private $openid_protocol;
+    /**
+     * @var IMementoOpenIdSerializerService
+     */
+    private $memento_service;
+
+    /**
+     * @param IOpenIdProtocol $openid_protocol
+     * @param IMementoOpenIdSerializerService $memento_service
+     */
+    public function __construct(IOpenIdProtocol $openid_protocol, IMementoOpenIdSerializerService $memento_service)
+    {
+        $this->openid_protocol = $openid_protocol;
+        $this->memento_service = $memento_service;
+    }
+
+    /**
+     * @return OpenIdResponse
+     * @throws Exception
+     * @throws InvalidOpenIdMessageException
+     */
+    public function endpoint()
+    {
+        $msg = new OpenIdMessage(Input::all());
+
+        if ($this->memento_service->exists()) {
+            $msg = OpenIdMessage::buildFromMemento($this->memento_service->load());
+        }
+
+        if (!$msg->isValid())
+            throw new InvalidOpenIdMessageException(OpenIdErrorMessages::InvalidOpenIdMessage);
+
+        //get response and manage it taking in consideration its type (direct or indirect)
+        $response = $this->openid_protocol->handleOpenIdMessage($msg);
+
+        if ($response instanceof OpenIdResponse) {
+            $strategy = OpenIdResponseStrategyFactoryMethod::buildStrategy($response);
+            return $strategy->handle($response);
+        }
+        return $response;
+    }
+}
\ No newline at end of file
diff --git a/app/controllers/UserController.php b/app/Http/Controllers/UserController.php
similarity index 77%
rename from app/controllers/UserController.php
rename to app/Http/Controllers/UserController.php
index 0d746f66..3e3e4b5f 100644
--- a/app/controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -1,33 +1,58 @@
-<?php
+<?php namespace App\Http\Controllers;
 
-use oauth2\services\IApiScopeService;
-use oauth2\services\IClientService;
-use oauth2\services\IResourceServerService;
-use oauth2\services\ITokenService;
-use openid\services\IMementoOpenIdSerializerService;
-use openid\services\IServerConfigurationService;
-use openid\services\ITrustedSitesService;
-use openid\services\IUserService;
-use services\IUserActionService;
-use strategies\DefaultLoginStrategy;
-use strategies\OAuth2ConsentStrategy;
-use strategies\OAuth2LoginStrategy;
-use strategies\OpenIdConsentStrategy;
-use strategies\OpenIdLoginStrategy;
-use utils\IPHelper;
-use utils\services\IAuthService;
-use utils\services\IServerConfigurationService as IUtilsServerConfigurationService;
-use oauth2\services\IMementoOAuth2SerializerService;
-use oauth2\services\ISecurityContextService;
-use auth\exceptions\AuthenticationException;
-use auth\exceptions\UnverifiedEmailMemberException;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use App\Http\Controllers\OpenId\DiscoveryController;
+use App\Http\Controllers\OpenId\OpenIdController;
+use Auth\Exceptions\AuthenticationException;
+use Auth\Exceptions\UnverifiedEmailMemberException;
+use Exception;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Facades\View;
+use OAuth2\Repositories\IApiScopeRepository;
+use OAuth2\Repositories\IClientRepository;
+use OpenId\Services\IUserService;
+use OAuth2\Services\IApiScopeService;
+use OAuth2\Services\IClientService;
+use OAuth2\Services\IMementoOAuth2SerializerService;
+use OAuth2\Services\IResourceServerService;
+use OAuth2\Services\ISecurityContextService;
+use OAuth2\Services\ITokenService;
+use OpenId\Services\IMementoOpenIdSerializerService;
+use OpenId\Services\ITrustedSitesService;
+use Services\IUserActionService;
+use Strategies\DefaultLoginStrategy;
+use Strategies\IConsentStrategy;
+use Strategies\OAuth2ConsentStrategy;
+use Strategies\OAuth2LoginStrategy;
+use Strategies\OpenIdConsentStrategy;
+use Strategies\OpenIdLoginStrategy;
+use Utils\IPHelper;
+use Utils\Services\IAuthService;
+use Utils\Services\IServerConfigurationService;
+use Utils\Services\IServerConfigurationService as IUtilsServerConfigurationService;
 
 /**
  * Class UserController
+ * @package App\Http\Controllers
  */
 final class UserController extends OpenIdController
 {
-
     /**
      * @var IMementoOpenIdSerializerService
      */
@@ -65,13 +90,13 @@ final class UserController extends OpenIdController
      */
     private $consent_strategy;
     /**
-     * @var IClientService
+     * @var IClientRepository
      */
-    private $client_service;
+    private $client_repository;
     /**
-     * @var IApiScopeService
+     * @var IApiScopeRepository
      */
-    private $scope_service;
+    private $scope_repository;
     /**
      * @var ITokenService
      */
@@ -86,19 +111,21 @@ final class UserController extends OpenIdController
     private $utils_configuration_service;
 
     /**
+     * UserController constructor.
      * @param IMementoOpenIdSerializerService $openid_memento_service
      * @param IMementoOAuth2SerializerService $oauth2_memento_service
      * @param IAuthService $auth_service
-     * @param IServerConfigurationService $server_configuration_service
+     * @param IUtilsServerConfigurationService $server_configuration_service
      * @param ITrustedSitesService $trusted_sites_service
      * @param DiscoveryController $discovery
      * @param IUserService $user_service
      * @param IUserActionService $user_action_service
-     * @param IClientService $client_service
-     * @param IApiScopeService $scope_service
+     * @param IClientRepository $client_repository
+     * @param IApiScopeRepository $scope_repository
      * @param ITokenService $token_service
      * @param IResourceServerService $resource_server_service
      * @param IUtilsServerConfigurationService $utils_configuration_service
+     * @param ISecurityContextService $security_context_service
      */
     public function __construct
     (
@@ -110,8 +137,8 @@ final class UserController extends OpenIdController
         DiscoveryController $discovery,
         IUserService $user_service,
         IUserActionService $user_action_service,
-        IClientService $client_service,
-        IApiScopeService $scope_service,
+        IClientRepository $client_repository,
+        IApiScopeRepository $scope_repository,
         ITokenService $token_service,
         IResourceServerService $resource_server_service,
         IUtilsServerConfigurationService $utils_configuration_service,
@@ -119,21 +146,19 @@ final class UserController extends OpenIdController
     )
     {
 
-        $this->openid_memento_service = $openid_memento_service;
-        $this->oauth2_memento_service = $oauth2_memento_service;
-        $this->auth_service = $auth_service;
+        $this->openid_memento_service       = $openid_memento_service;
+        $this->oauth2_memento_service       = $oauth2_memento_service;
+        $this->auth_service                 = $auth_service;
         $this->server_configuration_service = $server_configuration_service;
-        $this->trusted_sites_service = $trusted_sites_service;
-        $this->discovery = $discovery;
-        $this->user_service = $user_service;
-        $this->user_action_service = $user_action_service;
-        $this->client_service = $client_service;
-        $this->scope_service = $scope_service;
-        $this->token_service = $token_service;
-        $this->resource_server_service = $resource_server_service;
-        $this->utils_configuration_service = $utils_configuration_service;
-        //filters
-        $this->beforeFilter('csrf', array('only' => array('postLogin', 'postConsent')));
+        $this->trusted_sites_service        = $trusted_sites_service;
+        $this->discovery                    = $discovery;
+        $this->user_service                 = $user_service;
+        $this->user_action_service          = $user_action_service;
+        $this->client_repository            = $client_repository;
+        $this->scope_repository             = $scope_repository;
+        $this->token_service                = $token_service;
+        $this->resource_server_service      = $resource_server_service;
+        $this->utils_configuration_service  = $utils_configuration_service;
 
         if ($this->openid_memento_service->exists())
         {
@@ -169,8 +194,8 @@ final class UserController extends OpenIdController
                 (
                     $auth_service,
                     $oauth2_memento_service,
-                    $scope_service,
-                    $client_service
+                    $scope_repository,
+                    $client_repository
                 );
         }
         else
@@ -291,7 +316,7 @@ final class UserController extends OpenIdController
     {
         if (is_null($this->consent_strategy))
         {
-            return View::make("404");
+            return View::make("errors.404");
         }
 
         return $this->consent_strategy->getConsent();
@@ -312,7 +337,7 @@ final class UserController extends OpenIdController
             {
                 if (is_null($this->consent_strategy))
                 {
-                    return View::make("404");
+                    return View::make("errors.404");
                 }
 
                 return $this->consent_strategy->postConsent(Input::get("trust"));
@@ -333,7 +358,7 @@ final class UserController extends OpenIdController
             $user = $this->auth_service->getUserByOpenId($identifier);
             if (is_null($user))
             {
-                return View::make("404");
+                return View::make("errors.404");
             }
 
             if ($this->isDiscoveryRequest())
@@ -375,7 +400,7 @@ final class UserController extends OpenIdController
         catch (Exception $ex)
         {
             Log::error($ex);
-            return View::make("404");
+            return View::make("errors.404");
         }
     }
 
@@ -383,7 +408,7 @@ final class UserController extends OpenIdController
     {
         $this->user_action_service->addUserAction
         (
-            $this->auth_service->getCurrentUser(),
+            $this->auth_service->getCurrentUser()->getId(),
             IPHelper::getUserIp(),
             IUserActionService::LogoutAction
         );
@@ -419,8 +444,9 @@ final class UserController extends OpenIdController
     public function postUserProfileOptions()
     {
         $show_full_name = Input::get("show_full_name");
-        $show_email = Input::get("show_email");
-        $show_pic = Input::get("show_pic");
+        $show_email     = Input::get("show_email");
+        $show_pic       = Input::get("show_pic");
+
         $user = $this->auth_service->getCurrentUser();
         $this->user_service->saveProfileInfo($user->getId(), $show_pic, $show_full_name, $show_email);
 
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
new file mode 100644
index 00000000..82494ac4
--- /dev/null
+++ b/app/Http/Kernel.php
@@ -0,0 +1,78 @@
+<?php namespace App\Http;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Foundation\Http\Kernel as HttpKernel;
+/**
+ * Class Kernel
+ * @package App\Http
+ */
+class Kernel extends HttpKernel
+{
+    /**
+     * The application's global HTTP middleware stack.
+     *
+     * These middleware are run during every request to your application.
+     *
+     * @var array
+     */
+    protected $middleware = [
+        \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+        \App\Http\Middleware\SingleAccessPoint::class
+    ];
+
+    /**
+     * The application's route middleware groups.
+     *
+     * @var array
+     */
+    protected $middlewareGroups = [
+        'web' => [
+            \App\Http\Middleware\EncryptCookies::class,
+            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+            \Illuminate\Session\Middleware\StartSession::class,
+            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+        ],
+
+        'api' => [
+            'ssl',
+            'cors',
+            'oauth2.endpoint',
+        ],
+    ];
+
+    /**
+     * The application's route middleware.
+     *
+     * These middleware may be assigned to groups or used individually.
+     *
+     * @var array
+     */
+    protected $routeMiddleware = [
+        'auth'                                     => \App\Http\Middleware\Authenticate::class,
+        'auth.basic'                               => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+        'ssl'                                      => \App\Http\Middleware\SSLMiddleware::class,
+        'can'                                      => \Illuminate\Foundation\Http\Middleware\Authorize::class,
+        'guest'                                    => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'throttle'                                 => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'csrf'                                     => \App\Http\Middleware\VerifyCsrfToken::class,
+        'oauth2.endpoint'                          => \App\Http\Middleware\OAuth2BearerAccessTokenRequestValidator::class,
+        'cors'                                     => \App\Http\Middleware\CORSMiddleware::class,
+        'oauth2.currentuser.serveradmin'           => \App\Http\Middleware\CurrentUserIsOAuth2ServerAdmin::class,
+        'oauth2.currentuser.serveradmin.json'      => \App\Http\Middleware\CurrentUserIsOAuth2ServerAdminJson::class,
+        'openstackid.currentuser.serveradmin'      => \App\Http\Middleware\CurrentUserIsOpenIdServerAdmin::class,
+        'openstackid.currentuser.serveradmin.json' => \App\Http\Middleware\CurrentUserIsOpenIdServerAdminJson::class,
+        'oauth2.currentuser.allow.client.edition'  => \App\Http\Middleware\CurrentUserCanEditOAuth2Client::class,
+        'oauth2.currentuser.owns.client'           => \App\Http\Middleware\CurrentUserOwnsOAuth2Client::class,
+        'currentuser.checkroute'                   => \App\Http\Middleware\CurrentUserCheckRouteParams::class,
+    ];
+}
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
new file mode 100644
index 00000000..2e050d2e
--- /dev/null
+++ b/app/Http/Middleware/Authenticate.php
@@ -0,0 +1,49 @@
+<?php namespace App\Http\Middleware;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Closure;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\URL;
+/**
+ * Class Authenticate
+ * @package App\Http\Middleware
+ */
+class Authenticate
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @param  string|null  $guard
+     * @return mixed
+     */
+    public function handle($request, Closure $next, $guard = null)
+    {
+       if (Auth::guard($guard)->guest()) {
+            Session::put('url.intended', URL::full());
+            Session::save();
+            return Redirect::action('HomeController@index');
+        }
+        $redirect = Session::get('url.intended');
+        if (!empty($redirect)) {
+            Session::forget('url.intended');
+            Session::save();
+            return Redirect::to($redirect);
+        }
+
+        return $next($request);
+    }
+}
diff --git a/app/Http/Middleware/CORSMiddleware.php b/app/Http/Middleware/CORSMiddleware.php
new file mode 100644
index 00000000..ab7b02ed
--- /dev/null
+++ b/app/Http/Middleware/CORSMiddleware.php
@@ -0,0 +1,457 @@
+<?php namespace App\Http\Middleware;
+
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Closure;
+use Utils\Services\ICacheService;
+use OAuth2\Models\IApiEndpoint;
+use OAuth2\Repositories\IApiEndpointRepository;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Illuminate\Support\Facades\Cache;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Route;
+
+/**
+ *
+ * @package App\Http\Middleware\
+ * Implementation of http://www.w3.org/TR/cors/
+ */
+final class CORSMiddleware
+{
+
+    const CORS_IP_BLACKLIST_PREFIX = 'CORS_IP_BLACKLIST_PREFIX:';
+
+    private $headers = array();
+
+    /**
+     * A header is said to be a simple header if the header field name is an ASCII case-insensitive match for Accept,
+     * Accept-Language, or Content-Language or if it is an ASCII case-insensitive match for Content-Type and the header
+     * field value media type (excluding parameters) is an ASCII case-insensitive match for
+     * application/x-www-form-urlencoded, multipart/form-data, or text/plain.
+     */
+
+    protected static $simple_headers = array
+    (
+        'accept',
+        'accept-language',
+        'content-language',
+        'origin',
+    );
+
+    protected static $simple_content_header_values = array(
+        'application/x-www-form-urlencode',
+        'multipart/form-data',
+        'text/plain');
+
+    /**
+     * A method is said to be a simple method if it is a case-sensitive match for one of the following:
+     * - GET
+     * - HEAD
+     * - POST
+     */
+    protected static $simple_http_methods = array('GET', 'HEAD', 'POST');
+
+    const DefaultAllowedHeaders = 'origin, content-type, accept, authorization, x-requested-with';
+    const DefaultAllowedMethods = 'GET, POST, OPTIONS, PUT, DELETE';
+
+
+    /**
+     * @var IApiEndpointRepository
+     */
+    private $endpoint_repository;
+
+    /**
+     * @var IApiEndpoint;
+     */
+    private $current_endpoint = null;
+
+
+    private $allowed_headers;
+    private $allowed_methods;
+
+    /**
+     * @var ICacheService
+     */
+    private $cache_service;
+
+    public function __construct(IApiEndpointRepository $endpoint_repository, ICacheService $cache_service)
+    {
+        $this->endpoint_repository = $endpoint_repository;
+        $this->cache_service       = $cache_service;
+        $this->allowed_headers     = Config::get('cors.allowed_headers', self::DefaultAllowedHeaders);
+        $this->allowed_methods     = Config::get('cors.allowed_methods', self::DefaultAllowedMethods);
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if ($response = $this->preProcess($request)) {
+            return $response;
+        }
+        //normal processing
+        $response = $next($request);
+        $this->postProcess($request, $response);
+        return $response;
+    }
+
+    private function generatePreflightCacheKey($request)
+    {
+        $cache_id = 'pre-flight-' . $request->getClientIp() . '-' . $request->getRequestUri() . '-' . $request->getMethod();
+        return $cache_id;
+    }
+
+    /**
+     * @param Request $request
+     * @return Response
+     */
+    public function preProcess(Request $request)
+    {
+        $actual_request = false;
+        if ($this->isValidCORSRequest($request)) {
+            if (!$this->testOriginHeaderScrutiny($request)) {
+                $response = new Response();
+                $response->setStatusCode(403);
+                return $response;
+            }
+            /* Step 01 : Determine the type of the incoming request */
+            $type = $this->getRequestType($request);
+            /* Step 02 : Process request according to is type */
+            switch ($type) {
+                case CORSRequestPreflightType::REQUEST_FOR_PREFLIGHT: {
+                    // HTTP request send by client to preflight a further 'Complex' request
+                    // sets the original method on request in order to be able to find the
+                    // correct route
+                    $real_method = $request->headers->get('Access-Control-Request-Method');
+
+                    $route_path  = Route::getCurrentRoute()->getPath();
+                    if (strpos($route_path, '/') != 0)
+                        $route_path = '/' . $route_path;
+
+                    $request->setMethod($real_method);
+
+                    if (!$route_path || !$this->checkEndPoint($route_path, $real_method)) {
+                        $response = new Response();
+                        $response->setStatusCode(403);
+                        return $response;
+                    }
+                    // ----Step 2b: Store pre-flight request data in the Cache to keep (mark) the request as correctly followed the request pre-flight process
+                    $data = new CORSRequestPreflightData($request, $this->current_endpoint->supportCredentials());
+                    $cache_id = $this->generatePreflightCacheKey($request);
+                    $this->cache_service->storeHash($cache_id, $data->toArray(), CORSRequestPreflightData::$cache_lifetime);
+                    // ----Step 2c: Return corresponding response - This part should be customized with application specific constraints.....
+                    return $this->makePreflightResponse($request);
+                }
+                break;
+                case CORSRequestPreflightType::COMPLEX_REQUEST: {
+                    $cache_id = $this->generatePreflightCacheKey($request);;                    // ----Step 2a: Check if the current request has an entry into the preflighted requests Cache
+                    $data = $this->cache_service->getHash($cache_id, CORSRequestPreflightData::$cache_attributes);
+                    if (!count($data)) {
+                        $response = new Response();
+                        $response->setStatusCode(403);
+                        return $response;
+                    }
+                    // ----Step 2b: Check that pre-flight information declared during the pre-flight request match the current request on key information
+                    $match = false;
+                    // ------Start with comparison of "Origin" HTTP header (according to utility method impl. used to retrieve header reference cannot be null)...
+                    if ($request->headers->get('Origin') === $data['origin']) {
+                        // ------Continue with HTTP method...
+                        if ($request->getMethod() === $data['expected_method']) {
+                            // ------Finish with custom HTTP headers (use an method to avoid manual iteration on collection to increase the speed)...
+                            $x_headers = self::getCustomHeaders($request);
+                            $x_headers_pre = explode(',', $data['expected_custom_headers']);
+                            sort($x_headers);
+                            sort($x_headers_pre);
+                            if (count(array_diff($x_headers, $x_headers_pre)) === 0) {
+                                $match = true;
+                            }
+                        }
+                    }
+                    if (!$match) {
+                        $response = new Response();
+                        $response->setStatusCode(403);
+                        return $response;
+                    }
+                    $actual_request = true;
+                }
+                    break;
+                case CORSRequestPreflightType::SIMPLE_REQUEST: {
+                    // origins, do not set any additional headers and terminate this set of steps.
+                    if (!$this->isAllowedOrigin($request)) {
+                        $response = new Response();
+                        $response->setStatusCode(403);
+
+                        return $response;
+                    }
+                    $actual_request = true;
+                    // If the resource supports credentials add a single Access-Control-Allow-Origin header, with the value
+                    // of the Origin header as value, and add a single Access-Control-Allow-Credentials header with the
+                    // case-sensitive string "true" as value.
+                    // Otherwise, add a single Access-Control-Allow-Origin header, with either the value of the Origin header
+                    // or the string "*" as value.
+                }
+                    break;
+            }
+        }
+        if ($actual_request) {
+            // Save response headers
+            $cache_id = $this->generatePreflightCacheKey($request);
+            // ----Step 2a: Check if the current request has an entry into the preflighted requests Cache
+            $data = $this->cache_service->getHash($cache_id, CORSRequestPreflightData::$cache_attributes);
+            $this->headers['Access-Control-Allow-Origin'] = $request->headers->get('Origin');
+            if ((isset($data['allows_credentials']) && (bool)$data['allows_credentials'])) {
+                $this->headers['Access-Control-Allow-Credentials'] = 'true';
+            }
+            /**
+             * During a CORS request, the getResponseHeader() method can only access simple response headers.
+             * Simple response headers are defined as follows:
+             ** Cache-Control
+             ** Content-Language
+             ** Content-Type
+             ** Expires
+             ** Last-Modified
+             ** Pragma
+             * If you want clients to be able to access other headers,
+             * you have to use the Access-Control-Expose-Headers header.
+             * The value of this header is a comma-delimited list of response headers you want to expose
+             * to the client.
+             */
+            $exposed_headers = Config::get('cors.exposed_headers', 'Content-Type, Expires');
+            if (!empty($exposed_headers)) {
+                $this->headers['Access-Control-Expose-Headers'] = $exposed_headers;
+            }
+        }
+    }
+
+    public function postProcess(Request $request, Response $response)
+    {
+        // add CORS response headers
+        if (count($this->headers) > 0) {
+            $response->headers->add($this->headers);
+        }
+        return $response;
+    }
+
+    /**
+     * @param Request $request
+     * @return Response
+     */
+    private function makePreflightResponse(Request $request)
+    {
+        $response = new Response();
+        if (!$this->isAllowedOrigin($request)) {
+            $response->headers->set('Access-Control-Allow-Origin', 'null');
+            $response->setStatusCode(403);
+            return $response;
+        }
+        $response->headers->set('Access-Control-Allow-Origin', $request->headers->get('Origin'));
+        // The Access-Control-Request-Method header indicates which method will be used in the actual
+        // request as part of the preflight request
+        // check request method
+        if ($request->headers->get('Access-Control-Request-Method') != $this->current_endpoint->getHttpMethod()) {
+            $response->setStatusCode(405);
+            return $response;
+        }
+        // The Access-Control-Allow-Credentials header indicates whether the response to request
+        // can be exposed when the omit credentials flag is unset. When part of the response to a preflight request
+        // it indicates that the actual request can include user credentials.
+        if ($this->current_endpoint->supportCredentials()) {
+            $response->headers->set('Access-Control-Allow-Credentials', 'true');
+        }
+        if (Config::get('cors.use_pre_flight_caching', false)) {
+            // The Access-Control-Max-Age header indicates how long the response can be cached, so that for
+            // subsequent requests, within the specified time, no preflight request has to be made.
+            $response->headers->set('Access-Control-Max-Age', Config::get('cors.max_age', 32000));
+        }
+        // The Access-Control-Allow-Headers header indicates, as part of the response to a preflight request,
+        // which header field names can be used during the actual request
+        $response->headers->set('Access-Control-Allow-Headers', $this->allowed_headers);
+
+        //The Access-Control-Allow-Methods header indicates, as part of the response to a preflight request,
+        // which methods can be used during the actual request.
+        $response->headers->set('Access-Control-Allow-Methods', $this->allowed_methods);
+        // The Access-Control-Request-Headers header indicates which headers will be used in the actual request
+        // as part of the preflight request.
+        $headers = $request->headers->get('Access-Control-Request-Headers');
+        if ($headers) {
+            $headers = trim(strtolower($headers));
+            $allow_headers = explode(', ', $this->allowed_headers);
+            foreach (preg_split('{, *}', $headers) as $header) {
+                //if they are simple headers then skip them
+                if (in_array($header, self::$simple_headers, true)) {
+                    continue;
+                }
+                //check is the requested header is on the list of allowed headers
+                if (!in_array($header, $allow_headers, true)) {
+                    $response->setStatusCode(400);
+                    $response->setContent('Unauthorized header ' . $header);
+                    break;
+                }
+            }
+        }
+        //OK - No Content
+        $response->setStatusCode(204);
+        return $response;
+    }
+
+    /**
+     * @param Request $request
+     * @returns bool
+     */
+    private function isValidCORSRequest(Request $request)
+    {
+        /**
+         * The presence of the Origin header does not necessarily mean that the request is a cross-origin request.
+         * While all cross-origin requests will contain an Origin header,
+         * Origin header on same-origin requests. But Chrome and Safari include an Origin header on
+         * same-origin POST/PUT/DELETE requests (same-origin GET requests will not have an Origin header).
+         */
+        return $request->headers->has('Origin');
+    }
+
+    /**
+     * https://www.owasp.org/index.php/CORS_OriginHeaderScrutiny
+     * Filter that will ensure the following points for each incoming HTTP CORS requests:
+     *  - Have only one and non empty instance of the origin header,
+     *  - Have only one and non empty instance of the host header,
+     *  - The value of the origin header is present in a internal allowed domains list (white list). As we act before the
+     *    step 2 of the CORS HTTP requests/responses exchange process, allowed domains list is yet provided to client,
+     *  - Cache IP of the sender for 1 hour. If the sender send one time a origin domain that is not in the white list
+     *    then all is requests will return an HTTP 403 response (protract allowed domain guessing).
+     * We use the method above because it's not possible to identify up to 100% that the request come from one expected
+     * client application, since:
+     *  - All information of a HTTP request can be faked,
+     *  - It's the browser (or others tools) that send the HTTP request then the IP address that we have access to is the
+     *    client IP address.
+     * @param Request $request
+     * @return bool
+     */
+    private function testOriginHeaderScrutiny(Request $request)
+    {
+        /* Step 0 : Check presence of client IP in black list */
+        $client_ip = $request->getClientIp();
+        if (Cache::has(self::CORS_IP_BLACKLIST_PREFIX . $client_ip)) {
+            return false;
+        }
+        /* Step 1 : Check that we have only one and non empty instance of the "Origin" header */
+        $origin = $request->headers->get('Origin', null, false);
+        if (is_array($origin) && count($origin) > 1) {
+            // If we reach this point it means that we have multiple instance of the "Origin" header
+            // Add client IP address to black listed client
+            $expiresAt = Carbon::now()->addMinutes(60);
+            Cache::put(self::CORS_IP_BLACKLIST_PREFIX . $client_ip, self::CORS_IP_BLACKLIST_PREFIX . $client_ip, $expiresAt);
+            return false;
+        }
+        /* Step 2 : Check that we have only one and non empty instance of the "Host" header */
+        $host = $request->headers->get('Host', null, false);
+        //Have only one and non empty instance of the host header,
+        if (is_array($host) && count($host) > 1) {
+            // If we reach this point it means that we have multiple instance of the "Host" header
+            $expiresAt = Carbon::now()->addMinutes(60);
+            Cache::put(self::CORS_IP_BLACKLIST_PREFIX . $client_ip, self::CORS_IP_BLACKLIST_PREFIX . $client_ip, $expiresAt);
+            return false;
+        }
+        /* Step 3 : Perform analysis - Origin header is required */
+
+        $origin      = $request->headers->get('Origin');
+        $host        = $request->headers->get('Host');
+        $server_name = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
+
+
+        // check origin not empty and allowed
+
+        if (!$this->isAllowedOrigin($origin)) {
+            $expiresAt = Carbon::now()->addMinutes(60);
+            Cache::put(self::CORS_IP_BLACKLIST_PREFIX . $client_ip, self::CORS_IP_BLACKLIST_PREFIX . $client_ip, $expiresAt);
+            return false;
+        }
+
+        if (is_null($host) || $server_name != $host) {
+            $expiresAt = Carbon::now()->addMinutes(60);
+            Cache::put(self::CORS_IP_BLACKLIST_PREFIX . $client_ip, self::CORS_IP_BLACKLIST_PREFIX . $client_ip, $expiresAt);
+            return false;
+        }
+
+        /* Step 4 : Finalize request next step */
+        return true;
+    }
+
+    private function checkEndPoint($endpoint_path, $http_method)
+    {
+        $this->current_endpoint = $this->endpoint_repository->getApiEndpointByUrlAndMethod($endpoint_path, $http_method);
+        if (is_null($this->current_endpoint)) {
+            return false;
+        }
+        if (!$this->current_endpoint->supportCORS() || !$this->current_endpoint->isActive()) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @param string $origin
+     * @return bool
+     */
+    private function isAllowedOrigin($origin)
+    {
+        return true;
+    }
+
+    private static function getRequestType(Request $request)
+    {
+
+        $type = CORSRequestPreflightType::UNKNOWN;
+        $http_method = $request->getMethod();
+        $content_type = strtolower($request->getContentType());
+        $http_method = strtoupper($http_method);
+
+        if ($http_method === 'OPTIONS' && $request->headers->has('Access-Control-Request-Method')) {
+            $type = CORSRequestPreflightType::REQUEST_FOR_PREFLIGHT;
+        } else {
+            if (self::hasCustomHeaders($request)) {
+                $type = CORSRequestPreflightType::COMPLEX_REQUEST;
+            } elseif ($http_method === 'POST' && !in_array($content_type, self::$simple_content_header_values, true)) {
+                $type = CORSRequestPreflightType::COMPLEX_REQUEST;
+            } elseif (!in_array($http_method, self::$simple_http_methods, true)) {
+                $type = CORSRequestPreflightType::COMPLEX_REQUEST;
+            } else {
+                $type = CORSRequestPreflightType::SIMPLE_REQUEST;
+            }
+        }
+        return $type;
+    }
+
+
+    private static function getCustomHeaders(Request $request)
+    {
+        $custom_headers = array();
+        foreach ($request->headers->all() as $k => $h) {
+            if (starts_with('X-', strtoupper(trim($k)))) {
+                array_push($custom_headers, strtoupper(trim($k)));
+            }
+        }
+        return $custom_headers;
+    }
+
+    private static function hasCustomHeaders(Request $request)
+    {
+        return count(self::getCustomHeaders($request)) > 0;
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Middleware/CORSRequestPreflightData.php b/app/Http/Middleware/CORSRequestPreflightData.php
new file mode 100644
index 00000000..899dad76
--- /dev/null
+++ b/app/Http/Middleware/CORSRequestPreflightData.php
@@ -0,0 +1,82 @@
+<?php namespace App\Http\Middleware;
+/**
+* Copyright 2015 OpenStack Foundation
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+**/
+
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+* Class CORSRequestPreflightData
+* @package App\Http\Middleware
+*/
+class CORSRequestPreflightData
+{
+
+	// ttl on seconds
+	public static $cache_lifetime   = 10;
+	public static $cache_attributes = array('sender', 'uri', 'origin', 'expected_method', 'expected_custom_headers',  'allows_credentials');
+
+	/** Final HTTP request expected method */
+	private $expected_method = null;
+	/** Final HTTP request expected custom headers */
+	private $expected_custom_headers = array();
+	/** Current HTTP request uri */
+	private $uri = null;
+	/** Current HTTP request origin header */
+	private $origin = null;
+	/** Current Sender IP address */
+	private $sender = null;
+
+	/**
+	 * @var bool
+	 */
+	private $allows_credentials;
+
+	/**
+	* @param Request $request
+	* @param bool $allows_credentials
+	*/
+	public function __construct(Request $request, $allows_credentials)
+	{
+		$this->sender             = $request->getClientIp();
+		$this->uri                = $request->getRequestUri();
+		$this->origin             = $request->headers->get('Origin');
+		$this->expected_method    = $request->headers->get('Access-Control-Request-Method');
+		$this->allows_credentials = $allows_credentials;
+
+		$tmp = $request->headers->get("Access-Control-Request-Headers");
+		if (!empty($tmp))
+		{
+			$hs = explode(',', $tmp);
+			foreach ($hs as $h)
+			{
+				array_push($this->expected_custom_headers, strtoupper(trim($h)));
+			}
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function toArray()
+	{
+		$res                            = array();
+		$res['sender']                  = $this->sender;
+		$res['uri']                     = $this->uri;
+		$res['origin']                  = $this->origin;
+		$res['allows_credentials']      = $this->allows_credentials;
+		$res['expected_method']         = $this->expected_method;
+		$res['expected_custom_headers'] = implode(',', $this->expected_custom_headers);
+		return $res;
+	}
+
+}
\ No newline at end of file
diff --git a/app/Http/Middleware/CORSRequestPreflightType.php b/app/Http/Middleware/CORSRequestPreflightType.php
new file mode 100644
index 00000000..4dcf2a82
--- /dev/null
+++ b/app/Http/Middleware/CORSRequestPreflightType.php
@@ -0,0 +1,36 @@
+<?php namespace App\Http\Middleware;
+/**
+* Copyright 2015 OpenStack Foundation
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+**/
+
+/**
+ * Class CORSRequestPreflightType
+ * @package App\Http\Middleware
+ */
+final class CORSRequestPreflightType
+{
+
+	/** HTTP request send by client to preflight a further 'Complex' request */
+	const REQUEST_FOR_PREFLIGHT = 0;
+
+	/** Normal HTTP request send by client that require preflight ie 'Complex' resquest in Preflight process */
+	const COMPLEX_REQUEST = 1;
+
+	/** Normal HTTP request send by client that do not require preflight ie 'Simple' resquest in Preflight process */
+
+	const SIMPLE_REQUEST = 2;
+
+	/** Cannot determine request type */
+
+	const UNKNOWN = -1;
+
+}
diff --git a/app/Http/Middleware/CurrentUserCanEditOAuth2Client.php b/app/Http/Middleware/CurrentUserCanEditOAuth2Client.php
new file mode 100644
index 00000000..2d14de01
--- /dev/null
+++ b/app/Http/Middleware/CurrentUserCanEditOAuth2Client.php
@@ -0,0 +1,81 @@
+<?php namespace App\Http\Middleware;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Closure;
+use Illuminate\Support\Facades\Response;
+use OAuth2\Repositories\IClientRepository;
+use Utils\Services\IAuthService;
+use Utils\Services\ServiceLocator;
+use Utils\Services\UtilsServiceCatalog;
+use OAuth2\Services\OAuth2ServiceCatalog;
+use Exception;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Route;
+
+/**
+ * Class CurrentUserCanEditOAuth2Client
+ * @package App\Http\Middleware
+ */
+final class CurrentUserCanEditOAuth2Client
+{
+
+    /**
+     * @var IClientRepository
+     */
+    private $client_repository;
+
+    /**
+     * @var IAuthService
+     */
+    private $auth_service;
+
+    public function __construct(IClientRepository $client_repository, IAuthService $auth_service)
+    {
+        $this->client_repository = $client_repository;
+        $this->auth_service      = $auth_service;
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @param  string|null  $guard
+     * @return mixed
+     */
+    public function handle($request, Closure $next, $guard = null)
+    {
+        try{
+            $route                  = Route::getCurrentRoute();
+            $client_id              = $route->getParameter('id');
+
+            if(is_null($client_id))
+                $client_id          = $route->getParameter('client_id');
+
+            if(is_null($client_id))
+                $client_id          = Input::get('client_id',null);;
+
+            $client                 = $this->client_repository->getClientByIdentifier($client_id);
+            $user                   = $this->auth_service->getCurrentUser();
+
+            if (is_null($client) || !$client->candEdit($user))
+                throw new Exception('invalid client id for current user');
+
+        } catch (Exception $ex) {
+            Log::error($ex);
+            return Response::json(array('error' => 'operation not allowed.'), 400);
+        }
+        return $next($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Middleware/CurrentUserCheckRouteParams.php b/app/Http/Middleware/CurrentUserCheckRouteParams.php
new file mode 100644
index 00000000..b8e96733
--- /dev/null
+++ b/app/Http/Middleware/CurrentUserCheckRouteParams.php
@@ -0,0 +1,63 @@
+<?php namespace App\Http\Middleware;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Closure;
+use Illuminate\Support\Facades\Response;
+use Utils\Services\ServiceLocator;
+use Utils\Services\UtilsServiceCatalog;
+use Exception;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Route;
+
+/**
+ * Class CurrentUserCheckRouteParams
+ * @package App\Http\Middleware
+ */
+class CurrentUserCheckRouteParams
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @param  string|null  $guard
+     * @return mixed
+     */
+    public function handle($request, Closure $next, $guard = null)
+    {
+        try{
+            $route                  = Route::getCurrentRoute();
+            $authentication_service = ServiceLocator::getInstance()->getService(UtilsServiceCatalog::AuthenticationService);
+            $used_id                = Input::get('user_id',null);
+
+            if(is_null($used_id))
+                $used_id            = Input::get('id',null);
+
+            if(is_null($used_id))
+                $used_id =  $route->getParameter('user_id');
+
+            if(is_null($used_id))
+                $used_id =  $route->getParameter('id');
+
+            $user                   = $authentication_service->getCurrentUser();
+            if (is_null($used_id) || intval($used_id) !== intval($user->getId()))
+                throw new Exception(sprintf('user id %s does not match with current user id %s',$used_id,$user->getId()));
+
+        } catch (Exception $ex) {
+            Log::error($ex);
+            return Response::json(array('error' => 'operation not allowed.'), 400);
+        }
+        return $next($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Middleware/CurrentUserIsOAuth2ServerAdmin.php b/app/Http/Middleware/CurrentUserIsOAuth2ServerAdmin.php
new file mode 100644
index 00000000..2cc0ad3e
--- /dev/null
+++ b/app/Http/Middleware/CurrentUserIsOAuth2ServerAdmin.php
@@ -0,0 +1,44 @@
+<?php namespace App\Http\Middleware;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Closure;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Response;
+
+/**
+ * Class CurrentUserIsOAuth2ServerAdmin
+ * @package App\Http\Middleware
+ */
+final class CurrentUserIsOAuth2ServerAdmin
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @param  string|null  $guard
+     * @return mixed
+     */
+    public function handle($request, Closure $next, $guard = null)
+    {
+        if (Auth::guard($guard)->guest())
+        {
+            return Response::view('errors.404', array(), 404);
+        }
+        if(!Auth::user()->isOAuth2ServerAdmin())
+        {
+            return Response::view('errors.404', array(), 404);
+        }
+        return $next($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Middleware/CurrentUserIsOAuth2ServerAdminJson.php b/app/Http/Middleware/CurrentUserIsOAuth2ServerAdminJson.php
new file mode 100644
index 00000000..10faf622
--- /dev/null
+++ b/app/Http/Middleware/CurrentUserIsOAuth2ServerAdminJson.php
@@ -0,0 +1,45 @@
+<?php namespace App\Http\Middleware;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Closure;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Response;
+
+/**
+ * Class CurrentUserIsOAuth2ServerAdminJson
+ * @package App\Http\Middleware
+ */
+final class CurrentUserIsOAuth2ServerAdminJson
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @param  string|null  $guard
+     * @return mixed
+     */
+    public function handle($request, Closure $next, $guard = null)
+    {
+        if (Auth::guard($guard)->guest())
+        {
+            return Response::json(array('error' => 'you are not allowed to perform this operation'), 403);
+        }
+        if(!Auth::user()->isOAuth2ServerAdmin())
+        {
+            return Response::json(array('error' => 'you are not allowed to perform this operation'), 403);
+        }
+
+        return $next($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Middleware/CurrentUserIsOpenIdServerAdmin.php b/app/Http/Middleware/CurrentUserIsOpenIdServerAdmin.php
new file mode 100644
index 00000000..37ff9325
--- /dev/null
+++ b/app/Http/Middleware/CurrentUserIsOpenIdServerAdmin.php
@@ -0,0 +1,44 @@
+<?php namespace App\Http\Middleware;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Closure;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Response;
+
+/**
+ * Class CurrentUserIsOpenIdServerAdmin
+ * @package App\Http\Middleware
+ */
+final class CurrentUserIsOpenIdServerAdmin
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @param  string|null  $guard
+     * @return mixed
+     */
+    public function handle($request, Closure $next, $guard = null)
+    {
+        if (Auth::guard($guard)->guest())
+        {
+            return Response::view('errors.404', array(), 404);
+        }
+        if(!Auth::user()->isOpenstackIdAdmin())
+        {
+            return Response::view('errors.404', array(), 404);
+        }
+        return $next($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Middleware/CurrentUserIsOpenIdServerAdminJson.php b/app/Http/Middleware/CurrentUserIsOpenIdServerAdminJson.php
new file mode 100644
index 00000000..8a7f6b6f
--- /dev/null
+++ b/app/Http/Middleware/CurrentUserIsOpenIdServerAdminJson.php
@@ -0,0 +1,44 @@
+<?php namespace App\Http\Middleware;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Closure;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Response;
+
+/**
+ * Class CurrentUserIsOpenIdServerAdminJson
+ * @package App\Http\Middleware
+ */
+class CurrentUserIsOpenIdServerAdminJson
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @param  string|null  $guard
+     * @return mixed
+     */
+    public function handle($request, Closure $next, $guard = null)
+    {
+        if (Auth::guard($guard)->guest())
+        {
+            return Response::json(array('error' => 'you are not allowed to perform this operation'));
+        }
+        if(!Auth::user()->isOpenstackIdAdmin())
+        {
+            return Response::json(array('error' => 'you are not allowed to perform this operation'));
+        }
+        return $next($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Middleware/CurrentUserOwnsOAuth2Client.php b/app/Http/Middleware/CurrentUserOwnsOAuth2Client.php
new file mode 100644
index 00000000..e175fff3
--- /dev/null
+++ b/app/Http/Middleware/CurrentUserOwnsOAuth2Client.php
@@ -0,0 +1,80 @@
+<?php namespace App\Http\Middleware;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Closure;
+use Illuminate\Support\Facades\Response;
+use OAuth2\Repositories\IClientRepository;
+use Utils\Services\IAuthService;
+use Utils\Services\ServiceLocator;
+use Utils\Services\UtilsServiceCatalog;
+use OAuth2\Services\OAuth2ServiceCatalog;
+use Exception;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Route;
+
+/**
+ * Class CurrentUserOwnsOAuth2Client
+ * @package App\Http\Middleware
+ */
+class CurrentUserOwnsOAuth2Client
+{
+
+    /**
+     * @var IClientRepository
+     */
+    private $client_repository;
+
+    /**
+     * @var IAuthService
+     */
+    private $auth_service;
+
+    public function __construct(IClientRepository $client_repository, IAuthService $auth_service)
+    {
+        $this->client_repository = $client_repository;
+        $this->auth_service      = $auth_service;
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @param  string|null  $guard
+     * @return mixed
+     */
+    public function handle($request, Closure $next, $guard = null)
+    {
+        try{
+            $route                  = Route::getCurrentRoute();
+            $client_id              = $route->getParameter('id');
+
+            if(is_null($client_id))
+                $client_id          = $route->getParameter('client_id');
+
+            if(is_null($client_id))
+                $client_id          = Input::get('client_id',null);;
+
+            $client                 = $this->client_repository->getClientByIdentifier($client_id);
+            $user                   = $this->auth_service->getCurrentUser();
+            if (is_null($client) || !$client->isOwner($user))
+                throw new Exception('invalid client id for current user');
+
+        } catch (Exception $ex) {
+            Log::error($ex);
+            return Response::json(array('error' => 'operation not allowed.'), 400);
+        }
+        return $next($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Middleware/ETagsMiddleware.php b/app/Http/Middleware/ETagsMiddleware.php
new file mode 100644
index 00000000..f7c4abf1
--- /dev/null
+++ b/app/Http/Middleware/ETagsMiddleware.php
@@ -0,0 +1,51 @@
+<?php namespace App\Http\Middleware;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Closure;
+use Log;
+
+/**
+ * Class ETagsMiddleware
+ * @package App\Http\Middleware
+ */
+final class ETagsMiddleware
+{
+
+
+    /**
+     * Handle an incoming request.
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        $response = $next($request);
+        if ($response->getStatusCode() === 200 && $request->getMethod() === 'GET')
+        {
+            $etag = md5($response->getContent());
+            $requestETag = str_replace('"', '', $request->getETags());
+            $requestETag = str_replace('-gzip', '', $requestETag);
+
+            if ($requestETag && $requestETag[0] == $etag)
+            {
+                Log::debug('ETAG 304');
+                $response->setNotModified();
+            }
+            $response->setEtag($etag);
+        }
+
+        return $response;
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
new file mode 100644
index 00000000..d01d0f76
--- /dev/null
+++ b/app/Http/Middleware/EncryptCookies.php
@@ -0,0 +1,19 @@
+<?php namespace App\Http\Middleware;
+
+use Illuminate\Cookie\Middleware\EncryptCookies as BaseEncrypter;
+
+/***
+ * Class EncryptCookies
+ * @package App\Http\Middleware
+ */
+class EncryptCookies extends BaseEncrypter
+{
+    /**
+     * The names of the cookies that should not be encrypted.
+     *
+     * @var array
+     */
+    protected $except = [
+        //
+    ];
+}
diff --git a/app/filters/OAuth2RequestAccessTokenValidator.php b/app/Http/Middleware/OAuth2BearerAccessTokenRequestValidator.php
similarity index 52%
rename from app/filters/OAuth2RequestAccessTokenValidator.php
rename to app/Http/Middleware/OAuth2BearerAccessTokenRequestValidator.php
index 38fff835..60ee6c1b 100644
--- a/app/filters/OAuth2RequestAccessTokenValidator.php
+++ b/app/Http/Middleware/OAuth2BearerAccessTokenRequestValidator.php
@@ -1,63 +1,75 @@
-<?php
-
-use oauth2\services\IApiEndpointService;
-use oauth2\services\ITokenService;
-use oauth2\BearerAccessTokenAuthorizationHeaderParser;
-use oauth2\OAuth2Protocol;
-use oauth2\responses\OAuth2WWWAuthenticateErrorResponse;
-use utils\services\ILogService;
-use oauth2\exceptions\OAuth2ResourceServerException;
-use oauth2\exceptions\InvalidGrantTypeException;
-use oauth2\exceptions\ExpiredAccessTokenException;
-use utils\services\ICheckPointService;
-use oauth2\IResourceServerContext;
-use oauth2\services\IClientService;
-use oauth2\models\IClient;
-use utils\http\HttpContentType;
-use oauth2\exceptions\RevokedAccessTokenException;
+<?php namespace App\Http\Middleware;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Closure;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Response;
+use OAuth2\BearerAccessTokenAuthorizationHeaderParser;
+use OAuth2\Exceptions\ExpiredAccessTokenException;
+use OAuth2\Exceptions\InvalidGrantTypeException;
+use OAuth2\Exceptions\RevokedAccessTokenException;
+use OAuth2\Models\IClient;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Exceptions\OAuth2ResourceServerException;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Responses\OAuth2WWWAuthenticateErrorResponse;
+use OAuth2\Services\ITokenService;
+use OAuth2\IResourceServerContext;
+use OAuth2\Repositories\IApiEndpointRepository;
+use OAuth2\Services\IClientService;
+use URL\Normalizer;
+use Illuminate\Support\Facades\Route;
+use Exception;
+use Utils\Services\ICheckPointService;
+use Utils\Services\ILogService;
 
 /**
  * Class OAuth2BearerAccessTokenRequestValidator
  * this class implements the logic to Accessing to Protected Resources
- * http://tools.ietf.org/html/rfc6750
- * http://tools.ietf.org/html/rfc6749#section-7
+ * @see http://tools.ietf.org/html/rfc6750
+ * @see http://tools.ietf.org/html/rfc6749#section-7
+ * @package App\Http\Middleware
  */
-final class OAuth2BearerAccessTokenRequestValidator {
-
-    protected function getHeaders()
-    {
-        $headers = array();
-
-        if (function_exists('getallheaders')) {
-            // @codeCoverageIgnoreStart
-            foreach(getallheaders() as $name => $value){
-                $headers[strtolower($name)] = $value;
-            }
-        } else {
-            // @codeCoverageIgnoreEnd
-            foreach ($_SERVER  as $name => $value) {
-                if (substr($name, 0, 5) == 'HTTP_') {
-                    $name = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))));
-                    $headers[strtolower($name)] = $value;
-                }
-            }
-
-            foreach(Request::header() as $name => $value){
-                if(!array_key_exists($name,$headers))
-                    $headers[strtolower($name)] = $value[0];
-            }
-        }
-        return $headers;
-    }
+final class OAuth2BearerAccessTokenRequestValidator
+{
 
     /**
-     * @var IApiEndpointService
+     * @var IResourceServerContext
      */
-    private $api_endpoint_service;
+    private $context;
+
+    /**
+     * @var array
+     */
+    private $headers;
+
+    /**
+     * @var IApiEndpointRepository
+     */
+    private $endpoint_repository;
+
     /**
      * @var ITokenService
      */
     private $token_service;
+
+    /**
+     * @var IClientRepository
+     */
+    private $client_repository;
+
     /**
      * @var ILogService
      */
@@ -66,124 +78,111 @@ final class OAuth2BearerAccessTokenRequestValidator {
      * @var ICheckPointService
      */
     private $checkpoint_service;
-    /**
-     * @var IResourceServerContext
-     */
-    private $resource_server_context;
-    /**
-     * @var array
-     */
-    private $headers;
-    /**
-     * @var IClientService
-     */
-    private $client_service;
 
     /**
-     * @param IResourceServerContext $resource_server_context
-     * @param IApiEndpointService $api_endpoint_service
+     * OAuth2BearerAccessTokenRequestValidator constructor.
+     * @param IResourceServerContext $context
+     * @param IApiEndpointRepository $endpoint_repository
      * @param ITokenService $token_service
+     * @param IClientRepository $client_repository
      * @param ILogService $log_service
      * @param ICheckPointService $checkpoint_service
-     * @param IClientService $client_service
      */
-    public function __construct
-    (
-        IResourceServerContext $resource_server_context,
-        IApiEndpointService $api_endpoint_service,
+    public function __construct(
+        IResourceServerContext $context,
+        IApiEndpointRepository $endpoint_repository,
         ITokenService $token_service,
+        IClientRepository $client_repository,
         ILogService $log_service,
-        ICheckPointService $checkpoint_service,
-        IClientService $client_service
-    )
-    {
-        $this->api_endpoint_service    = $api_endpoint_service;
-        $this->token_service           = $token_service;
-        $this->log_service             = $log_service;
-        $this->checkpoint_service      = $checkpoint_service;
-        $this->resource_server_context = $resource_server_context;
-        $this->headers                 = $this->getHeaders();
-        $this->client_service          = $client_service;
+        ICheckPointService $checkpoint_service
+    ) {
+        $this->context             = $context;
+        $this->headers             = $this->getHeaders();
+        $this->endpoint_repository = $endpoint_repository;
+        $this->token_service       = $token_service;
+        $this->client_repository   = $client_repository;
+        $this->log_service         = $log_service;
+        $this->checkpoint_service  = $checkpoint_service;
     }
 
     /**
-     * @param $route
-     * @param $request
+     * @param \Illuminate\Http\Request $request
+     * @param Closure $next
+     * @return OAuth2WWWAuthenticateErrorResponse
      */
-    public function filter($route, $request)
+    public function handle($request, Closure $next)
     {
-        $url       = $route->getPath();
+        $url    = $request->getRequestUri();
+        $method = $request->getMethod();
+        $realm  = $request->getHost();
 
-        if(strpos($url, '/') != 0)
-        {
-            $url =   '/'.$url;
-        }
-        $method    = $request->getMethod();
-        $realm     = $request->getHost();
-        // http://tools.ietf.org/id/draft-abarth-origin-03.html
-        $origin    = $request->headers->has('Origin') ? $request->headers->get('Origin') : null;
+        try {
+            $route_path  = Route::getCurrentRoute()->getPath();
+            if (strpos($route_path, '/') != 0)
+                $route_path = '/' . $route_path;
 
-        try
-        {
-            $endpoint  = $this->api_endpoint_service->getApiEndpointByUrlAndMethod($url, $method);
-
-            //api endpoint must be registered on db and active
-            if(is_null($endpoint) || !$endpoint->isActive())
-            {
-                throw new OAuth2ResourceServerException
-                (
+            if (!$route_path) {
+                throw new OAuth2ResourceServerException(
                     400,
                     OAuth2Protocol::OAuth2Protocol_Error_InvalidRequest,
-                    sprintf
-                    (
-                        'API endpoint does not exits! (%s:%s)',
-                        $url,
-                        $method
-                    )
+                    sprintf('API endpoint does not exits! (%s:%s)', $url, $method)
                 );
             }
 
-            //check first http basic auth header
-            $auth_header = isset($this->headers['authorization'])?$this->headers['authorization']:null;
+            Log::debug($request->headers->__toString());
+            // http://tools.ietf.org/id/draft-abarth-origin-03.html
+            $origin = $request->headers->has('Origin') ? $request->headers->get('Origin') : null;
+            if (!empty($origin)) {
+                $nm     = new Normalizer($origin);
+                $origin = $nm->normalize();
+            }
 
-            if(!is_null($auth_header) && !empty($auth_header))
+            //check first http basic auth header
+            $auth_header = isset($this->headers['authorization']) ? $this->headers['authorization'] : null;
+            if (!is_null($auth_header) && !empty($auth_header)) {
                 $access_token_value = BearerAccessTokenAuthorizationHeaderParser::getInstance()->parse($auth_header);
-            else
-            {
+            } else {
                 // http://tools.ietf.org/html/rfc6750#section-2- 2
                 // if access token is not on authorization header check on POST/GET params
                 $access_token_value = Input::get(OAuth2Protocol::OAuth2Protocol_AccessToken, '');
             }
 
-            if(is_null($access_token_value) || empty($access_token_value))
-            {
+            if (is_null($access_token_value) || empty($access_token_value)) {
                 //if access token value is not set, then error
-                throw new OAuth2ResourceServerException
-                (
+                throw new OAuth2ResourceServerException(
                     400,
                     OAuth2Protocol::OAuth2Protocol_Error_InvalidRequest,
                     'missing access token'
                 );
             }
 
-            // get access token from service
-            $access_token = $this->token_service->getAccessToken($access_token_value);
-            if(is_null($access_token))
-                throw new ExpiredAccessTokenException(sprintf('Access token %s is expired!', $access_token_value));
-            //check token audience
-            $audience = explode(' ', $access_token->getAudience());
+            $endpoint = $this->endpoint_repository->getApiEndpointByUrlAndMethod($route_path, $method);
 
-            if((!in_array($realm , $audience)))
-                throw new OAuth2ResourceServerException
-                (
-                    401,
-                    OAuth2Protocol::OAuth2Protocol_Error_InvalidToken,
-                    sprintf('access token audience does not match - current_realm %s - access token audience %s',$realm, $access_token->getAudience())
+            //api endpoint must be registered on db and active
+            if (is_null($endpoint) || !$endpoint->isActive()) {
+                throw new OAuth2ResourceServerException(
+                    400,
+                    OAuth2Protocol::OAuth2Protocol_Error_InvalidRequest,
+                    sprintf('API endpoint does not exits! (%s:%s)', $route_path, $method)
                 );
+            }
+
+            $access_token = $this->token_service->getAccessToken($access_token_value);
+            //check lifetime
+            if (is_null($access_token)) {
+                throw new InvalidGrantTypeException(OAuth2Protocol::OAuth2Protocol_Error_InvalidToken);
+            }
+            Log::debug(sprintf("token lifetime %s", $access_token->getRemainingLifetime()));
+            //check token audience
+            Log::debug('checking token audience ...');
+            $audience = explode(' ', $access_token->getAudience());
+            if ((!in_array($realm, $audience))) {
+                throw new InvalidGrantTypeException(OAuth2Protocol::OAuth2Protocol_Error_InvalidToken);
+            }
 
             //check client existence
             $client_id = $access_token->getClientId();
-            $client    = $this->client_service->getClientById($client_id);
+            $client    = $this->client_repository->getClientById($client_id);
 
             if(is_null($client))
                 throw new OAuth2ResourceServerException
@@ -192,7 +191,6 @@ final class OAuth2BearerAccessTokenRequestValidator {
                     OAuth2Protocol::OAuth2Protocol_Error_InvalidRequest,
                     'invalid client'
                 );
-
             //if js client , then check if the origin is allowed ....
             if($client->getApplicationType() == IClient::ApplicationType_JS_Client)
             {
@@ -205,49 +203,51 @@ final class OAuth2BearerAccessTokenRequestValidator {
                     );
             }
             //check scopes
-            $endpoint_scopes = explode(' ',$endpoint->getScope());
-            $token_scopes    = explode(' ',$access_token->getScope());
+            Log::debug('checking token scopes ...');
+            $endpoint_scopes = explode(' ', $endpoint->getScope());
+            $token_scopes    = explode(' ', $access_token->getScope());
 
             //check token available scopes vs. endpoint scopes
-            if (count(array_intersect($endpoint_scopes, $token_scopes)) == 0)
-            {
-                $this->log_service->error_msg
-                (
-                    sprintf
-                    (
+            if (count(array_intersect($endpoint_scopes, $token_scopes)) == 0) {
+                Log::warning(
+                    sprintf(
                         'access token scopes (%s) does not allow to access to api url %s , needed scopes %s',
                         $access_token->getScope(),
                         $url,
-                        implode(' OR ',$endpoint_scopes)
+                        implode(' OR ', $endpoint_scopes)
                     )
                 );
 
-                throw new OAuth2ResourceServerException
-                (
+                throw new OAuth2ResourceServerException(
                     403,
                     OAuth2Protocol::OAuth2Protocol_Error_InsufficientScope,
                     'the request requires higher privileges than provided by the access token',
-                    implode(' ',$endpoint_scopes)
+                    implode(' ', $endpoint_scopes)
                 );
             }
-
+            Log::debug('setting resource server context ...');
+            //set context for api and continue processing
             $context = array
             (
-                'access_token' => $access_token_value,
-                'expires_in'   => $access_token->getRemainingLifetime(),
-                'client_id'    => $client_id,
-                'scope'        => $access_token->getScope()
+                'access_token'     => $access_token_value,
+                'expires_in'       => $access_token->getRemainingLifetime(),
+                'client_id'        => $client_id,
+                'scope'            => $access_token->getScope(),
+                'application_type' => $client->getApplicationType()
             );
 
-            if(!is_null($access_token->getUserId()))
-                $context['user_id'] = $access_token->getUserId();
+            if (!is_null($access_token->getUserId()))
+            {
+                $context['user_id']          = $access_token->getUserId();
+                //$context['user_external_id'] = $access_token->getUserExternalId();
+            }
 
-            $this->resource_server_context->setAuthorizationContext($context);
+            $this->context->setAuthorizationContext($context);
 
         }
         catch(OAuth2ResourceServerException $ex1)
         {
-            $this->log_service->error($ex1);
+            $this->log_service->warning($ex1);
             $this->checkpoint_service->trackException($ex1);
             $response = new OAuth2WWWAuthenticateErrorResponse($realm,
                 $ex1->getError(),
@@ -261,7 +261,7 @@ final class OAuth2BearerAccessTokenRequestValidator {
         }
         catch(InvalidGrantTypeException $ex2)
         {
-            $this->log_service->error($ex2);
+            $this->log_service->warning($ex2);
             $this->checkpoint_service->trackException($ex2);
             $response = new OAuth2WWWAuthenticateErrorResponse($realm,
                 OAuth2Protocol::OAuth2Protocol_Error_InvalidToken,
@@ -275,7 +275,7 @@ final class OAuth2BearerAccessTokenRequestValidator {
         }
         catch(ExpiredAccessTokenException $ex3)
         {
-            $this->log_service->error($ex3);
+            $this->log_service->warning($ex3);
             $this->checkpoint_service->trackException($ex3);
             $response = new OAuth2WWWAuthenticateErrorResponse($realm,
                 OAuth2Protocol::OAuth2Protocol_Error_InvalidToken,
@@ -289,7 +289,7 @@ final class OAuth2BearerAccessTokenRequestValidator {
         }
         catch(RevokedAccessTokenException $ex4)
         {
-            $this->log_service->error($ex4);
+            $this->log_service->warning($ex4);
             $this->checkpoint_service->trackException($ex4);
             $response = new OAuth2WWWAuthenticateErrorResponse($realm,
                 OAuth2Protocol::OAuth2Protocol_Error_InvalidToken,
@@ -315,5 +315,36 @@ final class OAuth2BearerAccessTokenRequestValidator {
             $http_response->header('WWW-Authenticate',$response->getWWWAuthenticateHeaderValue());
             return $http_response;
         }
+        $response = $next($request);
+
+        return $response;
+    }
+
+    /**
+     * @return array
+     */
+    protected function getHeaders()
+    {
+        $headers = array();
+        if (function_exists('getallheaders')) {
+            foreach (getallheaders() as $name => $value) {
+                $headers[strtolower($name)] = $value;
+            }
+        } else {
+            // @codeCoverageIgnoreEnd
+            foreach ($_SERVER as $name => $value) {
+                if (substr($name, 0, 5) == 'HTTP_') {
+                    $name = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))));
+                    $headers[strtolower($name)] = $value;
+                }
+            }
+            foreach (Request::header() as $name => $value) {
+                if (!array_key_exists($name, $headers)) {
+                    $headers[strtolower($name)] = $value[0];
+                }
+            }
+        }
+
+        return $headers;
     }
 }
\ No newline at end of file
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
new file mode 100644
index 00000000..1b129f19
--- /dev/null
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -0,0 +1,40 @@
+<?php namespace App\Http\Middleware;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Closure;
+use Illuminate\Support\Facades\Auth;
+
+/**
+ * Class RedirectIfAuthenticated
+ * @package App\Http\Middleware
+ */
+class RedirectIfAuthenticated
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @param  string|null  $guard
+     * @return mixed
+     */
+    public function handle($request, Closure $next, $guard = null)
+    {
+        if (Auth::guard($guard)->check()) {
+            return redirect('/');
+        }
+
+        return $next($request);
+    }
+}
diff --git a/app/Http/Middleware/SSLMiddleware.php b/app/Http/Middleware/SSLMiddleware.php
new file mode 100644
index 00000000..d8513aa8
--- /dev/null
+++ b/app/Http/Middleware/SSLMiddleware.php
@@ -0,0 +1,33 @@
+<?php namespace App\Http\Middleware;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Closure;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Request;
+
+/**
+ * Class SSLMiddleware
+ * @package App\Http\Middleware
+ */
+final class SSLMiddleware
+{
+    public function handle($request, Closure $next)
+    {
+        if (!Request::secure() && Config::get("server.ssl_enabled", false)) {
+            return Redirect::secure(Request::getRequestUri());
+        }
+        return $next($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Middleware/SecurityHTTPHeadersWriterMiddleware.php b/app/Http/Middleware/SecurityHTTPHeadersWriterMiddleware.php
new file mode 100644
index 00000000..39aa0e37
--- /dev/null
+++ b/app/Http/Middleware/SecurityHTTPHeadersWriterMiddleware.php
@@ -0,0 +1,44 @@
+<?php namespace App\Http\Middleware;
+/**
+* Copyright 2015 OpenStack Foundation
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+**/
+
+use Closure;
+
+/**
+* Class SecurityHTTPHeadersWriterMiddleware
+* https://www.owasp.org/index.php/List_of_useful_HTTP_headers
+*
+* @package App\Http\Middleware
+*/
+class SecurityHTTPHeadersWriterMiddleware
+{
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request $request
+	 * @param  \Closure $next
+	 * @return \Illuminate\Http\Response
+	 */
+	public function handle($request, Closure $next)
+	{
+		$response = $next($request);
+		// https://www.owasp.org/index.php/List_of_useful_HTTP_headers
+		$response->headers->set('X-content-type-options','nosniff');
+		$response->headers->set('X-xss-protection','1; mode=block');
+		//cache
+		$response->headers->set('pragma','no-cache');
+		$response->headers->set('Expires','-1');
+		$response->headers->set('cache-control','no-store, must-revalidate, no-cache');
+		return $response;
+	}
+}
\ No newline at end of file
diff --git a/app/Http/Middleware/SingleAccessPoint.php b/app/Http/Middleware/SingleAccessPoint.php
new file mode 100644
index 00000000..5228d9c3
--- /dev/null
+++ b/app/Http/Middleware/SingleAccessPoint.php
@@ -0,0 +1,46 @@
+<?php namespace App\Http\Middleware;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Closure;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\Log;
+use Utils\Services\ICheckPointService;
+use Utils\Services\ServiceLocator;
+use Utils\Services\UtilsServiceCatalog;
+
+/**
+ * Class SingleAccessPoint
+ * @package App\Http\Middleware
+ */
+final class SingleAccessPoint
+{
+    public function handle($request, Closure $next)
+    {
+        // Perform action
+        if(Config::get('server.Banning_Enable', true))
+        {
+            try {
+                //checkpoint security pattern entry point
+                $checkpoint_service = ServiceLocator::getInstance()->getService(UtilsServiceCatalog::CheckPointService);
+                if ($checkpoint_service instanceof ICheckPointService && !$checkpoint_service->check()) {
+                    return Response::view('errors.404', array(), 404);
+                }
+            } catch (Exception $ex) {
+                Log::error($ex);
+                return Response::view('errors.404', array(), 404);
+            }
+        }
+        return $next($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
new file mode 100644
index 00000000..a2c35414
--- /dev/null
+++ b/app/Http/Middleware/VerifyCsrfToken.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
+
+class VerifyCsrfToken extends BaseVerifier
+{
+    /**
+     * The URIs that should be excluded from CSRF verification.
+     *
+     * @var array
+     */
+    protected $except = [
+        //
+    ];
+}
diff --git a/app/services/oauth2/CORS/cors_server_flowchart.png b/app/Http/Middleware/cors_server_flowchart.png
similarity index 100%
rename from app/services/oauth2/CORS/cors_server_flowchart.png
rename to app/Http/Middleware/cors_server_flowchart.png
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
new file mode 100644
index 00000000..76b2ffd4
--- /dev/null
+++ b/app/Http/Requests/Request.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+abstract class Request extends FormRequest
+{
+    //
+}
diff --git a/app/Http/routes.php b/app/Http/routes.php
new file mode 100644
index 00000000..ff3c0fe0
--- /dev/null
+++ b/app/Http/routes.php
@@ -0,0 +1,255 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Application Routes
+|--------------------------------------------------------------------------
+|
+| Here is where you can register all of the routes for an application.
+| It's a breeze. Simply tell Laravel the URIs it should respond to
+| and give it the Closure to execute when that URI is requested.
+|
+*/
+
+Route::pattern('id', '[0-9]+');
+Route::pattern('uri_id', '[0-9]+');
+Route::pattern('active', '(true|false)');
+Route::pattern('hint', '(access-token|refresh-token)');
+Route::pattern('scope_id', '[0-9]+');
+
+Route::group(['namespace' => 'App\Http\Controllers', 'middleware' => 'web' ], function() {
+
+    // openid endpoints
+    Route::group(array('middleware' => ['ssl']), function () {
+
+        Route::get('/', "HomeController@index");
+
+        // OpenId endpoints
+
+        Route::group(['namespace' => 'OpenId' ], function() {
+
+            Route::get('/discovery', "DiscoveryController@idp");
+            Route::get("/discovery/users/{identifier}","DiscoveryController@user")->where(array('identifier' => '[\d\w\.\#]+'));
+            //op endpoint url
+            Route::post('/accounts/openid2', 'OpenIdProviderController@endpoint');
+            Route::get('/accounts/openid2', 'OpenIdProviderController@endpoint');
+        });
+
+        /*
+        * If the Claimed Identifier was not previously discovered by the Relying Party
+        * (the "openid.identity" in the request was "http://specs.openid.net/auth/2.0/identifier_select"
+        * or a different Identifier, or if the OP is sending an unsolicited positive assertion),
+        * the Relying Party MUST perform discovery on the Claimed Identifier in
+        * the response to make sure that the OP is authorized to make assertions about the Claimed Identifier.
+        */
+        Route::get("/{identifier}", "UserController@getIdentity");
+        //user interaction
+        Route::get('/accounts/user/login', "UserController@getLogin");
+        Route::post('/accounts/user/login', ['middleware' => 'csrf', 'uses' => 'UserController@postLogin']);
+        Route::get('/accounts/user/login/cancel', "UserController@cancelLogin");
+    });
+
+    //oauth2 endpoints
+
+    Route::group(['namespace'=> 'OAuth2', 'middleware' => ['ssl']], function () {
+        Route::get('/.well-known/openid-configuration', "OAuth2ProviderController@discovery");
+    });
+
+    Route::group(['namespace' => 'OAuth2' , 'prefix' => 'oauth2', 'middleware' => ['ssl']], function () {
+        Route::get('/check-session', "OAuth2ProviderController@checkSessionIFrame");
+        Route::get('/end-session', "OAuth2ProviderController@endSession");
+        Route::get('/end-session/cancel', "OAuth2ProviderController@cancelLogout");
+        Route::post('/end-session', "OAuth2ProviderController@endSession");
+
+        //authorization endpoint
+        Route::any('/auth', "OAuth2ProviderController@auth");
+        // OIDC
+        // certificates
+        Route::get('/certs', "OAuth2ProviderController@certs");
+        // discovery document
+        Route::get('/.well-known/openid-configuration', "OAuth2ProviderController@discovery");
+        //token endpoint
+        Route::group(array('prefix' => 'token'), function () {
+            Route::post('/', "OAuth2ProviderController@token");
+            Route::post('/revoke', "OAuth2ProviderController@revoke");
+            Route::post('/introspection', "OAuth2ProviderController@introspection");
+        });
+    });
+
+    Route::group(array('middleware' => ['ssl', 'auth']), function () {
+        Route::get('/accounts/user/consent', "UserController@getConsent");
+        Route::post('/accounts/user/consent', ['middleware' => 'csrf', 'uses' => 'UserController@postConsent']);
+        Route::any("/accounts/user/logout", "UserController@logout");
+        Route::any("/accounts/user/profile", "UserController@getProfile");
+        Route::any("/accounts/user/profile/trusted_site/delete/{id}", "UserController@deleteTrustedSite");
+        Route::post('/accounts/user/profile/update', 'UserController@postUserProfileOptions');
+    });
+
+    Route::group(['prefix' => 'admin', 'middleware' => ['ssl', 'auth']], function () {
+        //client admin UI
+        Route::get('clients/edit/{id}', ['middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'AdminController@editRegisteredClient']);
+        Route::get('clients', 'AdminController@listOAuth2Clients');
+        Route::get('/grants', 'AdminController@editIssuedGrants');
+
+        //oauth2 server admin UI
+        Route::group(array('middleware' => ['oauth2.currentuser.serveradmin']), function () {
+            Route::get('/api-scope-groups', 'AdminController@listApiScopeGroups');
+            Route::get('/api-scope-groups/{id}', 'AdminController@editApiScopeGroup');
+            Route::get('/resource-servers', 'AdminController@listResourceServers');
+            Route::get('/resource-server/{id}', 'AdminController@editResourceServer');
+            Route::get('/api/{id}', 'AdminController@editApi');
+            Route::get('/scope/{id}', 'AdminController@editScope');
+            Route::get('/endpoint/{id}', 'AdminController@editEndpoint');
+            Route::get('/locked-clients', 'AdminController@listLockedClients');
+            // server private keys
+            Route::get('/private-keys', 'AdminController@listServerPrivateKeys');
+        });
+
+        Route::group(array('middleware' => ['openstackid.currentuser.serveradmin']), function () {
+            Route::get('/locked-users', 'AdminController@listLockedUsers');
+            Route::get('/server-config', 'AdminController@listServerConfig');
+            Route::post('/server-config', 'AdminController@saveServerConfig');
+            Route::get('/banned-ips', 'AdminController@listBannedIPs');
+        });
+    });
+
+    //Admin Backend API
+
+    Route::group([
+        'namespace'  =>  'Api',
+        'prefix'     => 'admin/api/v1',
+        'middleware' => ['ssl', 'auth']], function () {
+
+        Route::group(array('prefix' => 'users'), function () {
+            Route::delete('/{id}/locked', array('middleware' => ['openstackid.currentuser.serveradmin.json'], 'uses' => 'UserApiController@unlock'));
+            Route::delete('/{id}/token/{value}', array('middleware' => ['currentuser.checkroute'], 'uses' => 'UserApiController@revokeToken'));
+            Route::get('/fetch', array('uses' => "UserApiController@fetch"));
+        });
+
+        Route::group(array('prefix' => 'banned-ips', 'middleware' => ['openstackid.currentuser.serveradmin.json']), function () {
+            Route::get('/{id}', "ApiBannedIPController@get");
+            Route::get('/', "ApiBannedIPController@getByPage");
+            Route::delete('/{id?}', "ApiBannedIPController@delete");
+        });
+
+        //client api
+        Route::group(array('prefix' => 'clients'), function () {
+
+            // public keys
+            Route::post('/{id}/public_keys', array('middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'ClientPublicKeyApiController@create'));
+            Route::get('/{id}/public_keys', array('middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'ClientPublicKeyApiController@getByPage'));
+            Route::delete('/{id}/public_keys/{public_key_id}', array('middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'ClientPublicKeyApiController@delete'));
+            Route::put('/{id}/public_keys/{public_key_id}', array('middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'ClientPublicKeyApiController@update'));
+
+            Route::post('/', array('middleware' => ['currentuser.checkroute'], 'uses' => 'ClientApiController@create'));
+            Route::put('/', array('middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'ClientApiController@update'));
+            Route::get('/{id}', "ClientApiController@get");
+            Route::get('/', array('middleware' => ['currentuser.checkroute'], 'uses' => 'ClientApiController@getByPage'));
+            Route::delete('/{id}', array('middleware' => ['oauth2.currentuser.owns.client'], 'uses' => 'ClientApiController@delete'));
+            //allowed redirect uris endpoints
+            Route::get('/{id}/uris', array('middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'ClientApiController@getRegisteredUris'));
+            Route::post('/{id}/uris', array('middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'ClientApiController@addAllowedRedirectUri'));
+            Route::delete('/{id}/uris/{uri_id}', array('middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'ClientApiController@deleteClientAllowedUri'));
+
+            //allowedApiResourceServerControllert('/{id}/origins', array('middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'ClientApiController@geAllowedOrigins'));
+            Route::post('/{id}/origins', array('middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'ClientApiController@addAllowedOrigin'));
+            Route::delete('/{id}/origins/{origin_id}', array('middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'ClientApiController@deleteClientAllowedOrigin'));
+            Route::delete('/{id}/lock', array('middleware' => ['openstackid.currentuser.serveradmin.json'], 'uses' => 'ClientApiController@unlock'));
+            Route::put('/{id}/secret', array('middleware' => ['oauth2.currentuser.owns.client'], 'uses' => 'ClientApiController@regenerateClientSecret'));
+            Route::put('/{id}/use-refresh-token', array('middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'ClientApiController@setRefreshTokenClient'));
+            Route::put('/{id}/rotate-refresh-token', array('middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'ClientApiController@setRotateRefreshTokenPolicy'));
+            Route::get('/{id}/access-token', array('middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'ClientApiController@getAccessTokens'));
+            Route::get('/{id}/refresh-token', array('middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'ClientApiController@getRefreshTokens'));
+            Route::get('/me/access-tokens', array('middleware' => [], 'uses' => 'ClientApiController@getAccessTokensByCurrentUser'));
+            Route::get('/me/refresh-tokens', array('middleware' => [], 'uses' => 'ClientApiController@getRefreshTokensByCurrentUser'));
+            Route::delete('/{id}/token/{value}/{hint}', array('middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'ClientApiController@revokeToken'));
+            Route::put('/{id}/scopes/{scope_id}', array('middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'ClientApiController@addAllowedScope'));
+            Route::delete('/{id}/scopes/{scope_id}', array('middleware' => ['oauth2.currentuser.allow.client.edition'], 'uses' => 'ClientApiController@removeAllowedScope'));
+            Route::put('/{id}/active', array('middleware' => ['oauth2.currentuser.owns.client'], 'uses' => 'ClientApiController@activate'));
+            Route::delete('/{id}/active', array('middleware' => ['oauth2.currentuser.owns.client'], 'uses' => 'ClientApiController@deactivate'));
+
+        });
+
+        // resource servers
+        Route::group(array('prefix' => 'resource-servers', 'middleware' => ['oauth2.currentuser.serveradmin.json']), function () {
+            Route::get('/{id}', "ApiResourceServerController@get");
+            Route::get('/', "ApiResourceServerController@getByPage");
+            Route::post('/', "ApiResourceServerController@create");
+            Route::delete('/{id}', "ApiResourceServerController@delete");
+            Route::put('/', "ApiResourceServerController@update");
+            Route::put('/{id}/client-secret', "ApiResourceServerController@regenerateClientSecret");
+            Route::put('/{id}/active', "ApiResourceServerController@activate");
+            Route::delete('/{id}/active', "ApiResourceServerController@deactivate");
+        });
+
+        // api scope groups
+        Route::group(array('prefix' => 'api-scope-groups', 'middleware' => ['oauth2.currentuser.serveradmin.json']), function () {
+            Route::get('/{id}', "ApiScopeGroupController@get");
+            Route::get('/', "ApiScopeGroupController@getByPage");
+            Route::put('/', "ApiScopeGroupController@update");
+            Route::post('/', "ApiScopeGroupController@create");
+            Route::delete('/{id}', "ApiScopeGroupController@delete");
+            Route::put('/{id}/active', "ApiScopeGroupController@activate");
+            Route::delete('/{id}/active', "ApiScopeGroupController@deactivate");
+        });
+
+        // apis
+        Route::group(array('prefix' => 'apis', 'middleware' => ['oauth2.currentuser.serveradmin.json']), function () {
+            Route::get('/{id}', "ApiController@get");
+            Route::get('/', "ApiController@getByPage");
+            Route::post('/', "ApiController@create");
+            Route::delete('/{id}', "ApiController@delete");
+            Route::put('/', "ApiController@update");
+            Route::put('/{id}/active', "ApiController@activate");
+            Route::delete('/{id}/active', "ApiController@deactivate");
+        });
+
+        // scopes
+        Route::group(array('prefix' => 'scopes', 'middleware' => ['oauth2.currentuser.serveradmin.json']), function () {
+            Route::get('/{id}', "ApiScopeController@get");
+            Route::get('/', "ApiScopeController@getByPage");
+            Route::post('/', "ApiScopeController@create");
+            Route::delete('/{id}', "ApiScopeController@delete");
+            Route::put('/', "ApiScopeController@update");
+            Route::put('/{id}/active', "ApiScopeController@activate");
+            Route::delete('/{id}/active', "ApiScopeController@deactivate");
+        });
+
+        // endpoints
+        Route::group(array('prefix' => 'endpoints', 'middleware' => ['oauth2.currentuser.serveradmin.json']), function () {
+            Route::get('/{id}', "ApiEndpointController@get");
+            Route::get('/', "ApiEndpointController@getByPage");
+            Route::post('/', "ApiEndpointController@create");
+            Route::delete('/{id}', "ApiEndpointController@delete");
+            Route::put('/', "ApiEndpointController@update");
+            Route::put('/{id}/scope/{scope_id}', "ApiEndpointController@addRequiredScope");
+            Route::delete('/{id}/scope/{scope_id}', "ApiEndpointController@removeRequiredScope");
+            Route::put('/{id}/active', "ApiEndpointController@activate");
+            Route::delete('/{id}/active', "ApiEndpointController@deactivate");
+        });
+
+        // private keys
+        Route::group(array('prefix' => 'private-keys', 'middleware' => ['oauth2.currentuser.serveradmin.json']), function () {
+            Route::get('/', "ServerPrivateKeyApiController@getByPage");
+            Route::post('/', "ServerPrivateKeyApiController@create");
+            Route::delete('/{id}', "ServerPrivateKeyApiController@delete");
+            Route::put('/{id}', "ServerPrivateKeyApiController@update");
+        });
+
+    });
+});
+
+//OAuth2 Protected API
+Route::group(
+    [
+        'namespace'  => 'App\Http\Controllers\Api\OAuth2',
+        'prefix'     => 'api/v1',
+        'middleware' => ['api']
+    ], function () {
+
+    Route::group(array('prefix' => 'users'), function () {
+        Route::get('/me', 'OAuth2UserApiController@me');
+        Route::get('/info', 'OAuth2UserApiController@userInfo');
+        Route::post('/info', 'OAuth2UserApiController@userInfo');
+    });
+});
\ No newline at end of file
diff --git a/app/Jobs/Job.php b/app/Jobs/Job.php
new file mode 100644
index 00000000..55ece29a
--- /dev/null
+++ b/app/Jobs/Job.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Jobs;
+
+use Illuminate\Bus\Queueable;
+
+abstract class Job
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Queueable Jobs
+    |--------------------------------------------------------------------------
+    |
+    | This job base class provides a central location to place any logic that
+    | is shared across all of your jobs. The trait included with the class
+    | provides access to the "onQueue" and "delay" queue helper methods.
+    |
+    */
+
+    use Queueable;
+}
diff --git a/app/Listeners/.gitkeep b/app/Listeners/.gitkeep
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/app/Listeners/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/app/Listeners/QueryExecutedListener.php b/app/Listeners/QueryExecutedListener.php
new file mode 100644
index 00000000..1a68c428
--- /dev/null
+++ b/app/Listeners/QueryExecutedListener.php
@@ -0,0 +1,61 @@
+<?php namespace App\Listeners;
+
+use Illuminate\Database\Events\QueryExecuted;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Log;
+use DateTime;
+
+class QueryExecutedListener
+{
+
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  QueryExecuted  $event
+     * @return void
+     */
+    public function handle(QueryExecuted $event)
+    {
+        if(Config::get("server.db_log_enabled", false)) {
+
+            $query      = $event->sql;
+ 			$bindings   = $event->bindings;
+
+            // Format binding data for sql insertion
+            foreach ($bindings as $i => $binding) {
+                if ($binding instanceof DateTime) {
+                    $bindings[$i] = $binding->format('\'Y-m-d H:i:s\'');
+                } else {
+                    if (is_string($binding)) {
+                        $bindings[$i] = "'$binding'";
+                    }
+                }
+            }
+
+            $time       = $event->time;
+            $connection = $event->connectionName;
+            $data       = compact('bindings', 'time', 'connection');
+            // Insert bindings into query
+            $query = str_replace(array('%', '?'), array('%%', '%s'), $query);
+            $query = vsprintf($query, $bindings);
+            Log::info($query, $data);
+
+            //trace
+
+            /*$trace = '';
+            $entries = debug_backtrace();
+            unset($entries[0]);
+            foreach($entries as $entry){
+                if(!isset($entry['file']) || !isset($entry['line'])) continue;
+                $trace .= $entry['file'].' '.$entry['line'].PHP_EOL;
+            }
+            Log::debug($trace);*/
+
+        }
+    }
+}
diff --git a/app/Models/BannedIP.php b/app/Models/BannedIP.php
new file mode 100644
index 00000000..f1982423
--- /dev/null
+++ b/app/Models/BannedIP.php
@@ -0,0 +1,27 @@
+<?php namespace Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Model\BaseModelEloquent;
+/**
+ * Class BannedIP
+ * @package Models
+ */
+class BannedIP extends BaseModelEloquent
+{
+    protected $table = 'banned_ips';
+
+    public function user()
+    {
+        return $this->belongsTo('Auth\User');
+    }
+} 
\ No newline at end of file
diff --git a/app/Models/Group.php b/app/Models/Group.php
new file mode 100644
index 00000000..38663f90
--- /dev/null
+++ b/app/Models/Group.php
@@ -0,0 +1,23 @@
+<?php namespace Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Model\SilverStripeBaseModel;
+
+/**
+ * Class Group
+ * @package Models
+ */
+class Group extends SilverStripeBaseModel {
+
+    protected $table = 'Group';
+}
\ No newline at end of file
diff --git a/app/Models/IWhiteListedIPRepository.php b/app/Models/IWhiteListedIPRepository.php
new file mode 100644
index 00000000..02e27838
--- /dev/null
+++ b/app/Models/IWhiteListedIPRepository.php
@@ -0,0 +1,27 @@
+<?php namespace Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Db\IBaseRepository;
+
+/**
+ * Interface IWhiteListedIPRepository
+ * @package Models
+ */
+interface IWhiteListedIPRepository extends IBaseRepository
+{
+    /**
+     * @param string $ip
+     * @return WhiteListedIP
+     */
+    function getByIp($ip);
+}
\ No newline at end of file
diff --git a/app/models/Member.php b/app/Models/Member.php
similarity index 51%
rename from app/models/Member.php
rename to app/Models/Member.php
index 9996a9b5..b166daaa 100644
--- a/app/models/Member.php
+++ b/app/Models/Member.php
@@ -1,22 +1,36 @@
-<?php
+<?php namespace Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-use auth\AuthHelper;
-use utils\model\BaseModelEloquent;
+use Auth\AuthHelper;
+use Exception;
+use Utils\Model\SilverStripeBaseModel;
 
 /**
  * Class Member
+ * @package Models
  */
-class Member extends BaseModelEloquent
+class Member extends SilverStripeBaseModel
 {
-
-    protected $primaryKey ='ID';
     protected $table      = 'Member';
-    //external os members db (SS)
-    protected $connection = 'os_members';
-
     //no timestamps
     public $timestamps     = false;
 
+    /**
+     * @param string $password
+     * @return bool
+     * @throws Exception
+     */
     public function checkPassword($password)
     {
         $hash = AuthHelper::encrypt_password($password, $this->Salt, $this->PasswordEncryption);
@@ -26,8 +40,7 @@ class Member extends BaseModelEloquent
 
     public function groups()
     {
-
-        return $this->belongsToMany('Group', 'Group_Members', 'MemberID', 'GroupID');
+        return $this->belongsToMany('Models\Group', 'Group_Members', 'MemberID', 'GroupID');
     }
 
     /**
@@ -38,6 +51,9 @@ class Member extends BaseModelEloquent
         return $this->isEmailVerified() && $this->isActive();
     }
 
+    /**
+     * @return bool
+     */
     public function isActive(){
         $attr = $this->getAttributes();
         if(isset($attr['Active']))
diff --git a/app/Models/MemberPhoto.php b/app/Models/MemberPhoto.php
new file mode 100644
index 00000000..5d0341cd
--- /dev/null
+++ b/app/Models/MemberPhoto.php
@@ -0,0 +1,22 @@
+<?php namespace Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Model\SilverStripeBaseModel;
+/**
+ * Class MemberPhoto
+ * @package Models
+ */
+class MemberPhoto extends SilverStripeBaseModel
+{
+    protected $table = 'File';
+}
\ No newline at end of file
diff --git a/app/Models/OAuth2/AccessToken.php b/app/Models/OAuth2/AccessToken.php
new file mode 100644
index 00000000..7f6d9522
--- /dev/null
+++ b/app/Models/OAuth2/AccessToken.php
@@ -0,0 +1,144 @@
+<?php namespace Models\OAuth2;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Auth\User;
+use OAuth2\Models\IClient;
+use Utils\Model\BaseModelEloquent;
+use DateTime;
+use DateInterval;
+use DateTimeZone;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Cache;
+
+/**
+ * Class AccessToken
+ * @package Models\OAuth2
+ */
+class AccessToken extends BaseModelEloquent {
+
+    protected $fillable = array
+    (
+        'value',
+        'user_id',
+        'from_ip',
+        'associated_authorization_code',
+        'lifetime',
+        'scope',
+        'audience',
+        'created_at',
+        'updated_at',
+        'client_id',
+        'refresh_token_id'
+    );
+
+    protected $table = 'oauth2_access_token';
+
+    private $friendly_scopes;
+
+    public function refresh_token()
+    {
+        return $this->belongsTo('Models\OAuth2\RefreshToken');
+    }
+
+    /**
+     * @return RefreshToken
+     */
+    public function getRefreshToken(){
+        return Cache::remember
+        (
+            'refresh_token_'.$this->refresh_token_id,
+            Config::get("cache_regions.region_refresh_token_lifetime", 1140),
+            function() {
+                return $this->refresh_token()->first();
+            }
+        );
+    }
+
+    public function client(){
+        return $this->belongsTo('Models\OAuth2\Client');
+    }
+
+    /**
+     * @return IClient
+     */
+    public function getClient(){
+        return Cache::remember
+        (
+            'client_'.$this->client_id,
+            Config::get("cache_regions.region_clients_lifetime", 1140),
+            function() {
+                return $this->client()->first();
+            }
+        );
+    }
+
+    public function user(){
+        return $this->belongsTo('Auth\User');
+    }
+
+    /**
+     * @return User
+     */
+    public function getUser(){
+        return Cache::remember
+        (
+            'user_'.$this->user_id,
+            Config::get("cache_regions.region_users_lifetime", 1140),
+            function() {
+                return $this->user()->first();
+            }
+        );
+    }
+
+    /**
+     * @return bool
+     */
+    public function isVoid(){
+        //check lifetime...
+        $created_at = $this->created_at;
+        $created_at->add(new DateInterval('PT' . intval($this->lifetime) . 'S'));
+        $now        = new DateTime(gmdate("Y-m-d H:i:s", time()), new DateTimeZone("UTC"));
+        return ($now > $created_at);
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getFriendlyScopes(){
+        return $this->friendly_scopes;
+    }
+
+    /**
+     * @param $friendly_scopes
+     */
+    public function setFriendlyScopes($friendly_scopes){
+        $this->friendly_scopes = $friendly_scopes;
+    }
+
+    /**
+     * @return int
+     */
+    public function getRemainingLifetime()
+    {
+        //check is refresh token is stills alive... (ZERO is infinite lifetime)
+        if (intval($this->lifetime) == 0) return 0;
+        $created_at = new DateTime($this->created_at, new DateTimeZone("UTC"));
+        $created_at->add(new DateInterval('PT' . intval($this->lifetime) . 'S'));
+        $now = new DateTime(gmdate("Y-m-d H:i:s", time()), new DateTimeZone("UTC"));
+        //check validity...
+        if ($now > $created_at)
+            return -1;
+        $seconds = abs($created_at->getTimestamp() - $now->getTimestamp());;
+        return $seconds;
+    }
+} 
\ No newline at end of file
diff --git a/app/models/oauth2/Api.php b/app/Models/OAuth2/Api.php
similarity index 62%
rename from app/models/oauth2/Api.php
rename to app/Models/OAuth2/Api.php
index 1f1db51c..1335f984 100644
--- a/app/models/oauth2/Api.php
+++ b/app/Models/OAuth2/Api.php
@@ -1,8 +1,25 @@
-<?php
-
-use oauth2\models\IApi;
-use utils\model\BaseModelEloquent;
+<?php namespace Models\OAuth2;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Model\BaseModelEloquent;
+use OAuth2\Models\IApi;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Config;
 
+/**
+ * Class Api
+ * @package Models\OAuth2
+ */
 class Api extends BaseModelEloquent implements IApi
 {
 
@@ -32,17 +49,17 @@ class Api extends BaseModelEloquent implements IApi
 
     public function scopes()
     {
-        return $this->hasMany('ApiScope', 'api_id');
+        return $this->hasMany('Models\OAuth2\ApiScope', 'api_id');
     }
 
     public function resource_server()
     {
-        return $this->belongsTo('ResourceServer');
+        return $this->belongsTo('Models\OAuth2\ResourceServer');
     }
 
     public function endpoints()
     {
-        return $this->hasMany('ApiEndpoint', 'api_id');
+        return $this->hasMany('Models\OAuth2\ApiEndpoint', 'api_id');
     }
 
     /**
@@ -50,7 +67,14 @@ class Api extends BaseModelEloquent implements IApi
      */
     public function getResourceServer()
     {
-        return $this->resource_server()->first();
+        return Cache::remember
+        (
+            'resource_server_'.$this->resource_server_id,
+            Config::get("cache_regions.region_resource_server_lifetime", 60),
+            function() {
+                return $this->resource_server()->first();
+            }
+        );
     }
 
     public function getName()
@@ -64,7 +88,6 @@ class Api extends BaseModelEloquent implements IApi
         return $url;
     }
 
-
     public function getDescription()
     {
         return $this->description;
diff --git a/app/models/oauth2/ApiEndpoint.php b/app/Models/OAuth2/ApiEndpoint.php
similarity index 62%
rename from app/models/oauth2/ApiEndpoint.php
rename to app/Models/OAuth2/ApiEndpoint.php
index 782dde0a..0dbe6416 100644
--- a/app/models/oauth2/ApiEndpoint.php
+++ b/app/Models/OAuth2/ApiEndpoint.php
@@ -1,9 +1,23 @@
-<?php
-
-use oauth2\models\IApiEndpoint;
-use utils\model\BaseModelEloquent;
-
-class ApiEndpoint extends BaseModelEloquent implements IApiEndpoint{
+<?php namespace Models\OAuth2;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Model\BaseModelEloquent;
+use OAuth2\Models\IApiEndpoint;
+/**
+ * Class ApiEndpoint
+ * @package Models\OAuth2
+ */
+class ApiEndpoint extends BaseModelEloquent implements IApiEndpoint {
 
     protected $table = 'oauth2_api_endpoint';
 
@@ -27,7 +41,7 @@ class ApiEndpoint extends BaseModelEloquent implements IApiEndpoint{
 
 	public function api()
     {
-        return $this->belongsTo('Api');
+        return $this->belongsTo('Models\OAuth2\Api');
     }
 
     public function getRoute()
@@ -37,7 +51,7 @@ class ApiEndpoint extends BaseModelEloquent implements IApiEndpoint{
 
     public function scopes()
     {
-        return $this->belongsToMany('ApiScope','oauth2_api_endpoint_api_scope','api_endpoint_id','scope_id');
+        return $this->belongsToMany('Models\OAuth2\ApiScope','oauth2_api_endpoint_api_scope','api_endpoint_id','scope_id');
     }
 
     public function getHttpMethod(){
@@ -100,4 +114,13 @@ class ApiEndpoint extends BaseModelEloquent implements IApiEndpoint{
     {
         return $this->allow_cors;
     }
+
+    /**
+     * @return bool
+     */
+    public function supportCredentials()
+    {
+        // TODO: Implement supportCredentials() method.
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/app/models/oauth2/ApiScope.php b/app/Models/OAuth2/ApiScope.php
similarity index 53%
rename from app/models/oauth2/ApiScope.php
rename to app/Models/OAuth2/ApiScope.php
index 5054ef66..e9f9b574 100644
--- a/app/models/oauth2/ApiScope.php
+++ b/app/Models/OAuth2/ApiScope.php
@@ -1,17 +1,32 @@
-<?php
-
-use oauth2\models\IApiScope;
-use utils\model\BaseModelEloquent;
+<?php namespace Models\OAuth2;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\Models\IApi;
+use OAuth2\Models\IApiScope;
+use Utils\Model\BaseModelEloquent;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Cache;
 
 /**
  * Class ApiScope
+ * @package Models\OAuth2
  */
 class ApiScope extends BaseModelEloquent implements IApiScope
 {
 
     protected $table    = 'oauth2_api_scope';
-    protected $hidden   = array ('created_at', 'updated_at', 'pivot');
-    protected $fillable = array('name' ,'short_description', 'description','active','default','system', 'api_id', 'assigned_by_groups');
+    protected $hidden   = [ 'created_at', 'updated_at', 'pivot'];
+    protected $fillable = [ 'name' ,'short_description', 'description','active','default','system', 'api_id', 'assigned_by_groups'];
 
     public function getActiveAttribute(){
         return (bool) $this->attributes['active'];
@@ -71,33 +86,39 @@ class ApiScope extends BaseModelEloquent implements IApiScope
 
     public function api()
     {
-        return $this->belongsTo('Api');
+        return $this->belongsTo('Models\OAuth2\Api');
+    }
+
+    /**
+     * @return IApi
+     */
+    public function getApi(){
+        return Cache::remember
+        (
+            'api_'.$this->api_id,
+            Config::get("cache_regions.region_api_lifetime", 1140),
+            function() {
+                return $this->api()->first();
+            }
+       );
     }
 
     public function getApiName()
     {
-        $api = $this->api()->first();
+        $api = $this->getApi();
         return !is_null($api)?$api->name:'';
     }
 
     public function getApiDescription(){
-        $api = $this->api()->first();
+        $api = $this->getApi();
         return !is_null($api)? $api->description:'';
     }
 
     public function getApiLogo(){
-        $api = $this->api()->first();
+        $api = $this->getApi();
         return !is_null($api) ? $api->getLogo():asset('/assets/apis/server.png');
     }
 
-    /**
-     * @return \oauth2\models\IApi
-     */
-    public function getApi()
-    {
-        return $this->api();
-    }
-
     /**
      * @return bool
      */
diff --git a/app/models/oauth2/ApiScopeGroup.php b/app/Models/OAuth2/ApiScopeGroup.php
similarity index 77%
rename from app/models/oauth2/ApiScopeGroup.php
rename to app/Models/OAuth2/ApiScopeGroup.php
index a42eec6d..0e809d87 100644
--- a/app/models/oauth2/ApiScopeGroup.php
+++ b/app/Models/OAuth2/ApiScopeGroup.php
@@ -1,12 +1,6 @@
-<?php
-
-use oauth2\models\IApiScope;
-use oauth2\models\IOAuth2User;
-use utils\model\BaseModelEloquent;
-use utils\model\IEntity;
-
+<?php namespace Models\OAuth2;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -17,6 +11,14 @@ use utils\model\IEntity;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+use OAuth2\Models\IApiScope;
+use OAuth2\Models\IOAuth2User;
+use Utils\Model\BaseModelEloquent;
+use Utils\Model\IEntity;
+/**
+ * Class ApiScopeGroup
+ * @package Models
+ */
 class ApiScopeGroup extends BaseModelEloquent implements IEntity
 {
     protected $table = 'oauth2_api_scope_group';
@@ -25,16 +27,17 @@ class ApiScopeGroup extends BaseModelEloquent implements IEntity
 
     public function scopes()
     {
-        return $this->belongsToMany('ApiScope','oauth2_api_scope_group_scope','group_id','scope_id');
+        return $this->belongsToMany('Models\OAuth2\ApiScope','oauth2_api_scope_group_scope','group_id','scope_id');
     }
 
     public function users()
     {
-        return $this->belongsToMany('auth\User','oauth2_api_scope_group_users','group_id','user_id');
+        return $this->belongsToMany('Auth\User','oauth2_api_scope_group_users','group_id','user_id');
     }
 
     /**
      * @param IApiScope $scope
+     * @return $this
      */
     public function addScope(IApiScope $scope)
     {
@@ -44,6 +47,7 @@ class ApiScopeGroup extends BaseModelEloquent implements IEntity
 
     /**
      * @param IOAuth2User $user
+     * @return $this
      */
     public function addUser(IOAuth2User $user)
     {
@@ -53,6 +57,7 @@ class ApiScopeGroup extends BaseModelEloquent implements IEntity
 
     /**
      * @param IOAuth2User $scope
+     * @return $this
      */
     public function removeScope(IOAuth2User $scope)
     {
@@ -60,6 +65,9 @@ class ApiScopeGroup extends BaseModelEloquent implements IEntity
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function removeAllScopes()
     {
         $this->scopes()->detach();
@@ -68,6 +76,7 @@ class ApiScopeGroup extends BaseModelEloquent implements IEntity
 
     /**
      * @param IOAuth2User $user
+     * @return $this
      */
     public function removeUser(IOAuth2User $user)
     {
diff --git a/app/models/oauth2/AssymetricKey.php b/app/Models/OAuth2/AsymmetricKey.php
similarity index 86%
rename from app/models/oauth2/AssymetricKey.php
rename to app/Models/OAuth2/AsymmetricKey.php
index a31327e1..13c2330a 100644
--- a/app/models/oauth2/AssymetricKey.php
+++ b/app/Models/OAuth2/AsymmetricKey.php
@@ -1,7 +1,6 @@
-<?php
-
+<?php namespace Models\OAuth2;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,25 +11,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-use utils\model\BaseModelEloquent;
-use oauth2\models\IAssymetricKey;
+use Utils\Model\BaseModelEloquent;
+use OAuth2\Models\IAsymmetricKey;
 use jwa\cryptographic_algorithms\ICryptoAlgorithm;
 use jwa\cryptographic_algorithms\KeyManagementAlgorithms_Registry;
 use jwa\cryptographic_algorithms\DigitalSignatures_MACs_Registry;
+use DateTime;
+use Exception;
 /**
- * Class AssymetricKey
+ * Class AsymmetricKey
  */
-abstract class AssymetricKey extends BaseModelEloquent implements IAssymetricKey
+abstract class AsymmetricKey extends BaseModelEloquent implements IAsymmetricKey
 {
 
-    protected $table = 'oauth2_assymetric_keys';
+    protected $table         = 'oauth2_asymmetric_keys';
 
     protected $stiClassField = 'class_name';
 
-    protected $stiBaseClass = 'AssymetricKey';
+    protected $stiBaseClass  = \Models\OAuth2\AsymmetricKey::class;
 
-    protected $fillable = array(
+    protected $fillable = array
+    (
         'kid',
         'pem_content',
         'active',
@@ -140,12 +141,12 @@ abstract class AssymetricKey extends BaseModelEloquent implements IAssymetricKey
     }
 
     /**
-     * checks validatiry range with now
+     * checks validity range with now
      * @return bool
      */
     public function isExpired()
     {
-        $now = new \DateTime();
+        $now = new DateTime();
         return ( $this->valid_from <= $now && $this->valid_to >= $now);
     }
 
diff --git a/app/models/oauth2/Client.php b/app/Models/OAuth2/Client.php
similarity index 82%
rename from app/models/oauth2/Client.php
rename to app/Models/OAuth2/Client.php
index 5480712e..c1bd9baa 100644
--- a/app/models/oauth2/Client.php
+++ b/app/Models/OAuth2/Client.php
@@ -1,20 +1,37 @@
-<?php
-
+<?php namespace Models\OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 use jwa\cryptographic_algorithms\ContentEncryptionAlgorithms_Registry;
 use jwa\cryptographic_algorithms\DigitalSignatures_MACs_Registry;
 use jwa\cryptographic_algorithms\KeyManagementAlgorithms_Registry;
-use oauth2\models\IClient;
-use oauth2\models\IClientPublicKey;
-use oauth2\models\JWTResponseInfo;
-use oauth2\models\TokenEndpointAuthInfo;
-use utils\model\BaseModelEloquent;
-use oauth2\models\IApiScope;
+use OAuth2\Models\IClient;
+use OAuth2\Models\IClientPublicKey;
+use OAuth2\Models\JWTResponseInfo;
+use OAuth2\Models\TokenEndpointAuthInfo;
+use Utils\Model\BaseModelEloquent;
+use OAuth2\Models\IApiScope;
+use Exception;
+use DateTime;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Config;
 /**
  * Class Client
+ * @package Models
  */
 class Client extends BaseModelEloquent implements IClient
 {
 
+
     protected $fillable = array
     (
         'app_name',
@@ -101,7 +118,7 @@ class Client extends BaseModelEloquent implements IClient
      */
     public function public_keys()
     {
-        return $this->hasMany('ClientPublicKey','oauth2_client_id','id');
+        return $this->hasMany('Models\OAuth2\ClientPublicKey','oauth2_client_id','id');
     }
 
     /**
@@ -109,7 +126,7 @@ class Client extends BaseModelEloquent implements IClient
      */
     public function admin_users()
     {
-        return $this->belongsToMany('auth\User','oauth2_client_admin_users','oauth2_client_id','user_id');
+        return $this->belongsToMany('Auth\User','oauth2_client_admin_users','oauth2_client_id','user_id');
     }
 
     /**
@@ -140,32 +157,32 @@ class Client extends BaseModelEloquent implements IClient
 
     public function access_tokens()
     {
-        return $this->hasMany('AccessToken');
+        return $this->hasMany('Models\OAuth2\AccessToken');
     }
 
     public function refresh_tokens()
     {
-        return $this->hasMany('RefreshToken');
+        return $this->hasMany('Models\OAuth2\RefreshToken');
     }
 
     public function user()
     {
-        return $this->belongsTo('auth\User');
+        return $this->belongsTo('Auth\User');
     }
 
     public function edited_by()
     {
-        return $this->belongsTo('auth\User','edited_by_id');
+        return $this->belongsTo('Auth\User','edited_by_id');
     }
 
     public function resource_server()
     {
-        return $this->belongsTo('ResourceServer');
+        return $this->belongsTo('Models\OAuth2\ResourceServer');
     }
 
     public function scopes()
     {
-        return $this->belongsToMany('ApiScope','oauth2_client_api_scope','client_id','scope_id');
+        return $this->belongsToMany('Models\OAuth2\ApiScope','oauth2_client_api_scope','client_id','scope_id');
     }
 
     /**
@@ -219,13 +236,14 @@ class Client extends BaseModelEloquent implements IClient
 
     public function isScopeAllowed($scope)
     {
-        $res = true;
+        $res            = true;
         $desired_scopes = explode(" ",$scope);
         foreach($desired_scopes as $desired_scope){
             //check if desired scope belongs to application given scopes
-            $db_scope        = $this->scopes()->where('name', '=', $desired_scope)->where('active', '=', true)->first();
-            $api             = !is_null($db_scope)?$db_scope->api()->first():null;
-            $resource_server = !is_null($api) ? $api->resource_server()->first():null;
+            $db_scope        = $this->getActiveScope($desired_scope);
+            $api             = !is_null($db_scope) ? $db_scope->getApi()       : null;
+            $resource_server = !is_null($api)      ? $api->getResourceServer() : null;
+
             if(is_null($db_scope) ||(!is_null($api) && !$api->active) || (!is_null($resource_server) && !$resource_server->active)){
                 $res = false;
                 break;
@@ -234,6 +252,21 @@ class Client extends BaseModelEloquent implements IClient
         return $res;
     }
 
+    /**
+     * @param string $name
+     * @return IApiScope
+     */
+    public function getActiveScope($name){
+        return Cache::remember
+        (
+            'api_scope_'.$this->id.'_'.$name,
+            Config::get("cache_regions.region_api_scope_lifetime", 1140),
+            function() use($name){
+                return $this->scopes()->where('name', '=', $name)->where('active', '=', true)->first();
+            }
+        );
+    }
+
     public function isUriAllowed($uri)
     {
         if(!filter_var($uri, FILTER_VALIDATE_URL)) return false;
@@ -314,7 +347,13 @@ class Client extends BaseModelEloquent implements IClient
 
     public function getResourceServer()
     {
-        return $this->resource_server()->first();
+        return Cache::remember
+        (
+            'resource_server_'.$this->resource_server_id,
+            Config::get("cache_regions.region_resource_server_lifetime", 60),
+            function() {
+                 return $this->resource_server()->first();
+        });
     }
 
     public function getApplicationType()
@@ -382,16 +421,16 @@ class Client extends BaseModelEloquent implements IClient
     }
 
     /**
-     * @return \DateTime
+     * @return DateTime
      */
     public function getClientSecretExpiration()
     {
         $exp_date = $this->client_secret_expires_at;
         if(is_null($exp_date)) return null;
 
-        if($exp_date instanceof \DateTime)
+        if($exp_date instanceof DateTime)
             return $exp_date;
-        return new \DateTime($exp_date);
+        return new DateTime($exp_date);
     }
 
     /**
@@ -399,7 +438,7 @@ class Client extends BaseModelEloquent implements IClient
      */
     public function isClientSecretExpired()
     {
-        $now      = new \DateTime();
+        $now      = new DateTime();
         $exp_date = $this->getClientSecretExpiration();
 
         if(is_null($exp_date)) return false;
@@ -610,7 +649,8 @@ class Client extends BaseModelEloquent implements IClient
     }
 
     /**
-     * @param mixed $user
+     * @param $user
+     * @return $this
      */
     public function addAdminUser($user)
     {
@@ -619,7 +659,8 @@ class Client extends BaseModelEloquent implements IClient
     }
 
     /**
-     * @param mixed $user
+     * @param $user
+     * @return $this
      */
     public function removeAdminUser($user)
     {
@@ -627,6 +668,9 @@ class Client extends BaseModelEloquent implements IClient
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function removeAllAdminUsers(){
         $this->admin_users()->detach();
         return $this;
@@ -657,6 +701,10 @@ class Client extends BaseModelEloquent implements IClient
         return intval($this->user_id) === intval($user->id);
     }
 
+    /**
+     * @param $user
+     * @return $this
+     */
     public function setOwner($user)
     {
         $this->user()->associate($user);
@@ -693,4 +741,28 @@ class Client extends BaseModelEloquent implements IClient
         $user = $this->user()->first();
         return is_null($user)? 'N/A':$user->getEmail();
     }
+
+    /**
+     * @return bool
+     */
+    public function useRefreshToken()
+    {
+        return (bool)$this->use_refresh_token;
+    }
+
+    /**
+     * @return bool
+     */
+    public function useRotateRefreshTokenPolicy()
+    {
+        return (bool)$this->rotate_refresh_token;
+    }
+
+    /**
+     * @return AccessToken[]
+     */
+    public function getValidAccessTokens()
+    {
+       return $this->access_tokens()->whereRaw(" DATE_ADD(created_at, INTERVAL lifetime second) >= UTC_TIMESTAMP() ")->get();
+    }
 }
\ No newline at end of file
diff --git a/app/models/oauth2/ClientPublicKey.php b/app/Models/OAuth2/ClientPublicKey.php
similarity index 63%
rename from app/models/oauth2/ClientPublicKey.php
rename to app/Models/OAuth2/ClientPublicKey.php
index 219b90db..62582aa6 100644
--- a/app/models/oauth2/ClientPublicKey.php
+++ b/app/Models/OAuth2/ClientPublicKey.php
@@ -1,27 +1,25 @@
-<?php
+<?php namespace Models\OAuth2;
 /**
-* Copyright 2015 OpenStack Foundation
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-**/
-
-use utils\model\BaseModelEloquent;
-use oauth2\models\IClientPublicKey;
-use oauth2\models\IClient;
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\Models\IClientPublicKey;
+use OAuth2\Models\IClient;
 use jwk\impl\RSAJWKFactory ;
 use jwk\impl\RSAJWKPEMPublicKeySpecification;
-use \jwk\IJWK;
+use jwk\IJWK;
 /**
  * Class ClientPublicKey
  */
-final class ClientPublicKey extends AssymetricKey implements IClientPublicKey
+final class ClientPublicKey extends AsymmetricKey implements IClientPublicKey
 {
 
     /**
@@ -29,7 +27,7 @@ final class ClientPublicKey extends AssymetricKey implements IClientPublicKey
      */
     public function getOwner()
     {
-        return $this->belongsTo('Client');
+        return $this->belongsTo('Models\OAuth2\Client');
     }
 
     /**
diff --git a/app/Models/OAuth2/OAuth2TrailException.php b/app/Models/OAuth2/OAuth2TrailException.php
new file mode 100644
index 00000000..34a5651a
--- /dev/null
+++ b/app/Models/OAuth2/OAuth2TrailException.php
@@ -0,0 +1,22 @@
+<?php namespace Models\OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Model\BaseModelEloquent;
+/**
+ * Class OAuth2TrailException
+ * @package Models
+ */
+class OAuth2TrailException extends BaseModelEloquent
+{
+    protected $table = 'oauth2_exception_trail';
+} 
\ No newline at end of file
diff --git a/app/Models/OAuth2/RefreshToken.php b/app/Models/OAuth2/RefreshToken.php
new file mode 100644
index 00000000..a671abe4
--- /dev/null
+++ b/app/Models/OAuth2/RefreshToken.php
@@ -0,0 +1,116 @@
+<?php namespace Models\OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Auth\User;
+use Utils\Model\BaseModelEloquent;
+use DateInterval;
+use DateTime;
+use DateTimeZone;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Config;
+
+/**
+ * Class RefreshToken
+ * Refresh Token Entity
+ */
+class RefreshToken extends BaseModelEloquent {
+
+    protected $table = 'oauth2_refresh_token';
+
+    private $friendly_scopes;
+
+    protected $fillable = array('value', 'from_ip', 'lifetime','scope','audience','void','created_at','updated_at','client_id');
+
+    public function access_tokens()
+    {
+        return $this->hasMany('Models\OAuth2\AccessToken');
+    }
+
+    public function client(){
+        return $this->belongsTo('Models\OAuth2\Client');
+    }
+
+    /**
+     * @return IClient
+     */
+    public function getClient(){
+        return Cache::remember
+        (
+            'client_'.$this->client_id,
+            Config::get("cache_regions.region_clients_lifetime", 1140),
+            function() {
+                return $this->client()->first();
+            }
+        );
+    }
+
+    public function user(){
+        return $this->belongsTo('Auth\User');
+    }
+
+    /**
+     * @return User
+     */
+    public function getUser(){
+        return Cache::remember
+        (
+            'user_'.$this->user_id,
+            Config::get("cache_regions.region_users_lifetime", 1140),
+            function() {
+                return $this->user()->first();
+            }
+        );
+    }
+
+    /**
+     * @return bool
+     */
+    public function isVoid(){
+        if(intval($this->lifetime) == 0) return false;
+        //check lifetime...
+        $created_at = $this->created_at;
+        $created_at->add(new DateInterval('PT' . intval($this->lifetime) . 'S'));
+        $now        = new DateTime(gmdate("Y-m-d H:i:s", time()), new DateTimeZone("UTC"));
+        return ($now > $created_at);
+    }
+
+    /**
+     * @return int
+     */
+    public function getRemainingLifetime()
+    {
+        //check is refresh token is stills alive... (ZERO is infinite lifetime)
+        if (intval($this->lifetime) == 0) return 0;
+        $created_at = new DateTime($this->created_at, new DateTimeZone("UTC"));
+        $created_at->add(new DateInterval('PT' . intval($this->lifetime) . 'S'));
+        $now = new DateTime(gmdate("Y-m-d H:i:s", time()), new DateTimeZone("UTC"));
+        //check validity...
+        if ($now > $created_at)
+            return -1;
+        $seconds = abs($created_at->getTimestamp() - $now->getTimestamp());;
+        return $seconds;
+    }
+
+    public function getFriendlyScopes(){
+        return $this->friendly_scopes;
+    }
+
+    public function setFriendlyScopes($friendly_scopes){
+        $this->friendly_scopes = $friendly_scopes;
+    }
+
+    public function setVoid(){
+        $this->void = true;
+    }
+} 
\ No newline at end of file
diff --git a/app/models/oauth2/ResourceServer.php b/app/Models/OAuth2/ResourceServer.php
similarity index 66%
rename from app/models/oauth2/ResourceServer.php
rename to app/Models/OAuth2/ResourceServer.php
index fe7c19a0..f20299eb 100644
--- a/app/models/oauth2/ResourceServer.php
+++ b/app/Models/OAuth2/ResourceServer.php
@@ -1,10 +1,23 @@
-<?php
+<?php namespace Models\OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-use oauth2\models\IResourceServer;
-use utils\model\BaseModelEloquent;
+use OAuth2\Models\IResourceServer;
+use Utils\Model\BaseModelEloquent;
 
 /**
  * Class ResourceServer
+ * @package Models\OAuth2
  */
 class ResourceServer extends BaseModelEloquent implements IResourceServer
 {
@@ -26,12 +39,12 @@ class ResourceServer extends BaseModelEloquent implements IResourceServer
 
     public function apis()
     {
-        return $this->hasMany('Api', 'resource_server_id');
+        return $this->hasMany('Models\OAuth2\Api', 'resource_server_id');
     }
 
     public function client()
     {
-        return $this->hasOne('Client');
+        return $this->hasOne('Models\OAuth2\Client');
     }
 
     /**
diff --git a/app/models/oauth2/ServerPrivateKey.php b/app/Models/OAuth2/ServerPrivateKey.php
similarity index 71%
rename from app/models/oauth2/ServerPrivateKey.php
rename to app/Models/OAuth2/ServerPrivateKey.php
index 65cde246..b1ef27d1 100644
--- a/app/models/oauth2/ServerPrivateKey.php
+++ b/app/Models/OAuth2/ServerPrivateKey.php
@@ -1,27 +1,28 @@
-<?php
-
+<?php namespace Models\OAuth2;
 /**
-* Copyright 2015 OpenStack Foundation
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-**/
-
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 use jwk\IJWK;
 use jwk\impl\RSAJWKFactory;
 use jwk\impl\RSAJWKPEMPrivateKeySpecification;
-use oauth2\models\IServerPrivateKey;
-
+use OAuth2\Models\IServerPrivateKey;
+use DateTime;
+use Crypt_RSA;
+use Illuminate\Support\Facades\Crypt;
 /**
  * Class ServerPrivateKey
+ * @package Models\OAuth2
  */
-final class ServerPrivateKey extends AssymetricKey implements IServerPrivateKey
+final class ServerPrivateKey extends AsymmetricKey implements IServerPrivateKey
 {
     /**
      * @param array $attributes
@@ -82,8 +83,8 @@ final class ServerPrivateKey extends AssymetricKey implements IServerPrivateKey
 
     /**
      * @param string $kid
-     * @param \DateTime $valid_from
-     * @param \DateTime $valid_to
+     * @param DateTime $valid_from
+     * @param DateTime $valid_to
      * @param string $type
      * @param string $use
      * @param bool $active
@@ -91,7 +92,18 @@ final class ServerPrivateKey extends AssymetricKey implements IServerPrivateKey
      * @param null|string $password
      * @return IServerPrivateKey
      */
-    static function build($kid, \DateTime $valid_from, \DateTime $valid_to, $type, $use, $alg, $active, $pem_content, $password = null)
+    static function build
+    (
+        $kid,
+        DateTime $valid_from,
+        DateTime $valid_to,
+        $type,
+        $use,
+        $alg,
+        $active,
+        $pem_content,
+        $password = null
+    )
     {
         $key              = new self;
         $key->kid         = $kid;
diff --git a/app/Models/OAuth2/UserConsent.php b/app/Models/OAuth2/UserConsent.php
new file mode 100644
index 00000000..e840e291
--- /dev/null
+++ b/app/Models/OAuth2/UserConsent.php
@@ -0,0 +1,59 @@
+<?php namespace Models\OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\Models\IUserConsent;
+use Utils\Model\BaseModelEloquent;
+use OAuth2\Models\IClient;
+use Auth\User;
+/**
+ * Class UserConsent
+ * @package Models\OAuth2
+ */
+class UserConsent extends BaseModelEloquent implements IUserConsent {
+
+    protected $table = 'oauth2_user_consents';
+
+    public function user()
+    {
+        return $this->belongsTo('Auth\User');
+    }
+
+    public function client()
+    {
+        return $this->belongsTo('Models\OAuth2\Client');
+    }
+
+    /**
+     * @return string
+     */
+    public function getScope()
+    {
+        return $this->scope;
+    }
+
+    /**
+     * @return IClient
+     */
+    public function getClient()
+    {
+        return $this->client()->first();
+    }
+
+    /**
+     * @return User
+     */
+    public function getUser()
+    {
+        return $this->user()->first();
+    }
+}
\ No newline at end of file
diff --git a/app/models/openid/OpenIdAssociation.php b/app/Models/OpenId/OpenIdAssociation.php
similarity index 66%
rename from app/models/openid/OpenIdAssociation.php
rename to app/Models/OpenId/OpenIdAssociation.php
index 6d65517e..61bd3277 100644
--- a/app/models/openid/OpenIdAssociation.php
+++ b/app/Models/OpenId/OpenIdAssociation.php
@@ -1,16 +1,35 @@
-<?php
-
-use openid\model\IAssociation;
-
+<?php namespace Models\OpenId;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Models\IAssociation;
+use Utils\Model\BaseModelEloquent;
+use DateTime;
+use DateTimeZone;
+use DateInterval;
 /**
  * Class OpenIdAssociation
+ * @package Models\OpenId
  */
-class OpenIdAssociation extends Eloquent implements IAssociation
+class OpenIdAssociation extends BaseModelEloquent implements IAssociation
 {
 
     public $timestamps = false;
+
     protected $table = 'openid_associations';
 
+    /**
+     * @return string
+     */
     public function getMacFunction()
     {
         return $this->mac_function;
@@ -21,6 +40,9 @@ class OpenIdAssociation extends Eloquent implements IAssociation
         // TODO: Implement setMacFunction() method.
     }
 
+    /**
+     * @return string
+     */
     public function getSecret()
     {
         return $this->secret;
diff --git a/app/Models/OpenId/OpenIdTrustedSite.php b/app/Models/OpenId/OpenIdTrustedSite.php
new file mode 100644
index 00000000..498faf5a
--- /dev/null
+++ b/app/Models/OpenId/OpenIdTrustedSite.php
@@ -0,0 +1,71 @@
+<?php namespace Models\OpenId;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Models\ITrustedSite;
+use Utils\Model\BaseModelEloquent;
+/**
+ * Class OpenIdTrustedSite
+ * @package Models\OpenId
+ */
+class OpenIdTrustedSite extends BaseModelEloquent implements ITrustedSite
+{
+
+	protected $fillable = array('realm','user_id', 'policy', 'data');
+
+    public $timestamps = false;
+
+    protected $table = 'openid_trusted_sites';
+
+    /**
+     * @return string
+     */
+    public function getRealm()
+    {
+        return $this->realm;
+    }
+
+    public function getUITrustedData()
+    {
+        $data = $this->getData();
+        $str = '';
+        foreach ($data as $val) {
+            $str .= $val . ', ';
+        }
+        return trim($str, ', ');
+    }
+
+    public function getData()
+    {
+        $res = is_null($this->data)?'[]':$this->data;
+        return json_decode($res);
+    }
+
+    public function getUser()
+    {
+        return $this->user();
+    }
+
+    public function user()
+    {
+        return $this->belongsTo('Auth\User');
+    }
+
+    /**
+     * @return string
+     */
+    public function getAuthorizationPolicy()
+    {
+        return $this->policy;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/OpenId/ServerExtension.php b/app/Models/OpenId/ServerExtension.php
new file mode 100644
index 00000000..b24bc6c8
--- /dev/null
+++ b/app/Models/OpenId/ServerExtension.php
@@ -0,0 +1,24 @@
+<?php namespace Models\OpenId;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Model\BaseModelEloquent;
+/**
+ * Class ServerExtension
+ * @package Models\OpenId
+ */
+class ServerExtension extends BaseModelEloquent
+{
+    protected $fillable = array('name', 'namespace', 'active', 'extension_class', 'description', 'view_name');
+
+    protected $table = 'server_extensions';
+}
\ No newline at end of file
diff --git a/app/Models/ServerConfiguration.php b/app/Models/ServerConfiguration.php
new file mode 100644
index 00000000..af2ef072
--- /dev/null
+++ b/app/Models/ServerConfiguration.php
@@ -0,0 +1,23 @@
+<?php namespace Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Model\BaseModelEloquent;
+/**
+ * Class ServerConfiguration
+ * @package Models
+ */
+class ServerConfiguration extends BaseModelEloquent
+{
+    public $timestamps = false;
+    protected $table = 'server_configuration';
+} 
\ No newline at end of file
diff --git a/app/providers/BehatSessionServiceProvider.php b/app/Models/UserAction.php
similarity index 64%
rename from app/providers/BehatSessionServiceProvider.php
rename to app/Models/UserAction.php
index 9b00886c..e190e515 100644
--- a/app/providers/BehatSessionServiceProvider.php
+++ b/app/Models/UserAction.php
@@ -1,8 +1,6 @@
-<?php
-
-namespace providers;
+<?php namespace Models;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -13,14 +11,18 @@ namespace providers;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-use Illuminate\Session\SessionServiceProvider;
+use Utils\Model\BaseModelEloquent;
+/**
+ * Class UserAction
+ * @package Models
+ */
+class UserAction extends BaseModelEloquent
+{
 
-class BehatSessionServiceProvider extends SessionServiceProvider {
+    protected $table = 'user_actions';
 
-    protected function setupDefaultDriver()
+    public function user()
     {
-        // Do nothing
-        // Allows command line execution to save sessions
+        return $this->belongsTo('Auth\User');
     }
-
 }
\ No newline at end of file
diff --git a/app/Models/UserExceptionTrail.php b/app/Models/UserExceptionTrail.php
new file mode 100644
index 00000000..49350a59
--- /dev/null
+++ b/app/Models/UserExceptionTrail.php
@@ -0,0 +1,21 @@
+<?php namespace Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Model\BaseModelEloquent;
+/**
+ * Class UserExceptionTrail
+ * @package Models
+ */
+class UserExceptionTrail extends BaseModelEloquent {
+    protected $table = 'user_exceptions_trail';
+}
\ No newline at end of file
diff --git a/app/models/WhiteListedIP.php b/app/Models/WhiteListedIP.php
similarity index 85%
rename from app/models/WhiteListedIP.php
rename to app/Models/WhiteListedIP.php
index 36f69fc8..86c84ce3 100644
--- a/app/models/WhiteListedIP.php
+++ b/app/Models/WhiteListedIP.php
@@ -1,7 +1,6 @@
-<?php
-
+<?php namespace Models;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-use utils\model\BaseModelEloquent;
-
+use Utils\Model\BaseModelEloquent;
 /**
  * Class WhiteListedIP
+ * @package Models
  */
 class WhiteListedIP extends BaseModelEloquent
 {
diff --git a/app/Policies/.gitkeep b/app/Policies/.gitkeep
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/app/Policies/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
new file mode 100644
index 00000000..dc234d4a
--- /dev/null
+++ b/app/Providers/AppServiceProvider.php
@@ -0,0 +1,70 @@
+<?php namespace App\Providers;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\ServiceProvider;
+use Monolog\Handler\NativeMailerHandler;
+use Illuminate\Support\Facades\Validator;
+use Validators\CustomValidator;
+
+/**
+ * Class AppServiceProvider
+ * @package App\Providers
+ */
+class AppServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap any application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        $monolog = Log::getMonolog();
+
+        foreach($monolog->getHandlers() as $handler) {
+            $handler->setLevel(Config::get('log.level', 'error'));
+        }
+
+        //set email log
+        $to   = Config::get('log.to_email');
+        $from = Config::get('log.from_email');
+
+        if (!empty($to) && !empty($from)) {
+
+            $subject  = 'openstackid error';
+            $mono_log = Log::getMonolog();
+            $handler  = new NativeMailerHandler($to, $subject, $from);
+
+            $handler->setLevel(Config::get('log.email_level', 'error'));
+            $mono_log->pushHandler($handler);
+        }
+
+
+        Validator::resolver(function($translator, $data, $rules, $messages)
+        {
+            return new CustomValidator($translator, $data, $rules, $messages);
+        });
+    }
+
+    /**
+     * Register any application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        //
+    }
+}
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
new file mode 100644
index 00000000..140fb6c0
--- /dev/null
+++ b/app/Providers/AuthServiceProvider.php
@@ -0,0 +1,43 @@
+<?php namespace App\Providers;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Contracts\Auth\Access\Gate as GateContract;
+use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+/**
+ * Class AuthServiceProvider
+ * @package App\Providers
+ */
+class AuthServiceProvider extends ServiceProvider
+{
+    /**
+     * The policy mappings for the application.
+     *
+     * @var array
+     */
+    protected $policies = [
+        'App\Model' => 'App\Policies\ModelPolicy',
+    ];
+
+    /**
+     * Register any application authentication / authorization services.
+     *
+     * @param  \Illuminate\Contracts\Auth\Access\Gate  $gate
+     * @return void
+     */
+    public function boot(GateContract $gate)
+    {
+        $this->registerPolicies($gate);
+
+        //
+    }
+}
diff --git a/app/Providers/CustomAuthProvider.php b/app/Providers/CustomAuthProvider.php
new file mode 100644
index 00000000..4438a07d
--- /dev/null
+++ b/app/Providers/CustomAuthProvider.php
@@ -0,0 +1,56 @@
+<?php namespace App\Providers;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Auth;
+use App;
+use Illuminate\Support\ServiceProvider;
+use Auth\CustomAuthProvider as AuthProvider;
+use OpenId\Services\OpenIdServiceCatalog;
+use Utils\Services\UtilsServiceCatalog;
+/**
+ * Class CustomAuthProvider
+ * @package App\Providers
+ */
+class CustomAuthProvider extends ServiceProvider {
+    /**
+     * Bootstrap the application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        Auth::provider('custom', function($app, array $config) {
+            // Return an instance of Illuminate\Contracts\Auth\UserProvider...
+            return new AuthProvider(
+                App::make(\Auth\Repositories\IUserRepository::class),
+                App::make(\Auth\Repositories\IMemberRepository::class),
+                App::make(\Auth\IAuthenticationExtensionService::class),
+                App::make(OpenIdServiceCatalog::UserService),
+                App::make(UtilsServiceCatalog::CheckPointService),
+                App::make(UtilsServiceCatalog::TransactionService),
+                App::make(UtilsServiceCatalog::LogService)
+            );
+        });
+    }
+
+    /**
+     * Register the application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        //
+    }
+
+}
\ No newline at end of file
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
new file mode 100644
index 00000000..6c335ee6
--- /dev/null
+++ b/app/Providers/EventServiceProvider.php
@@ -0,0 +1,45 @@
+<?php namespace App\Providers;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
+use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+/**
+ * Class EventServiceProvider
+ * @package App\Providers
+ */
+class EventServiceProvider extends ServiceProvider
+{
+    /**
+     * The event listener mappings for the application.
+     *
+     * @var array
+     */
+    protected $listen = [
+        'Illuminate\Database\Events\QueryExecuted' => [
+            'App\Listeners\QueryExecutedListener',
+        ],
+    ];
+
+    /**
+     * Register any other events for your application.
+     *
+     * @param  \Illuminate\Contracts\Events\Dispatcher  $events
+     * @return void
+     */
+    public function boot(DispatcherContract $events)
+    {
+        parent::boot($events);
+
+        //
+    }
+}
diff --git a/app/Providers/OAuth2/ClientAuthContextValidatorFactoryProvider.php b/app/Providers/OAuth2/ClientAuthContextValidatorFactoryProvider.php
new file mode 100644
index 00000000..2caeefa6
--- /dev/null
+++ b/app/Providers/OAuth2/ClientAuthContextValidatorFactoryProvider.php
@@ -0,0 +1,48 @@
+<?php namespace Providers\OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\URL;
+use Illuminate\Support\Facades\App;
+use OAuth2\Strategies\ClientAuthContextValidatorFactory;
+
+/**
+ * Class ClientAuthContextValidatorFactoryProvider
+ * @package Providers\OAuth2
+ */
+final class ClientAuthContextValidatorFactoryProvider extends ServiceProvider
+{
+
+    public function boot()
+    {
+        ClientAuthContextValidatorFactory::setTokenEndpointUrl
+        (
+            URL::action('OAuth2\OAuth2ProviderController@token')
+        );
+
+        ClientAuthContextValidatorFactory::setJWKSetReader
+        (
+            App::make(\OAuth2\Services\IClientJWKSetReader::class)
+        );
+    }
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        // TODO: Implement register() method.
+    }
+}
\ No newline at end of file
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
new file mode 100644
index 00000000..ca348ee1
--- /dev/null
+++ b/app/Providers/RouteServiceProvider.php
@@ -0,0 +1,53 @@
+<?php namespace App\Providers;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Routing\Router;
+use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+/**
+ * Class RouteServiceProvider
+ * @package App\Providers
+ */
+final class RouteServiceProvider extends ServiceProvider
+{
+    /**
+     * This namespace is applied to your controller routes.
+     *
+     * In addition, it is set as the URL generator's root namespace.
+     *
+     * @var string
+     */
+    protected $namespace = 'App\Http\Controllers';
+
+    /**
+     * Define your route model bindings, pattern filters, etc.
+     *
+     * @param  \Illuminate\Routing\Router  $router
+     * @return void
+     */
+    public function boot(Router $router)
+    {
+        parent::boot($router);
+    }
+
+    /**
+     * Define the routes for the application.
+     *
+     * @param  \Illuminate\Routing\Router  $router
+     * @return void
+     */
+    public function map(Router $router)
+    {
+        require app_path('Http/routes.php');
+    }
+
+}
diff --git a/app/Repositories/AbstractCacheOAuth2TokenRepository.php b/app/Repositories/AbstractCacheOAuth2TokenRepository.php
new file mode 100644
index 00000000..e61affec
--- /dev/null
+++ b/app/Repositories/AbstractCacheOAuth2TokenRepository.php
@@ -0,0 +1,86 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Facades\Cache;
+use Utils\Model\IEntity;
+
+/**
+ * Class AbstractCacheOAuth2TokenRepository
+ * @package Repositories
+ */
+abstract class AbstractCacheOAuth2TokenRepository extends BaseCacheRepository
+{
+    function add(IEntity $entity)
+    {
+        Cache::forget($this->cache_base_key.'_'.$entity->value);
+        return parent::add($entity);
+    }
+
+    function update(IEntity $entity)
+    {
+        Cache::forget($this->cache_base_key.'_'.$entity->value);
+        return parent::update($entity);
+    }
+
+    function delete(IEntity $entity)
+    {
+        Cache::forget($this->cache_base_key.'_'.$entity->value);
+        return parent::delete($entity);
+    }
+
+    /**
+     * @param int $client_identifier
+     * @param int $page_nbr
+     * @param int $page_size
+     * @return LengthAwarePaginator
+     */
+    function getAllByClientIdentifier($client_identifier, $page_nbr = 1, $page_size = 10)
+    {
+        return $this->repository->getAllByClientIdentifier($client_identifier, $page_nbr, $page_size);
+    }
+
+    /**
+     * @param int $client_identifier
+     * @param int $page_nbr
+     * @param int $page_size
+     * @return LengthAwarePaginator
+     */
+    function getAllValidByClientIdentifier($client_identifier, $page_nbr = 1, $page_size = 10)
+    {
+        return $this->repository->getAllValidByClientIdentifier($client_identifier, $page_nbr, $page_size );
+    }
+
+    /**
+     * @param int $user_id
+     * @param int $page_nbr
+     * @param int $page_size
+     * @return LengthAwarePaginator
+     */
+    function getAllByUserId($user_id, $page_nbr = 1, $page_size = 10)
+    {
+        return $this->repository->getAllByUserId($user_id, $page_nbr, $page_size);
+    }
+
+    /**
+     * @param int $user_id
+     * @param int $page_nbr
+     * @param int $page_size
+     * @return LengthAwarePaginator
+     */
+    function getAllValidByUserId($user_id, $page_nbr = 1, $page_size = 10)
+    {
+        return $this->repository->getAllValidByUserId($user_id, $page_nbr, $page_size);
+    }
+}
\ No newline at end of file
diff --git a/app/repositories/AbstractEloquentEntityRepository.php b/app/Repositories/AbstractEloquentEntityRepository.php
similarity index 86%
rename from app/repositories/AbstractEloquentEntityRepository.php
rename to app/Repositories/AbstractEloquentEntityRepository.php
index 0d60ec00..8fda82bc 100644
--- a/app/repositories/AbstractEloquentEntityRepository.php
+++ b/app/Repositories/AbstractEloquentEntityRepository.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Repositories;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,16 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace repositories;
-
-use DB;
-use utils\model\IEntity;
-use utils\db\IBaseRepository;
-
+use Utils\Model\IEntity;
+use Utils\Db\IBaseRepository;
 /**
  * Class AbstractEloquentEntityRepository
- * @package repositories
+ * @package Repositories
  */
 abstract class AbstractEloquentEntityRepository implements IBaseRepository
 {
@@ -30,15 +25,15 @@ abstract class AbstractEloquentEntityRepository implements IBaseRepository
     protected $entity;
 
     /**
-     * @param int $page_size
      * @param int $page_nbr
+     * @param int $page_size
+     * @param array $filters
+     * @param array $fields
      * @return mixed
      */
     public function getAll($page_nbr = 1, $page_size = 10, array $filters = array(), array $fields = array('*'))
     {
-        DB::getPaginator()->setCurrentPage($page_nbr);
-
-        return $this->entity->Filter($filters)->paginate($page_size, $fields);
+        return $this->entity->Filter($filters)->paginate($page_size, $fields, $pageName = 'Page', $page_nbr);
     }
 
     /**
@@ -47,7 +42,7 @@ abstract class AbstractEloquentEntityRepository implements IBaseRepository
      */
     public function update(IEntity $entity)
     {
-        return $entity->Save();
+        return $entity->save();
     }
 
     /**
diff --git a/app/Repositories/AbstractEloquentOAuth2TokenRepository.php b/app/Repositories/AbstractEloquentOAuth2TokenRepository.php
new file mode 100644
index 00000000..65ed1889
--- /dev/null
+++ b/app/Repositories/AbstractEloquentOAuth2TokenRepository.php
@@ -0,0 +1,80 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+
+
+/**
+ * Class AbstractEloquentOAuth2TokenRepository
+ * @package Repositories
+ */
+abstract class AbstractEloquentOAuth2TokenRepository extends AbstractEloquentEntityRepository
+{
+    /**
+     * @param int $client_identifier
+     * @param int $page_nbr
+     * @param int $page_size
+     * @return LengthAwarePaginator
+     */
+    public function getAllByClientIdentifier($client_identifier, $page_nbr = 1, $page_size = 10){
+        return $this->getAll($page_nbr, $page_size, [['name' => 'client_id', 'op' => '=','value' => $client_identifier]]);
+    }
+
+    /**
+     * @param int $user_id
+     * @param int $page_nbr
+     * @param int $page_size
+     * @return LengthAwarePaginator
+     */
+    public function getAllByUserId($user_id, $page_nbr = 1, $page_size = 10){
+        return $this->getAll($page_nbr, $page_size, [['name' => 'user_id', 'op' => '=','value' => $user_id]]);
+    }
+
+    /**
+     * @param int $client_identifier
+     * @param int $page_nbr
+     * @param int $page_size
+     * @return LengthAwarePaginator
+     */
+    function getAllValidByClientIdentifier($client_identifier, $page_nbr = 1, $page_size = 10)
+    {
+        return $this->getAll($page_nbr, $page_size, [
+            ['name' => 'client_id', 'op' => '=','value' => $client_identifier ],
+            ['raw'  => 'DATE_ADD(created_at, INTERVAL lifetime second) >= UTC_TIMESTAMP()'],
+        ]);
+    }
+
+    /**
+     * @param int $user_id
+     * @param int $page_nbr
+     * @param int $page_size
+     * @return LengthAwarePaginator
+     */
+    function getAllValidByUserId($user_id, $page_nbr = 1, $page_size = 10)
+    {
+        return $this->getAll($page_nbr, $page_size, [
+            ['name' => 'user_id', 'op' => '=','value' => $user_id ],
+            ['raw'  => 'DATE_ADD(created_at, INTERVAL lifetime second) >= UTC_TIMESTAMP()'],
+        ]);
+    }
+
+    /**
+     * @param $hashed_value
+     * @return mixed
+     */
+    function getByValue($hashed_value)
+    {
+        return $this->entity->where('value', '=', $hashed_value)->first();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Repositories/BaseCacheRepository.php b/app/Repositories/BaseCacheRepository.php
new file mode 100644
index 00000000..452b3958
--- /dev/null
+++ b/app/Repositories/BaseCacheRepository.php
@@ -0,0 +1,98 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Db\IBaseRepository;
+use Utils\Model\IEntity;
+use Illuminate\Support\Facades\Cache;
+/**
+ * Class BaseCacheRepository
+ * @package Repositories
+ */
+abstract class BaseCacheRepository implements IBaseRepository
+{
+
+    /**
+     * @var IBaseRepository
+     */
+    protected $repository;
+
+    /**
+     * @var string
+     */
+    protected $cache_base_key;
+
+    /**
+     * @var int
+     */
+    protected $cache_minutes_lifetime;
+
+    /**
+     * BaseCacheRepository constructor.
+     * @param IBaseRepository $repository
+     */
+    public function __construct(IBaseRepository $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * @param int $id
+     * @return IEntity
+     */
+    public function get($id)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$id, $this->cache_minutes_lifetime, function() use($id) {
+            return $this->repository->get($id);
+        });
+    }
+
+    /**
+     * @param int $page_nbr
+     * @param int $page_size
+     * @param array $filters
+     * @param array $fields
+     * @return mixed
+     */
+    public function getAll($page_nbr = 1, $page_size = 10, array $filters = [], array $fields = ['*'])
+    {
+        return $this->repository->getAll($page_nbr, $page_size, $filters, $fields);
+    }
+
+    /**
+     * @param IEntity $entity
+     * @return bool
+     */
+    public function update(IEntity $entity)
+    {
+        return $this->repository->update($entity);
+    }
+
+    /**
+     * @param IEntity $entity
+     * @return bool
+     */
+    public function add(IEntity $entity)
+    {
+        return $this->repository->add($entity);
+    }
+
+    /**
+     * @param IEntity $entity
+     * @return bool
+     */
+    public function delete(IEntity $entity)
+    {
+        return $this->repository->delete($entity);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Repositories/CacheAccessTokenRepository.php b/app/Repositories/CacheAccessTokenRepository.php
new file mode 100644
index 00000000..9b1cb199
--- /dev/null
+++ b/app/Repositories/CacheAccessTokenRepository.php
@@ -0,0 +1,69 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Illuminate\Support\Facades\Config;
+use Models\OAuth2\AccessToken;
+use OAuth2\Repositories\IAccessTokenRepository;
+use Illuminate\Support\Facades\Cache;
+
+/**
+ * Class CacheAccessTokenRepository
+ * @package Repositories
+ */
+final class CacheAccessTokenRepository extends AbstractCacheOAuth2TokenRepository  implements IAccessTokenRepository
+{
+
+    /**
+     * CacheAccessTokenRepository constructor.
+     * @param EloquentAccessTokenRepository $repository
+     */
+    public function __construct(EloquentAccessTokenRepository $repository)
+    {
+        $this->cache_base_key         = 'access_token';
+        $this->cache_minutes_lifetime = Config::get("cache_regions.region_access_token_lifetime", 1140);
+        parent::__construct($repository);
+    }
+
+    /**
+     * @param string $hashed_value
+     * @return AccessToken
+     */
+    function getByValue($hashed_value)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$hashed_value, $this->cache_minutes_lifetime, function() use($hashed_value) {
+            return $this->repository->getByValue($hashed_value);
+        });
+    }
+
+    /**
+     * @param string $hashed_value
+     * @return AccessToken
+     */
+    function getByAuthCode($hashed_value)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$hashed_value, $this->cache_minutes_lifetime, function() use($hashed_value) {
+            return $this->repository->getByAuthCode($hashed_value);
+        });
+    }
+
+    /**
+     * @param int $refresh_token_id
+     * @return AccessToken[]
+     */
+    function getByRefreshToken($refresh_token_id)
+    {
+        return $this->repository->getByRefreshToken($refresh_token_id);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Repositories/CacheApiEndpointRepository.php b/app/Repositories/CacheApiEndpointRepository.php
new file mode 100644
index 00000000..dfd3cdf7
--- /dev/null
+++ b/app/Repositories/CacheApiEndpointRepository.php
@@ -0,0 +1,68 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\Models\IApiEndpoint;
+use OAuth2\Repositories\IApiEndpointRepository;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Config;
+/**
+ * Class CacheApiEndpointRepository
+ * @package Repositories
+ */
+final class CacheApiEndpointRepository extends BaseCacheRepository implements IApiEndpointRepository
+{
+
+    public function __construct(EloquentApiEndpointRepository $repository)
+    {
+        $this->cache_base_key         = 'api_endpoint';
+        $this->cache_minutes_lifetime = Config::get("cache_regions.region_api_endpoint_lifetime", 1140);
+        parent::__construct($repository);
+    }
+
+    /**
+     * @param string $url
+     * @param string $http_method
+     * @return IApiEndpoint
+     */
+    public function getApiEndpointByUrlAndMethod($url, $http_method)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$url.'_'.$http_method, $this->cache_minutes_lifetime, function() use($url, $http_method) {
+            return $this->repository->getApiEndpointByUrlAndMethod($url, $http_method);
+        });
+    }
+
+    /**
+     * @param string $url
+     * @param string $http_method
+     * @param int $api_id
+     * @return IApiEndpoint
+     */
+    public function getApiEndpointByUrlAndMethodAndApi($url, $http_method, $api_id)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$url.'_'.$http_method.'_'.$api_id, $this->cache_minutes_lifetime, function() use($url, $http_method, $api_id) {
+            return $this->repository->getApiEndpointByUrlAndMethodAndApi($url, $http_method, $api_id);
+        });
+    }
+
+    /**
+     * @param string $url
+     * @return IApiEndpoint
+     */
+    public function getApiEndpointByUrl($url)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$url, $this->cache_minutes_lifetime, function() use($url) {
+            return $this->repository->getApiEndpointByUrl($url);
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/Repositories/CacheApiRepository.php b/app/Repositories/CacheApiRepository.php
new file mode 100644
index 00000000..a26fa515
--- /dev/null
+++ b/app/Repositories/CacheApiRepository.php
@@ -0,0 +1,55 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\Models\IApi;
+use OAuth2\Repositories\IApiRepository;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Config;
+/**
+ * Class CacheApiRepository
+ * @package Repositories
+ */
+final class CacheApiRepository extends BaseCacheRepository implements IApiRepository
+{
+
+    public function __construct(EloquentApiRepository $repository)
+    {
+        $this->cache_base_key         = 'api';
+        $this->cache_minutes_lifetime = Config::get("cache_regions.region_api_lifetime", 1140);
+        parent::__construct($repository);
+    }
+
+    /**
+     * @param string $api_name
+     * @return IApi
+     */
+    public function getByName($api_name)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$api_name, $this->cache_minutes_lifetime, function() use($api_name) {
+            return $this->repository->getByName($api_name);
+        });
+    }
+
+    /**
+     * @param string $api_name
+     * @param int $resource_server_id
+     * @return IApi
+     */
+    public function getByNameAndResourceServer($api_name, $resource_server_id)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$api_name.'_'.$resource_server_id, $this->cache_minutes_lifetime, function() use($api_name, $resource_server_id) {
+            return $this->repository->getByNameAndResourceServer($api_name, $resource_server_id);
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/Repositories/CacheApiScopeRepository.php b/app/Repositories/CacheApiScopeRepository.php
new file mode 100644
index 00000000..d1e60473
--- /dev/null
+++ b/app/Repositories/CacheApiScopeRepository.php
@@ -0,0 +1,73 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\Models\IApiScope;
+use OAuth2\Repositories\IApiScopeRepository;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Config;
+/**
+ * Class CacheApiScopeRepository
+ * @package Repositories
+ */
+final class CacheApiScopeRepository extends BaseCacheRepository implements IApiScopeRepository
+{
+
+    public function __construct(EloquentApiScopeRepository $repository)
+    {
+        $this->cache_base_key         = 'api_scope';
+        $this->cache_minutes_lifetime = $this->cache_minutes_lifetime = Config::get("cache_regions.region_api_scope_lifetime", 1140);
+        parent::__construct($repository);
+    }
+
+    /**
+     * @param array $scopes_names
+     * @return IApiScope[]
+     */
+    public function getByName(array $scopes_names)
+    {
+        return Cache::remember($this->cache_base_key.'_'.join('_', $scopes_names), $this->cache_minutes_lifetime, function() use($scopes_names) {
+            return $this->repository->getByName($scopes_names);
+        });
+    }
+
+    /**
+     * @return IApiScope[]
+     */
+    public function getDefaults()
+    {
+        return Cache::remember($this->cache_base_key.'_defaults', $this->cache_minutes_lifetime, function() {
+            return $this->repository->getDefaults();
+        });
+    }
+
+    /**
+     * @return IApiScope[]
+     */
+    public function getActives()
+    {
+        return Cache::remember($this->cache_base_key.'_actives', $this->cache_minutes_lifetime, function() {
+            return $this->repository->getActives();
+        });
+    }
+
+    /**
+     * @return IApiScope[]
+     */
+    public function getAssignableByGroups()
+    {
+        return Cache::remember($this->cache_base_key.'_assignables_by_groups', $this->cache_minutes_lifetime, function() {
+            return $this->repository->getAssignableByGroups();
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/Repositories/CacheClientRepository.php b/app/Repositories/CacheClientRepository.php
new file mode 100644
index 00000000..b79b8549
--- /dev/null
+++ b/app/Repositories/CacheClientRepository.php
@@ -0,0 +1,77 @@
+<?php namespace Repositories;
+
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\Models\IClient;
+use OAuth2\Repositories\IClientRepository;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Config;
+/**
+ * Class CacheClientRepository
+ * @package Repositories
+ */
+final class CacheClientRepository extends BaseCacheRepository implements IClientRepository
+{
+
+    public function __construct(EloquentClientRepository $repository)
+    {
+        $this->cache_base_key         = 'client';
+        $this->cache_minutes_lifetime = Config::get("cache_regions.region_clients_lifetime", 1140);
+        parent::__construct($repository);
+    }
+
+    /**
+     * @param string $app_name
+     * @return IClient
+     */
+    public function getByApplicationName($app_name)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$app_name, $this->cache_minutes_lifetime, function() use($app_name) {
+            return $this->repository->getByApplicationName($app_name);
+        });
+    }
+
+    /**
+     * @param string $client_id
+     * @return IClient
+     */
+    public function getClientById($client_id)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$client_id, $this->cache_minutes_lifetime, function() use($client_id) {
+            return $this->repository->getClientById($client_id);
+        });
+    }
+
+    /**
+     * @param int $id
+     * @return IClient
+     */
+    public function getClientByIdentifier($id)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$id, $this->cache_minutes_lifetime, function() use($id) {
+            return $this->repository->getClientByIdentifier($id);
+        });
+    }
+
+    /**
+     * @param string $origin
+     * @return IClient
+     */
+    public function getByOrigin($origin)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$origin, $this->cache_minutes_lifetime, function() use($origin) {
+            return $this->repository->getByOrigin($origin);
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/Repositories/CacheRefreshTokenRepository.php b/app/Repositories/CacheRefreshTokenRepository.php
new file mode 100644
index 00000000..848dac09
--- /dev/null
+++ b/app/Repositories/CacheRefreshTokenRepository.php
@@ -0,0 +1,48 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Models\OAuth2\RefreshToken;
+use OAuth2\Repositories\IRefreshTokenRepository;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Config;
+/**
+ * Class CacheRefreshTokenRepository
+ * @package Repositories
+ */
+final class CacheRefreshTokenRepository extends AbstractCacheOAuth2TokenRepository implements IRefreshTokenRepository
+{
+
+    /**
+     * CacheRefreshTokenRepository constructor.
+     * @param EloquentRefreshTokenRepository $repository
+     */
+    public function __construct(EloquentRefreshTokenRepository $repository)
+    {
+        $this->cache_base_key         = 'refresh_token';
+        $this->cache_minutes_lifetime =  Config::get("cache_regions.region_refresh_token_lifetime", 1140);
+        parent::__construct($repository);
+    }
+
+    /**
+     * @param $hashed_value
+     * @return RefreshToken
+     */
+    function getByValue($hashed_value)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$hashed_value, $this->cache_minutes_lifetime, function() use($hashed_value) {
+            return $this->repository->getByValue($hashed_value);
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/app/Repositories/CacheResourceServerRepository.php b/app/Repositories/CacheResourceServerRepository.php
new file mode 100644
index 00000000..c3ec5f60
--- /dev/null
+++ b/app/Repositories/CacheResourceServerRepository.php
@@ -0,0 +1,77 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\Models\IResourceServer;
+use OAuth2\Repositories\IResourceServerRepository;
+use Utils\Model\IEntity;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Config;
+/**
+ * Class CacheResourceServerRepository
+ * @package Repositories
+ */
+final class CacheResourceServerRepository extends BaseCacheRepository implements IResourceServerRepository
+{
+
+    public function __construct(EloquentResourceServerRepository $repository)
+    {
+        $this->cache_base_key         = 'resource_server';
+        $this->cache_minutes_lifetime = Config::get("cache_regions.region_resource_server_lifetime", 1140);
+        parent::__construct($repository);
+    }
+
+    /**
+     * @param string $host
+     * @return IResourceServer
+     */
+    public function getByHost($host)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$host, $this->cache_minutes_lifetime, function() use($host) {
+            return $this->repository->getByHost($host);
+        });
+    }
+
+    /**
+     * @param string $ip
+     * @return IResourceServer
+     */
+    public function getByIp($ip)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$ip, $this->cache_minutes_lifetime, function() use($ip) {
+            return $this->repository->getByIp($ip);
+        });
+    }
+
+    /**
+     * @param string $name
+     * @return IResourceServer
+     */
+    public function getByFriendlyName($name)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$name, $this->cache_minutes_lifetime, function() use($name) {
+            return $this->repository->getByFriendlyName($name);
+        });
+    }
+
+    /**
+     * @param array $audience
+     * @param string $ip
+     * @return IResourceServer
+     */
+    public function getByAudienceAndIpAndActive(array $audience, $ip)
+    {
+        return Cache::remember($this->cache_base_key.'_'.join("_", $audience).'_'.$ip, $this->cache_minutes_lifetime, function() use($audience, $ip) {
+            return $this->repository->getByAudienceAndIpAndActive($audience, $ip);
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/Repositories/CacheUserRepository.php b/app/Repositories/CacheUserRepository.php
new file mode 100644
index 00000000..d786f139
--- /dev/null
+++ b/app/Repositories/CacheUserRepository.php
@@ -0,0 +1,112 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Auth\Repositories\IUserRepository;
+use Auth\User;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Config;
+/**
+ * Class CacheUserRepository
+ * @package Repositories
+ */
+final class CacheUserRepository extends BaseCacheRepository  implements IUserRepository
+{
+
+    public function __construct(EloquentUserRepository $repository)
+    {
+        $this->cache_base_key         = 'user';
+        $this->cache_minutes_lifetime = Config::get("cache_regions.region_users_lifetime", 30);
+        parent::__construct($repository);
+    }
+
+    /**
+     * @param $external_id
+     * @return User
+     */
+    public function getByExternalId($external_id)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$external_id, $this->cache_minutes_lifetime, function() use($external_id) {
+            return $this->repository->getByExternalId($external_id);
+        });
+    }
+
+    /**
+     * @param $filters
+     * @return array
+     */
+    public function getByCriteria($filters)
+    {
+        return $this->repository->getByCriteria($filters);
+    }
+
+    /**
+     * @param $filters
+     * @return User
+     */
+    public function getOneByCriteria($filters)
+    {
+        return $this->repository->getOneByCriteria($filters);
+    }
+
+    /**
+     * @param array $filters
+     * @return int
+     */
+    public function getCount(array $filters = array())
+    {
+        return $this->repository->getCount($filters);
+    }
+
+    /**
+     * @param mixed $identifier
+     * @param string $token
+     * @return User
+     */
+    public function getByToken($identifier, $token)
+    {
+        return $this->repository->getByToken($identifier, $token);
+    }
+
+    /**
+     * @param string $term
+     * @return array
+     */
+    public function getByEmailOrName($term)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$term, $this->cache_minutes_lifetime, function() use($term) {
+            return $this->repository->getByEmailOrName($term);
+        });
+    }
+
+    /**
+     * @param string $user_identifier
+     * @return User
+     */
+    public function getByIdentifier($user_identifier)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$user_identifier, $this->cache_minutes_lifetime, function() use($user_identifier) {
+            return $this->repository->getByIdentifier($user_identifier);
+        });
+    }
+
+    /**
+     * @param $id
+     * @return User
+     */
+    public function get($id)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$id, $this->cache_minutes_lifetime, function() use($id) {
+            return $this->repository->get($id);
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/Repositories/CacheWhiteListedIPRepository.php b/app/Repositories/CacheWhiteListedIPRepository.php
new file mode 100644
index 00000000..84ae4ba8
--- /dev/null
+++ b/app/Repositories/CacheWhiteListedIPRepository.php
@@ -0,0 +1,45 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Models\IWhiteListedIPRepository;
+use Models\WhiteListedIP;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Config;
+/**
+ * Class CacheWhiteListedIPRepository
+ * @package Repositories
+ */
+final class CacheWhiteListedIPRepository
+    extends BaseCacheRepository implements IWhiteListedIPRepository
+{
+
+    public function __construct(EloquentWhiteListedIPRepository $repository)
+    {
+        $this->cache_base_key         = 'white_listed_ip';
+        $this->cache_minutes_lifetime = Config::get("cache_regions.region_white_listed_ip_lifetime", 1140);
+        parent::__construct($repository);
+    }
+
+
+    /**
+     * @param string $ip
+     * @return WhiteListedIP
+     */
+    function getByIp($ip)
+    {
+        return Cache::remember($this->cache_base_key.'_'.$ip, $this->cache_minutes_lifetime, function() use($ip) {
+            return $this->repository->getByIp($ip);
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/Repositories/EloquentAccessTokenRepository.php b/app/Repositories/EloquentAccessTokenRepository.php
new file mode 100644
index 00000000..430bd978
--- /dev/null
+++ b/app/Repositories/EloquentAccessTokenRepository.php
@@ -0,0 +1,50 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+use Models\OAuth2\AccessToken;
+use OAuth2\Repositories\IAccessTokenRepository;
+use Utils\Services\ILogService;
+/**
+ * Class EloquentAccessTokenRepository
+ * @package Repositories
+ */
+final class EloquentAccessTokenRepository extends AbstractEloquentOAuth2TokenRepository implements IAccessTokenRepository
+{
+    /**
+     * @param AccessToken $entity
+     * @param ILogService $log_service
+     */
+    public function __construct(AccessToken $entity, ILogService $log_service){
+        $this->entity      = $entity;
+        $this->log_service = $log_service;
+    }
+
+    /**
+     * @param string $hashed_value
+     * @return AccessToken
+     */
+    function getByAuthCode($hashed_value)
+    {
+        return $this->entity->where('associated_authorization_code', '=', $hashed_value)->first();
+    }
+
+    /**
+     * @param int $refresh_token_id
+     * @return AccessToken[]
+     */
+    function getByRefreshToken($refresh_token_id)
+    {
+        return $this->entity->where('refresh_token_id', '=', $refresh_token_id)->get();
+    }
+}
\ No newline at end of file
diff --git a/app/Repositories/EloquentApiEndpointRepository.php b/app/Repositories/EloquentApiEndpointRepository.php
new file mode 100644
index 00000000..56d08121
--- /dev/null
+++ b/app/Repositories/EloquentApiEndpointRepository.php
@@ -0,0 +1,75 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Models\OAuth2\ApiEndpoint;
+use OAuth2\Repositories\IApiEndpointRepository;
+use OAuth2\Models\IApiEndpoint;
+/**
+ * Class EloquentApiEndpointRepository
+ * @package repositories
+ */
+class EloquentApiEndpointRepository extends AbstractEloquentEntityRepository implements IApiEndpointRepository
+{
+    /**
+     * @param ApiEndpoint $endpoint
+     */
+    public function __construct(ApiEndpoint $endpoint)
+    {
+        $this->entity = $endpoint;
+    }
+
+    /**
+     * @param string $url
+     * @param string $http_method
+     * @return IApiEndpoint
+     */
+    public function getApiEndpointByUrlAndMethod($url, $http_method)
+    {
+        return $this->entity->Filter(array(
+            array(
+                'name' => 'route',
+                'op' => '=',
+                'value' => $url
+            ),
+            array(
+                'name' => 'http_method',
+                'op' => '=',
+                'value' => $http_method
+            )
+        ))->first();
+    }
+
+    /**
+     * @param string $url
+     * @return IApiEndpoint
+     */
+    public function getApiEndpointByUrl($url)
+    {
+        return $this->entity->where('route','=',$url)->first();
+    }
+
+    /**
+     * @param string $url
+     * @param string $http_method
+     * @param int $api_id
+     * @return IApiEndpoint
+     */
+    public function getApiEndpointByUrlAndMethodAndApi($url, $http_method, $api_id)
+    {
+        return $this->entity
+            ->where('http_method', '=' , $http_method)
+            ->where('route', '=' , $url)
+            ->where('api_id', '=' ,$api_id)
+            ->first();
+    }
+}
\ No newline at end of file
diff --git a/app/Repositories/EloquentApiRepository.php b/app/Repositories/EloquentApiRepository.php
new file mode 100644
index 00000000..ca83fd14
--- /dev/null
+++ b/app/Repositories/EloquentApiRepository.php
@@ -0,0 +1,50 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Models\OAuth2\Api;
+use OAuth2\Models\IApi;
+use OAuth2\Repositories\IApiRepository;
+
+/**
+ * Class EloquentApiRepository
+ * @package Repositories
+ */
+final class EloquentApiRepository extends AbstractEloquentEntityRepository implements IApiRepository
+{
+    /**
+     * @param Api $api
+     */
+    public function __construct(Api $api)
+    {
+        $this->entity = $api;
+    }
+
+    /**
+     * @param string $api_name
+     * @return IApi
+     */
+    public function getByName($api_name)
+    {
+        return $this->entity->where('name','=',$api_name)->first();
+    }
+
+    /**
+     * @param string $api_name
+     * @param int $resource_server_id
+     * @return IApi
+     */
+    public function getByNameAndResourceServer($api_name, $resource_server_id)
+    {
+        return $this->entity->where('name','=',$api_name)->where('resource_server_id','=',$resource_server_id)->first();
+    }
+}
\ No newline at end of file
diff --git a/app/repositories/EloquentApiScopeGroupRepository.php b/app/Repositories/EloquentApiScopeGroupRepository.php
similarity index 77%
rename from app/repositories/EloquentApiScopeGroupRepository.php
rename to app/Repositories/EloquentApiScopeGroupRepository.php
index 4ed8e5e8..f72a570f 100644
--- a/app/repositories/EloquentApiScopeGroupRepository.php
+++ b/app/Repositories/EloquentApiScopeGroupRepository.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Repositories;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,14 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace repositories;
-
-use oauth2\models\IApiScopeGroup;
-use oauth2\repositories\IApiScopeGroupRepository;
-use ApiScopeGroup;
-use utils\services\ILogService;
-
+use OAuth2\Repositories\IApiScopeGroupRepository;
+use Models\OAuth2\ApiScopeGroup;
+use Utils\Services\ILogService;
 /**
  * Class EloquentApiScopeGroupRepository
  * @package repositories
@@ -40,4 +35,12 @@ final class EloquentApiScopeGroupRepository extends AbstractEloquentEntityReposi
         $this->log_service = $log_service;
     }
 
+    /**
+     * @param string $name
+     * @return ApiScopeGroup
+     */
+    public function getByName($name)
+    {
+       return $this->entity->where('name', '=', $name)->first();
+    }
 }
\ No newline at end of file
diff --git a/app/Repositories/EloquentApiScopeRepository.php b/app/Repositories/EloquentApiScopeRepository.php
new file mode 100644
index 00000000..01cc87fd
--- /dev/null
+++ b/app/Repositories/EloquentApiScopeRepository.php
@@ -0,0 +1,72 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Models\OAuth2\ApiScope;
+use OAuth2\Models\IApiScope;
+use OAuth2\Repositories\IApiScopeRepository;
+
+/**
+ * Class EloquentApiScopeRepository
+ * @package Repositories
+ */
+final class EloquentApiScopeRepository extends AbstractEloquentEntityRepository implements IApiScopeRepository
+{
+    /**
+     * @param ApiScope $scope
+     */
+    public function __construct(ApiScope $scope)
+    {
+        $this->entity = $scope;
+    }
+
+    /**
+     * @param array $scopes_names
+     * @return IApiScope[]
+     */
+    public function getByName(array $scopes_names)
+    {
+        return $this->entity->where('active', '=', true)->whereIn('name', $scopes_names)->get();
+    }
+
+    /**
+     * @return IApiScope[]
+     */
+    public function getDefaults()
+    {
+        return $this->entity->where('default', '=', true)->where('active', '=', true)->get();
+    }
+
+    /**
+     * @return IApiScope[]
+     */
+    public function getActives(){
+        return $this->entity
+            ->with('api')
+            ->with('api.resource_server')
+            ->where('active', '=', true)
+            ->orderBy('api_id')->get();
+    }
+
+    /**
+     * @return IApiScope[]
+     */
+    public function getAssignableByGroups(){
+        return $this->entity
+            ->with('api')
+            ->with('api.resource_server')
+            ->where('active', '=', true)
+            ->where('assigned_by_groups', '=', true)
+            ->orderBy('api_id')->get();
+    }
+}
\ No newline at end of file
diff --git a/app/repositories/EloquentAssymetricKeyRepository.php b/app/Repositories/EloquentAsymmetricKeyRepository.php
similarity index 63%
rename from app/repositories/EloquentAssymetricKeyRepository.php
rename to app/Repositories/EloquentAsymmetricKeyRepository.php
index 40068deb..119d9a4f 100644
--- a/app/repositories/EloquentAssymetricKeyRepository.php
+++ b/app/Repositories/EloquentAsymmetricKeyRepository.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Repositories;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,88 +11,61 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace repositories;
-
-use oauth2\models\IAssymetricKey;
-use oauth2\repositories\IAssymetricKeyRepository;
-use DB;
+use OAuth2\Models\IAsymmetricKey;
+use OAuth2\Repositories\IAsymmetricKeyRepository;
 use utils\services\ILogService;
+use DateTime;
 /**
- * Class EloquentAssymetricKeyRepository
- * @package repositories
+ * Class EloquentAsymmetricKeyRepository
+ * @package Repositories
  */
-abstract class EloquentAssymetricKeyRepository implements IAssymetricKeyRepository
+abstract class EloquentAsymmetricKeyRepository extends AbstractEloquentEntityRepository implements IAsymmetricKeyRepository
 {
-    /**
-     * @var IAssymetricKey
-     */
-    protected $key;
-
     /**
      * @var ILogService
      */
     protected $log_service;
 
-
     /**
      * @param string $kid
-     * @return IAssymetricKey
+     * @return IAsymmetricKey
      */
     public function get($kid)
     {
-        return $this->key->where('kid','=',$kid)->first();
-    }
-
-    /**
-     * @param IAssymetricKey $key
-     * @return void
-     */
-    public function add(IAssymetricKey $key)
-    {
-        $key->save();
-    }
-
-    /**
-     * @param IAssymetricKey $key
-     * @return void
-     */
-    public function delete(IAssymetricKey $key)
-    {
-        $key->delete();
+        return $this->entity->where('kid','=',$kid)->first();
     }
 
     /**
      * @param int $id
-     * @return IAssymetricKey
+     * @return IAsymmetricKey
      */
     public function getById($id)
     {
-        return $this->key->find($id);
+        return $this->entity->find($id);
     }
 
     /**
      * @param string $pem
-     * @return IAssymetricKey
+     * @return IAsymmetricKey
      */
     public function getByPEM($pem)
     {
-        return $this->key->where('pem_content','=',$pem)->first();
+        return $this->entity->where('pem_content','=',$pem)->first();
     }
 
     /**
      * @param string $type
      * @param string $usage
      * @params string $alg
-     * @param \DateTime $valid_from
-     * @param \DateTime $valid_to
+     * @param DateTime $valid_from
+     * @param DateTime $valid_to
      * @param int|null $owner_id
-     * @return IAssymetricKey
+     * @return IAsymmetricKey
      */
-    public function getByValidityRange($type, $usage, $alg, \DateTime $valid_from, \DateTime $valid_to, $owner_id = null)
+    public function getByValidityRange($type, $usage, $alg, DateTime $valid_from, DateTime $valid_to, $owner_id = null)
     {
         // (StartA <= EndB)  and  (EndA >= StartB)
-        $query = $this->key
+        $query = $this->entity
             ->where('type','=',$type)
             ->where('usage','=',$usage)
             ->where('alg','=',$alg)
@@ -113,21 +86,20 @@ abstract class EloquentAssymetricKeyRepository implements IAssymetricKeyReposito
      * @param int $page_size
      * @param array $filters
      * @param array $fields
-     * @return IAssymetricKey[]
+     * @return IAsymmetricKey[]
      */
     public function getAll($page_nbr = 1, $page_size = 10, array $filters = array(), array $fields = array('*'))
     {
-        DB::getPaginator()->setCurrentPage($page_nbr);
-        return $this->key->Filter($filters)->paginate($page_size, $fields);
+        return $this->entity->Filter($filters)->paginate($page_size, $fields, $pageName = 'page', $page_nbr);
     }
 
     /**
-     * @return IAssymetricKey[]
+     * @return IAsymmetricKey[]
      */
     public function getActives()
     {
-        $now = new \DateTime();
-        return $this->key
+        $now = new DateTime();
+        return $this->entity
             ->where('active','=', true)
             ->where('valid_from','<=',$now)
             ->where('valid_to','>=',$now)
@@ -139,12 +111,12 @@ abstract class EloquentAssymetricKeyRepository implements IAssymetricKeyReposito
      * @param string $usage
      * @param string $alg
      * @param int|null $owner_id
-     * @return IAssymetricKey
+     * @return IAsymmetricKey
      */
     public function getActiveByCriteria($type, $usage, $alg, $owner_id = null)
     {
-        $now = new \DateTime();
-        $query = $this->key
+        $now = new DateTime();
+        $query = $this->entity
             ->where('active','=', true)
             ->where('valid_from','<=',$now)
             ->where('valid_to','>=',$now)
diff --git a/app/repositories/EloquentClientPublicKeyRepository.php b/app/Repositories/EloquentClientPublicKeyRepository.php
similarity index 75%
rename from app/repositories/EloquentClientPublicKeyRepository.php
rename to app/Repositories/EloquentClientPublicKeyRepository.php
index ee629968..f5f67304 100644
--- a/app/repositories/EloquentClientPublicKeyRepository.php
+++ b/app/Repositories/EloquentClientPublicKeyRepository.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Repositories;
 /**
 * Copyright 2015 OpenStack Foundation
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,25 +11,21 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 **/
-
-namespace repositories;
-
-use oauth2\models\IClientPublicKey;
-use oauth2\repositories\IClientPublicKeyRepository;
-use ClientPublicKey;
-use utils\services\ILogService;
+use OAuth2\Repositories\IClientPublicKeyRepository;
+use Models\OAuth2\ClientPublicKey;
+use Utils\Services\ILogService;
 /**
  * Class EloquentClientPublicKeyRepository
- * @package repositories
+ * @package Repositories
  */
 final class EloquentClientPublicKeyRepository
-    extends EloquentAssymetricKeyRepository
+    extends EloquentAsymmetricKeyRepository
     implements IClientPublicKeyRepository
 {
 
     public function __construct(ClientPublicKey $public_key, ILogService $log_service)
     {
-        $this->key  = $public_key;
+        $this->entity       = $public_key;
         $this->log_service = $log_service;
     }
 }
\ No newline at end of file
diff --git a/app/repositories/EloquentClientRepository.php b/app/Repositories/EloquentClientRepository.php
similarity index 56%
rename from app/repositories/EloquentClientRepository.php
rename to app/Repositories/EloquentClientRepository.php
index dac8f4a5..1dbeaac0 100644
--- a/app/repositories/EloquentClientRepository.php
+++ b/app/Repositories/EloquentClientRepository.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Repositories;
 /**
 * Copyright 2015 OpenStack Foundation
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,24 +11,15 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 **/
-
-namespace repositories;
-
-use oauth2\models\IClient;
-use oauth2\repositories\IClientRepository;
-use oauth2\repositories\id;
-use Client;
-use utils\services\ILogService;
+use OAuth2\Models\IClient;
+use Models\OAuth2\Client;
+use OAuth2\Repositories\IClientRepository;
+use Utils\Services\ILogService;
 /**
  * Class EloquentClientRepository
- * @package repositories
+ * @package Repositories
  */
-final class EloquentClientRepository implements IClientRepository {
-
-    /**
-     * @var Client
-     */
-    private $client;
+final class EloquentClientRepository extends AbstractEloquentEntityRepository implements IClientRepository {
 
     /**
      * @var ILogService
@@ -40,43 +31,43 @@ final class EloquentClientRepository implements IClientRepository {
      * @param ILogService $log_service
      */
     public function __construct(Client $client, ILogService $log_service){
-        $this->client       = $client;
+        $this->entity      = $client;
         $this->log_service = $log_service;
     }
 
-    /**
-     * @param int id
-     * @return IClient
-     */
-    public function get($id)
-    {
-        return $this->client->find($id);
-    }
-
-    /**
-     * @param IClient $client
-     * @return void
-     */
-    public function add(IClient $client)
-    {
-         $client->save();
-    }
-
-    /**
-     * @param IClient $client
-     * @return void
-     */
-    public function delete(IClient $client)
-    {
-        $client->delete();
-    }
-
     /**
      * @param string $app_name
      * @return IClient
      */
     public function getByApplicationName($app_name)
     {
-        return $this->client->where('app_name', '=', trim($app_name))->first();
+        return $this->entity->where('app_name', '=', trim($app_name))->first();
+    }
+
+    /**
+     * @param string $client_id
+     * @return IClient
+     */
+    public function getClientById($client_id)
+    {
+        return $this->entity->where('client_id', '=', $client_id)->first();
+    }
+
+    /**
+     * @param int $id
+     * @return IClient
+     */
+    public function getClientByIdentifier($id)
+    {
+        return $this->entity->where('id', '=', $id)->first();
+    }
+
+    /**
+     * @param string $origin
+     * @return IClient
+     */
+    public function getByOrigin($origin)
+    {
+        return $this->entity->where('allowed_origins', 'like', '%'.$origin.'%')->first();
     }
 }
\ No newline at end of file
diff --git a/app/Repositories/EloquentMemberRepository.php b/app/Repositories/EloquentMemberRepository.php
new file mode 100644
index 00000000..0990b88b
--- /dev/null
+++ b/app/Repositories/EloquentMemberRepository.php
@@ -0,0 +1,48 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Auth\Repositories\IMemberRepository;
+use Models\Member;
+use Utils\Services\ILogService;
+/**
+ * Class EloquentMemberRepository
+ * @package Repositories
+ */
+final class EloquentMemberRepository extends AbstractEloquentEntityRepository implements IMemberRepository
+{
+
+    private $member;
+    /**
+     * @var ILogService
+     */
+    private $log_service;
+
+    /**
+     * @param Member $member
+     * @param ILogService $log_service
+     */
+    public function __construct(Member $member, ILogService $log_service)
+    {
+        $this->entity      = $member;
+        $this->log_service = $log_service;
+    }
+
+    /**
+     * @param $email
+     * @return Member
+     */
+    public function getByEmail($email)
+    {
+        return $this->entity->where('Email', '=', $email)->first();
+    }
+}
\ No newline at end of file
diff --git a/app/Repositories/EloquentOpenIdAssociationRepository.php b/app/Repositories/EloquentOpenIdAssociationRepository.php
new file mode 100644
index 00000000..620a47ee
--- /dev/null
+++ b/app/Repositories/EloquentOpenIdAssociationRepository.php
@@ -0,0 +1,40 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Repositories\IOpenIdAssociationRepository;
+use Models\OpenId\OpenIdAssociation;
+/**
+ * Class EloquentOpenIdAssociationRepository
+ * @package repositories
+ */
+class EloquentOpenIdAssociationRepository extends AbstractEloquentEntityRepository implements IOpenIdAssociationRepository
+{
+    /**
+     * EloquentOpenIdAssociationRepository constructor.
+     * @param OpenIdAssociation $association
+     */
+    public function __construct(OpenIdAssociation $association)
+    {
+        $this->entity = $association;
+    }
+
+    public function deleteById($id)
+    {
+        return $this->delete($this->get($id));
+    }
+
+    public function getByHandle($handle)
+    {
+        return $this->entity->where('identifier', '=', $handle)->first();
+    }
+}
\ No newline at end of file
diff --git a/app/Repositories/EloquentOpenIdTrustedSiteRepository.php b/app/Repositories/EloquentOpenIdTrustedSiteRepository.php
new file mode 100644
index 00000000..4d077347
--- /dev/null
+++ b/app/Repositories/EloquentOpenIdTrustedSiteRepository.php
@@ -0,0 +1,66 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Repositories\IOpenIdTrustedSiteRepository;
+use Models\OpenId\OpenIdTrustedSite;
+/**
+ * Class EloquentOpenIdTrustedSiteRepository
+ * @package Repositories
+ */
+class EloquentOpenIdTrustedSiteRepository extends AbstractEloquentEntityRepository implements IOpenIdTrustedSiteRepository
+{
+
+    /**
+     * EloquentOpenIdTrustedSiteRepository constructor.
+     * @param OpenIdTrustedSite $openid_trusted_site
+     */
+    public function __construct(OpenIdTrustedSite $openid_trusted_site)
+    {
+        $this->entity = $openid_trusted_site;
+    }
+
+    /**
+     * @param int $id
+     * @return bool
+     */
+    public function deleteById($id)
+    {
+        return $this->delete($this->get($id));
+    }
+
+    /**
+     * @param int $user_id
+     * @param array $sub_domains
+     * @param array $data
+     * @return array
+     */
+    public function getMatchingOnesByUserId($user_id, array $sub_domains, array $data)
+    {
+        $query = $this->entity->where("user_id", "=", intval($user_id));
+        //add or condition for all given sub-domains
+        if (count($sub_domains)) {
+            $query = $query->where(function ($query) use ($sub_domains) {
+                foreach ($sub_domains as $sub_domain) {
+                    $query = $query->orWhere(function ($query_aux) use ($sub_domain) {
+                        $query_aux->where('realm', '=', $sub_domain);
+                    });
+                }
+            });
+        }
+        //add conditions for all possible pre approved data
+        foreach ($data as $value) {
+            $query = $query->where("data", "LIKE", '%"' . $value . '"%');
+        }
+        return $query->get();
+    }
+}
\ No newline at end of file
diff --git a/app/Repositories/EloquentRefreshTokenRepository.php b/app/Repositories/EloquentRefreshTokenRepository.php
new file mode 100644
index 00000000..d78415bb
--- /dev/null
+++ b/app/Repositories/EloquentRefreshTokenRepository.php
@@ -0,0 +1,34 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Models\OAuth2\RefreshToken;
+use OAuth2\Repositories\IRefreshTokenRepository;
+use Utils\Services\ILogService;
+
+/**
+ * Class EloquentRefreshTokenRepository
+ * @package Repositories
+ */
+final class EloquentRefreshTokenRepository extends AbstractEloquentOAuth2TokenRepository implements IRefreshTokenRepository
+{
+    /**
+     * @param RefreshToken $entity
+     * @param ILogService $log_service
+     */
+    public function __construct(RefreshToken $entity, ILogService $log_service){
+        $this->entity      = $entity;
+        $this->log_service = $log_service;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Repositories/EloquentResourceServerRepository.php b/app/Repositories/EloquentResourceServerRepository.php
new file mode 100644
index 00000000..fdb887bd
--- /dev/null
+++ b/app/Repositories/EloquentResourceServerRepository.php
@@ -0,0 +1,73 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Models\OAuth2\ResourceServer;
+use OAuth2\Models\IResourceServer;
+use OAuth2\Repositories\IResourceServerRepository;
+
+/**
+ * Class EloquentResourceServerRepository
+ * @package Repositories
+ */
+final class EloquentResourceServerRepository
+    extends AbstractEloquentEntityRepository
+    implements IResourceServerRepository
+{
+
+    /**
+     * EloquentResourceServerRepository constructor.
+     * @param ResourceServer $entity
+     */
+    public function __construct(ResourceServer $entity){
+        $this->entity = $entity;
+    }
+
+    /**
+     * @param string $host
+     * @return IResourceServer
+     */
+    public function getByHost($host)
+    {
+        return $this->entity->whereIn('host', $host)->first();
+    }
+
+    /**
+     * @param string $ip
+     * @return IResourceServer
+     */
+    public function getByIp($ip)
+    {
+        return $this->entity->where('ips', 'like', '%' . $ip . '%')->first();
+    }
+
+    /**
+     * @param array $audience
+     * @param string $ip
+     * @return IResourceServer
+     */
+    public function getByAudienceAndIpAndActive(array $audience, $ip){
+        return $this->entity->where('ips','like', '%'.$ip.'%')
+            ->where('active', '=', true)
+            ->whereIn('host', $audience)->first();
+    }
+
+    /**
+     * @param string $name
+     * @return IResourceServer
+     */
+    public function getByFriendlyName($name)
+    {
+        return $this->entity->where('friendly_name', '=', $name)->first();
+    }
+}
\ No newline at end of file
diff --git a/app/repositories/EloquentServerPrivateKeyRepository.php b/app/Repositories/EloquentServerPrivateKeyRepository.php
similarity index 71%
rename from app/repositories/EloquentServerPrivateKeyRepository.php
rename to app/Repositories/EloquentServerPrivateKeyRepository.php
index e6eaa437..f1b0de08 100644
--- a/app/repositories/EloquentServerPrivateKeyRepository.php
+++ b/app/Repositories/EloquentServerPrivateKeyRepository.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Repositories;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,23 +11,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace repositories;
-
-use oauth2\repositories\IServerPrivateKeyRepository;
-use utils\services\ILogService;
-
+use Models\OAuth2\ServerPrivateKey;
+use OAuth2\Repositories\IServerPrivateKeyRepository;
+use Utils\Services\ILogService;
 /**
  * Class EloquentServerPrivateKeyRepository
  * @package repositories
  */
 final class EloquentServerPrivateKeyRepository
-    extends EloquentAssymetricKeyRepository
+    extends EloquentAsymmetricKeyRepository
     implements IServerPrivateKeyRepository
 {
-    public function __construct(\ServerPrivateKey $private_key, ILogService $log_service)
+    public function __construct(ServerPrivateKey $private_key, ILogService $log_service)
     {
-        $this->key  = $private_key;
+        $this->entity      = $private_key;
         $this->log_service = $log_service;
     }
 }
\ No newline at end of file
diff --git a/app/repositories/EloquentUserRepository.php b/app/Repositories/EloquentUserRepository.php
similarity index 74%
rename from app/repositories/EloquentUserRepository.php
rename to app/Repositories/EloquentUserRepository.php
index f71f59ef..a1db70ff 100644
--- a/app/repositories/EloquentUserRepository.php
+++ b/app/Repositories/EloquentUserRepository.php
@@ -1,13 +1,20 @@
-<?php
-
-namespace repositories;
-
-use auth\IUserRepository;
-use auth\User;
-use DB;
-use utils\services\ILogService;
-use \Member;
-
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Auth\Repositories\IUserRepository;
+use Auth\User;
+use Utils\Services\ILogService;
+use Models\Member;
 /**
  * Class EloquentUserRepository
  * @package repositories
@@ -15,7 +22,6 @@ use \Member;
 final class EloquentUserRepository extends AbstractEloquentEntityRepository implements IUserRepository
 {
 
-
     /**
      * @var ILogService
      */
@@ -89,7 +95,7 @@ final class EloquentUserRepository extends AbstractEloquentEntityRepository impl
     {
         $list    = array();
         $members = Member::where('Email', 'like', '%'.$term.'%')->paginate(10);
-        foreach($members->getItems() as $m)
+        foreach($members->items() as $m)
         {
             $user = $this->getByExternalId(intval($m->ID));
             if(!is_null($user))
diff --git a/app/Repositories/EloquentWhiteListedIPRepository.php b/app/Repositories/EloquentWhiteListedIPRepository.php
new file mode 100644
index 00000000..c7c3b81f
--- /dev/null
+++ b/app/Repositories/EloquentWhiteListedIPRepository.php
@@ -0,0 +1,40 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Models\IWhiteListedIPRepository;
+use Models\WhiteListedIP;
+
+/**
+ * Class EloquentWhiteListedIPRepository
+ * @package Repositories
+ */
+final class EloquentWhiteListedIPRepository
+    extends AbstractEloquentEntityRepository
+    implements IWhiteListedIPRepository
+{
+
+    public function __construct(WhiteListedIP $entity)
+    {
+        $this->entity = $entity;
+    }
+
+    /**
+     * @param string $ip
+     * @return WhiteListedIP
+     */
+    function getByIp($ip)
+    {
+        return $this->entity->where('ip','=', $ip)->first();
+    }
+}
\ No newline at end of file
diff --git a/app/Repositories/RepositoriesProvider.php b/app/Repositories/RepositoriesProvider.php
new file mode 100644
index 00000000..e12370c5
--- /dev/null
+++ b/app/Repositories/RepositoriesProvider.php
@@ -0,0 +1,131 @@
+<?php namespace Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Auth\User;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\ServiceProvider;
+use Models\OAuth2\AccessToken;
+use Models\OAuth2\Api;
+use Models\OAuth2\ApiEndpoint;
+use Models\OAuth2\ApiScope;
+use Models\OAuth2\Client;
+use Models\OAuth2\RefreshToken;
+use Models\OAuth2\ResourceServer;
+use Models\WhiteListedIP;
+use Utils\Services\UtilsServiceCatalog;
+
+/**
+ * Class RepositoriesProvider
+ * @package Repositories
+ */
+final class RepositoriesProvider extends ServiceProvider
+{
+    protected $defer = true;
+
+    public function boot(){
+    }
+
+    public function register(){
+
+        App::singleton(\OpenId\Repositories\IOpenIdAssociationRepository::class, \Repositories\EloquentOpenIdAssociationRepository::class);
+        App::singleton(\OpenId\Repositories\IOpenIdTrustedSiteRepository::class, \Repositories\EloquentOpenIdTrustedSiteRepository::class);
+
+        App::singleton(\Auth\Repositories\IUserRepository::class, function(){
+            return new CacheUserRepository
+            (
+                new EloquentUserRepository
+                (
+                    new User(),
+                    App::make(UtilsServiceCatalog::LogService)
+                )
+            );
+        });
+
+        App::singleton(\Auth\Repositories\IMemberRepository::class, \Repositories\EloquentMemberRepository::class);
+        App::singleton(\OAuth2\Repositories\IClientPublicKeyRepository::class, \Repositories\EloquentClientPublicKeyRepository::class);
+        App::singleton(\OAuth2\Repositories\IServerPrivateKeyRepository::class, \Repositories\EloquentServerPrivateKeyRepository::class);
+
+        App::singleton(\OAuth2\Repositories\IClientRepository::class, function(){
+            return new CacheClientRepository(
+                new EloquentClientRepository(new Client(), App::make(UtilsServiceCatalog::LogService))
+            );
+        });
+
+        App::singleton(\OAuth2\Repositories\IResourceServerRepository::class, function(){
+            return new CacheResourceServerRepository(new EloquentResourceServerRepository(new ResourceServer()));
+        });
+
+        App::singleton(\Models\IWhiteListedIPRepository::class, function (){
+           return new CacheWhiteListedIPRepository(new EloquentWhiteListedIPRepository(new WhiteListedIP()));
+        });
+
+        App::singleton(\OAuth2\Repositories\IApiRepository::class, function(){
+            return new CacheApiRepository(new EloquentApiRepository(new Api()));
+        });
+
+        App::singleton(\OAuth2\Repositories\IApiScopeRepository::class, function(){
+            return new CacheApiScopeRepository(new EloquentApiScopeRepository(new ApiScope()));
+        });
+
+        App::singleton(\OAuth2\Repositories\IApiEndpointRepository::class, function(){
+            return new CacheApiEndpointRepository(new EloquentApiEndpointRepository(new ApiEndpoint()));
+        });
+
+        App::singleton(\OAuth2\Repositories\IApiScopeGroupRepository::class, \Repositories\EloquentApiScopeGroupRepository::class);
+
+        App::singleton(\OAuth2\Repositories\IRefreshTokenRepository::class, function(){
+            return new CacheRefreshTokenRepository
+            (
+                new EloquentRefreshTokenRepository
+                (
+                    new RefreshToken(),
+                    App::make(UtilsServiceCatalog::LogService)
+                )
+            );
+        });
+
+        App::singleton(\OAuth2\Repositories\IAccessTokenRepository::class, function(){
+            return new CacheAccessTokenRepository
+            (
+                new EloquentAccessTokenRepository
+                (
+                    new AccessToken(),
+                    App::make(UtilsServiceCatalog::LogService)
+                )
+            );
+        });
+
+    }
+
+    public function provides()
+    {
+        return [
+            \OpenId\Repositories\IOpenIdAssociationRepository::class,
+            \OpenId\Repositories\IOpenIdTrustedSiteRepository::class,
+            \Auth\Repositories\IUserRepository::class,
+            \Auth\Repositories\IMemberRepository::class,
+            \OAuth2\Repositories\IClientPublicKeyRepository::class,
+            \OAuth2\Repositories\IServerPrivateKeyRepository::class,
+            \OAuth2\Repositories\IClientRepository::class,
+            \OAuth2\Repositories\IApiScopeGroupRepository::class,
+            \OAuth2\Repositories\IApiEndpointRepository::class,
+            \OAuth2\Repositories\IRefreshTokenRepository::class,
+            \OAuth2\Repositories\IAccessTokenRepository::class,
+            \OAuth2\Repositories\IApiScopeRepository::class,
+            \OAuth2\Repositories\IApiRepository::class,
+            \OAuth2\Repositories\IResourceServerRepository::class,
+            \Models\IWhiteListedIPRepository::class,
+        ];
+    }
+}
\ No newline at end of file
diff --git a/app/services/exceptions/ValidationException.php b/app/Services/Exceptions/ValidationException.php
similarity index 77%
rename from app/services/exceptions/ValidationException.php
rename to app/Services/Exceptions/ValidationException.php
index 6841e3a6..c8f46487 100644
--- a/app/services/exceptions/ValidationException.php
+++ b/app/Services/Exceptions/ValidationException.php
@@ -1,5 +1,4 @@
-<?php
-
+<?php namespace Services\Exceptions;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-final class ValidationException extends \Exception
+use Exception;
+/**
+ * Class ValidationException
+ * @package Services\Exceptions
+ */
+final class ValidationException extends Exception
 {
 }
\ No newline at end of file
diff --git a/app/services/facades/ExternalUrlService.php b/app/Services/Facades/ExternalUrlService.php
similarity index 88%
rename from app/services/facades/ExternalUrlService.php
rename to app/Services/Facades/ExternalUrlService.php
index 110b1172..e29d5cd9 100644
--- a/app/services/facades/ExternalUrlService.php
+++ b/app/Services/Facades/ExternalUrlService.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Services\Facades;
 /**
  * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,12 @@
  * limitations under the License.
  **/
 
-namespace services\facades;
-
 use Illuminate\Support\Facades\Facade;
 
+/**
+ * Class ExternalUrlService
+ * @package Services\Facades
+ */
 class ExternalUrlService extends Facade {
 
     protected static function getFacadeAccessor()
diff --git a/app/Services/Facades/ServerConfigurationService.php b/app/Services/Facades/ServerConfigurationService.php
new file mode 100644
index 00000000..1a5fca09
--- /dev/null
+++ b/app/Services/Facades/ServerConfigurationService.php
@@ -0,0 +1,26 @@
+<?php namespace Services\Facades;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Illuminate\Support\Facades\Facade;
+/**
+ * Class ServerConfigurationService
+ * @package Services\Facades
+ */
+class ServerConfigurationService extends Facade {
+
+    protected static function getFacadeAccessor()
+    {
+        return 'serverconfigurationservice';
+    }
+} 
\ No newline at end of file
diff --git a/app/Services/IUserActionService.php b/app/Services/IUserActionService.php
new file mode 100644
index 00000000..728ab114
--- /dev/null
+++ b/app/Services/IUserActionService.php
@@ -0,0 +1,35 @@
+<?php namespace Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+/**
+ * Interface IUserActionService
+ * @package Services
+ */
+interface IUserActionService
+{
+
+    const LoginAction       = 'LOGIN';
+    const CancelLoginAction = 'CANCEL_LOGIN';
+    const LogoutAction      = 'LOGOUT';
+    const ConsentAction     = 'CONSENT';
+
+    /**
+     * @param int $user_id
+     * @param string $ip
+     * @param string $action
+     * @param null|string $realm
+     * @return bool
+     */
+    public function addUserAction($user_id, $ip, $action, $realm = null);
+} 
\ No newline at end of file
diff --git a/app/Services/OAuth2/ApiEndpointService.php b/app/Services/OAuth2/ApiEndpointService.php
new file mode 100644
index 00000000..4f770a9a
--- /dev/null
+++ b/app/Services/OAuth2/ApiEndpointService.php
@@ -0,0 +1,273 @@
+<?php namespace Services\OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\Models\IApiEndpoint;
+use OAuth2\Repositories\IApiEndpointRepository;
+use OAuth2\Repositories\IApiScopeRepository;
+use OAuth2\Services\IApiEndpointService;
+use Models\OAuth2\ApiEndpoint;
+use OAuth2\Exceptions\InvalidApiEndpoint;
+use OAuth2\Exceptions\InvalidApiScope;
+use Utils\Db\ITransactionService;
+use Utils\Exceptions\EntityNotFoundException;
+
+/**
+ * Class ApiEndpointService
+ * @package Services\OAuth2
+ */
+class ApiEndpointService implements IApiEndpointService {
+
+    /**
+     * @var ITransactionService
+     */
+	private $tx_service;
+
+    /**
+     * @var IApiEndpointRepository
+     */
+    private $repository;
+
+    /**
+     * @var IApiScopeRepository
+     */
+    private $scope_repository;
+
+    /**
+     * ApiEndpointService constructor.
+     * @param ITransactionService $tx_service
+     * @param IApiEndpointRepository $repository
+     * @param IApiScopeRepository $scope_repository
+     */
+	public function __construct
+    (
+        ITransactionService $tx_service,
+        IApiEndpointRepository $repository,
+        IApiScopeRepository $scope_repository
+    ){
+		$this->tx_service       = $tx_service;
+        $this->repository       = $repository;
+        $this->scope_repository = $scope_repository;
+	}
+
+
+    /**
+     * Adds a new api endpoint to an existent api
+     * @param string $name
+     * @param string $description
+     * @param boolean $active
+     * @param boolean $allow_cors
+     * @param string $route
+     * @param string $http_method
+     * @param integer $api_id
+     * @param integer $rate_limit
+     * @return IApiEndpoint
+     */
+    public function add($name, $description, $active,$allow_cors, $route, $http_method, $api_id, $rate_limit)
+    {
+        return $this->tx_service->transaction(function () use ($name, $description, $active, $allow_cors, $route, $http_method, $api_id, $rate_limit) {
+
+            //check that does not exists an endpoint with same http method and same route
+
+            $former_endpoint = $this->repository->getApiEndpointByUrlAndMethodAndApi($route, $http_method, $api_id);
+
+            if(!is_null($former_endpoint))
+                throw new InvalidApiEndpoint
+                (
+                    sprintf
+                    (
+                        'there is already an endpoint api with route %s and http method %s',
+                        $route,
+                        $http_method
+                    )
+                );
+            // todo: move to factory
+            $instance = new ApiEndpoint(
+                [
+                    'name'        => $name,
+                    'description' => $description,
+                    'active'      => $active,
+                    'route'       => $route,
+                    'http_method' => $http_method,
+                    'api_id'      => $api_id,
+                    'allow_cors'  => $allow_cors,
+                    'rate_limit'  => (int)$rate_limit,
+                ]
+            );
+
+            $this->repository->add($instance);
+        });
+
+    }
+
+    /**
+     * @param int $id
+     * @param array $params
+     * @return bool
+     * @throws EntityNotFoundException
+     * @throws InvalidApiEndpoint
+     */
+    public function update($id, array $params){
+
+	    return $this->tx_service->transaction(function () use ($id, $params){
+            $endpoint = $this->repository->get($id);
+
+            if(is_null($endpoint))
+                throw new EntityNotFoundException(sprintf('api endpoint id %s does not exists!', $id));
+
+            $allowed_update_params = ['name','description','active','route','http_method','allow_cors', 'rate_limit'];
+
+            foreach($allowed_update_params as $param){
+                if(array_key_exists($param,$params)){
+                    $endpoint->{$param} = $params[$param];
+                }
+            }
+
+            //check that does not exists an endpoint with same http method and same route
+            $former_endpoint = $this->repository->getApiEndpointByUrlAndMethodAndApi
+            (
+                $endpoint->route,
+                $endpoint->http_method,
+                $endpoint->api_id
+            );
+
+            if(!is_null($former_endpoint) && $former_endpoint->id != $endpoint->id)
+                throw new InvalidApiEndpoint
+                (
+                    sprintf
+                    (
+                        'there is already an endpoint api with route %s and http method %s',
+                        $endpoint->route,
+                        $endpoint->http_method
+                    )
+                );
+
+            return true;
+        });
+    }
+
+    /**
+     * Adds a new required scope to a given api endpoint,
+     * given scope must belongs to owner api of the given endpoint
+     * @param int $api_endpoint_id
+     * @param int $scope_id
+     * @return boolean
+     * @throws InvalidApiScope
+     * @throws EntityNotFoundException
+     * @throws InvalidApiEndpoint
+     */
+    public function addRequiredScope($api_endpoint_id, $scope_id)
+    {
+
+	    return $this->tx_service->transaction(function () use($api_endpoint_id, $scope_id){
+
+            $api_endpoint = $this->repository->get($api_endpoint_id);
+
+            if(is_null($api_endpoint))
+                throw new EntityNotFoundException(sprintf("api endpoint id %s does not exists!.",$api_endpoint_id));
+
+            $scope        = $this->scope_repository->get($scope_id);
+
+            if(is_null($scope))
+                throw new InvalidApiScope(sprintf("api scope id %s does not exists!.", $scope_id));
+
+            if($scope->api_id != $api_endpoint->api_id)
+                throw new InvalidApiScope(sprintf("api scope id %s does not belong to api id %s !.",$scope_id,$api_endpoint->api_id));
+
+            $res = $api_endpoint->scopes()->where('id', '=' , $scope_id)->count();
+
+            if($res > 0)
+                throw new InvalidApiScope(sprintf("api scope id %s already belongs to endpoint id %s!.",$scope_id,$api_endpoint->id));
+
+            $api_endpoint->scopes()->attach($scope_id);
+
+            return true;
+        });
+    }
+
+
+    /**
+     * Removes a required scope to a given api endpoint,
+     * given scope must belongs to owner api of the given endpoint
+     * @param int $api_endpoint_id
+     * @param int $scope_id
+     * @return boolean
+     * @throws InvalidApiScope
+     * @throws InvalidApiEndpoint
+     * @throws EntityNotFoundException
+     */
+    public function removeRequiredScope($api_endpoint_id, $scope_id)
+    {
+
+        $res = false;
+
+	    $this->tx_service->transaction(function () use($api_endpoint_id, $scope_id,&$res){
+
+            $api_endpoint = $this->repository->get($api_endpoint_id);
+
+            if(is_null($api_endpoint))
+                throw new EntityNotFoundException(sprintf("api endpoint id %s does not exists!.",$api_endpoint_id));
+
+            $scope        = $this->scope_repository->get($scope_id);
+
+            if(is_null($scope))
+                throw new InvalidApiScope(sprintf("api scope id %s does not exists!.",$scope_id));
+
+            if($scope->api_id !== $api_endpoint->api_id)
+                throw new InvalidApiScope(sprintf("api scope id %s does not belongs to api id %s!.",$scope_id,$api_endpoint->api_id));
+
+            $res = $api_endpoint->scopes()->where('id','=',$scope_id)->count();
+
+            if($res==0)
+                throw new InvalidApiScope(sprintf("api scope id %s does not belongs to endpoint id %s !.",$scope_id,$api_endpoint->id));
+
+            $api_endpoint->scopes()->detach($scope_id);
+
+            $res = true;
+        });
+        return $res;
+    }
+
+    /**
+     * deletes a given api endpoint
+     * @param int $id
+     * @return boolean
+     * @throws EntityNotFoundException
+     */
+    public function delete($id)
+    {
+	    return $this->tx_service->transaction(function () use ($id) {
+            $endpoint = $this->repository->get($id);
+            if(is_null($endpoint)) throw new EntityNotFoundException();
+            $this->repository->delete($endpoint);
+            return true;
+        });
+    }
+
+    /**
+     * @param int $id
+     * @param boolean $active
+     * @return boolean
+     * @throws EntityNotFoundException
+     */
+    public function setStatus($id, $active)
+    {
+	    return $this->tx_service->transaction(function () use ($id, $active) {
+            $endpoint = $this->repository->get($id);
+            if(is_null($endpoint)) throw new EntityNotFoundException();
+            $endpoint->active = $active;
+            $this->repository->add($endpoint);
+            return true;
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/services/oauth2/ApiScopeGroupService.php b/app/Services/OAuth2/ApiScopeGroupService.php
similarity index 77%
rename from app/services/oauth2/ApiScopeGroupService.php
rename to app/Services/OAuth2/ApiScopeGroupService.php
index ff7f9021..69917833 100644
--- a/app/services/oauth2/ApiScopeGroupService.php
+++ b/app/Services/OAuth2/ApiScopeGroupService.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace Services\OAuth2;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,22 +12,21 @@
  * limitations under the License.
  **/
 
-namespace services\oauth2;
-
-use auth\IUserRepository;
-use oauth2\exceptions\InvalidApiScopeGroup;
-use oauth2\models\IApiScopeGroup;
-use oauth2\services\IApiScopeGroupService;
-use oauth2\repositories\IApiScopeGroupRepository;
-use oauth2\services\IApiScopeService;
-use utils\exceptions\EntityNotFoundException;
-use utils\services\ILogService;
-use utils\db\ITransactionService;
-use ApiScopeGroup;
+use Auth\Repositories\IUserRepository;
+use OAuth2\Exceptions\InvalidApiScopeGroup;
+use OAuth2\Models\IApiScopeGroup;
+use OAuth2\Repositories\IApiScopeRepository;
+use OAuth2\Services\IApiScopeGroupService;
+use OAuth2\Repositories\IApiScopeGroupRepository;
+use OAuth2\Services\IApiScopeService;
+use Utils\Exceptions\EntityNotFoundException;
+use Utils\Services\ILogService;
+use Utils\Db\ITransactionService;
+use Models\OAuth2\ApiScopeGroup;
 
 /**
  * Class ApiScopeGroupService
- * @package services\oauth2
+ * @package Services\OAuth2
  */
 final class ApiScopeGroupService implements IApiScopeGroupService
 {
@@ -57,21 +56,28 @@ final class ApiScopeGroupService implements IApiScopeGroupService
      */
     private $scope_service;
 
+    /**
+     * @var IApiScopeRepository
+     */
+    private $scope_repository;
+
 
     public function __construct
     (
         IApiScopeGroupRepository $repository,
         IApiScopeService $scope_service,
         IUserRepository $user_repository,
+        IApiScopeRepository $scope_repository,
         ITransactionService $tx_service,
         ILogService $log_service
     )
     {
-        $this->log_service     = $log_service;
-        $this->repository      = $repository;
-        $this->user_repository = $user_repository;
-        $this->scope_service   = $scope_service;
-        $this->tx_service      = $tx_service;
+        $this->log_service      = $log_service;
+        $this->repository       = $repository;
+        $this->user_repository  = $user_repository;
+        $this->scope_service    = $scope_service;
+        $this->scope_repository = $scope_repository;
+        $this->tx_service       = $tx_service;
     }
 
     public function update($id, array $params)
@@ -82,7 +88,7 @@ final class ApiScopeGroupService implements IApiScopeGroupService
 
         return $this->tx_service->transaction(function () use ($id, $params, $repository, $scope_service, $user_repository) {
 
-            $group = ApiScopeGroup::find($id);
+            $group = $repository->get($id);
 
             if (is_null($group))
             {
@@ -98,7 +104,8 @@ final class ApiScopeGroupService implements IApiScopeGroupService
 
                     if ($param == 'name')
                     {
-                        if (ApiScopeGroup::where('name', '=', $params[$param])->where('id', '<>', $id)->count() > 0)
+                        $older_group = $repository->getByName($params[$param]);
+                        if(!is_null($older_group) && $older_group->id != $id)
                         {
                             throw new InvalidApiScopeGroup(sprintf('there is already another api scope group name (%s).', $params[$param]));
                         }
@@ -110,7 +117,7 @@ final class ApiScopeGroupService implements IApiScopeGroupService
                         $scopes = explode(',', $params['scopes']);
                         foreach($scopes as $scope_id)
                         {
-                            $scope = $scope_service->get(intval($scope_id));
+                            $scope = $this->scope_repository->get(intval($scope_id));
                             if(is_null($scope)) throw new EntityNotFoundException(sprintf('scope %s not found.',$scope_id));
                             $group->addScope($scope);
                         }
@@ -141,7 +148,12 @@ final class ApiScopeGroupService implements IApiScopeGroupService
      */
     public function setStatus($id, $status)
     {
-        return ApiScopeGroup::find($id)->update(array('active' => $status));
+        $this->tx_service->transaction(function() use($id, $status){
+            $group = $this->repository->get($id);
+            if(is_null($group)) return;
+            $group->active = $status;
+            $this->repository->add($group);
+        });
     }
 
     /**
@@ -172,6 +184,7 @@ final class ApiScopeGroupService implements IApiScopeGroupService
                 throw new InvalidApiScopeGroup(sprintf('there is already another group with that name (%s).', $name));
             }
 
+            // todo : move to factory
             $repository->add($instance = new ApiScopeGroup
             (
                 array
@@ -186,7 +199,7 @@ final class ApiScopeGroupService implements IApiScopeGroupService
             $users  = explode(',', $users);
             foreach($scopes as $scope_id)
             {
-                $scope = $scope_service->get(intval($scope_id));
+                $scope = $this->scope_repository->get(intval($scope_id));
                 if(is_null($scope)) throw new EntityNotFoundException(sprintf('scope %s not found.',$scope_id));
                 $instance->addScope($scope);
             }
diff --git a/app/services/oauth2/ApiScopeService.php b/app/Services/OAuth2/ApiScopeService.php
similarity index 57%
rename from app/services/oauth2/ApiScopeService.php
rename to app/Services/OAuth2/ApiScopeService.php
index cdaa5ef0..01818e52 100644
--- a/app/services/oauth2/ApiScopeService.php
+++ b/app/Services/OAuth2/ApiScopeService.php
@@ -1,40 +1,66 @@
-<?php
+<?php namespace Services\OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-namespace services\oauth2;
-
-use Api;
-use ApiScope;
-use DB;
-use oauth2\exceptions\InvalidApi;
-use oauth2\exceptions\InvalidApiScope;
-use oauth2\models\IApiScope;
-use oauth2\services\IApiScopeService;
-use utils\db\ITransactionService;
+use Models\OAuth2\ApiScope;
+use Illuminate\Support\Facades\DB;
+use OAuth2\Exceptions\InvalidApi;
+use OAuth2\Exceptions\InvalidApiScope;
+use OAuth2\Models\IApiScope;
+use OAuth2\Repositories\IApiRepository;
+use OAuth2\Repositories\IApiScopeRepository;
+use OAuth2\Services\IApiScopeService;
+use Utils\Db\ITransactionService;
+use Utils\Exceptions\EntityNotFoundException;
 
 /**
  * Class ApiScopeService
- * @package services\oauth2
+ * @package Services\OAuth2
  */
 final class ApiScopeService implements IApiScopeService
 {
 
+    /**
+     * @var ITransactionService
+     */
     private $tx_service;
 
     /**
-     * @param ITransactionService $tx_service
+     * @var IApiScopeRepository
      */
-    public function __construct(ITransactionService $tx_service)
-    {
-        $this->tx_service = $tx_service;
-    }
+    private $repository;
 
     /**
-     * @param array $scopes_names
-     * @return mixed
+     * @var IApiRepository
      */
-    public function getScopesByName(array $scopes_names)
+    private $api_repository;
+
+    /**
+     * ApiScopeService constructor.
+     * @param ITransactionService $tx_service
+     * @param IApiScopeRepository $repository
+     * @param IApiRepository $api_repository
+     */
+    public function __construct
+    (
+        ITransactionService $tx_service,
+        IApiScopeRepository $repository,
+        IApiRepository $api_repository
+    )
     {
-        return ApiScope::where('active', '=', true)->whereIn('name', $scopes_names)->get();
+        $this->tx_service     = $tx_service;
+        $this->repository     = $repository;
+        $this->api_repository = $api_repository;
     }
 
     /**
@@ -54,13 +80,8 @@ final class ApiScopeService implements IApiScopeService
      */
     public function getAvailableScopes($system = false, $assigned_by_groups = false)
     {
-        $scopes = ApiScope
-            ::with('api')
-            ->with('api.resource_server')
-            ->where('active', '=', true)
-            ->orderBy('api_id')->get();
-
-        $res = array();
+        $res    = [];
+        $scopes = $this->repository->getActives();
 
         foreach ($scopes as $scope)
         {
@@ -72,7 +93,7 @@ final class ApiScopeService implements IApiScopeService
                 if ($scope->assigned_by_groups && !$assigned_by_groups) {
                     continue;
                 }
-                array_push($res, $scope);
+                $res[] = $scope;
             }
         }
 
@@ -85,11 +106,11 @@ final class ApiScopeService implements IApiScopeService
      */
     public function getAudienceByScopeNames(array $scopes_names)
     {
-        $scopes = $this->getScopesByName($scopes_names);
-        $audience = array();
+        $scopes   = $this->repository->getByName($scopes_names);
+        $audience = [];
         foreach ($scopes as $scope) {
-            $api = $scope->api()->first();
-            $resource_server = !is_null($api) ? $api->resource_server()->first() : null;
+            $api = $scope->getApi();
+            $resource_server = !is_null($api) ? $api->getResourceServer() : null;
             if (!is_null($resource_server) && !array_key_exists($resource_server->host, $audience)) {
                 $audience[$resource_server->host] = $resource_server->ip;
             }
@@ -114,60 +135,22 @@ final class ApiScopeService implements IApiScopeService
         return $audience;
     }
 
-    /**
-     * gets an api scope by id
-     * @param $id id of api scope
-     * @return IApiScope
-     */
-    public function get($id)
-    {
-        return ApiScope::find($id);
-    }
-
-    /**
-     * @param int $page_nbr
-     * @param int $page_size
-     * @param array $filters
-     * @param array $fields
-     * @return mixed
-     */
-    public function getAll($page_nbr = 1, $page_size = 10, array $filters = array(), array $fields = array('*'))
-    {
-        DB::getPaginator()->setCurrentPage($page_nbr);
-
-        return ApiScope::Filter($filters)->paginate($page_size, $fields);
-    }
-
-    /**
-     * @param IApiScope $scope
-     * @return bool
-     */
-    public function save(IApiScope $scope)
-    {
-        if (!$scope->exists() || count($scope->getDirty()) > 0) {
-            return $scope->Save();
-        }
-
-        return true;
-    }
-
     /**
      * @param $id
      * @param array $params
      * @return bool
-     * @throws \oauth2\exceptions\InvalidApiScope
+     * @throws InvalidApiScope
+     * @throws EntityNotFoundException
      */
     public function update($id, array $params)
     {
-        $res = false;
-        $this_var = $this;
 
-        $this->tx_service->transaction(function () use ($id, $params, &$res, &$this_var) {
+        return $this->tx_service->transaction(function () use ($id, $params) {
 
             //check that scope exists...
-            $scope = ApiScope::find($id);
+            $scope = $this->repository->get($id);
             if (is_null($scope)) {
-                throw new InvalidApiScope(sprintf('scope id %s does not exists!', $id));
+                throw new EntityNotFoundException(sprintf('scope id %s does not exists!', $id));
             }
 
             $allowed_update_params = array('name', 'description', 'short_description', 'active', 'system', 'default', 'assigned_by_groups');
@@ -177,7 +160,9 @@ final class ApiScopeService implements IApiScopeService
 
                     if ($param == 'name') {
                         //check if we have a former scope with selected name
-                        if (ApiScope::where('name', '=', $params[$param])->where('id', '<>', $id)->count() > 0) {
+                        $former_scope = $this->repository->getByName($params[$param]);
+
+                        if (!is_null($former_scope) && $former_scope->id != $id) {
                             throw new InvalidApiScope(sprintf('scope name %s already exists!', $params[$param]));
                         }
                     }
@@ -185,48 +170,49 @@ final class ApiScopeService implements IApiScopeService
                     $scope->{$param} = $params[$param];
                 }
             }
-            $res = $this_var->save($scope);
+
+            $this->repository->add($scope);
+            return true;
         });
 
-        return $res;
     }
 
-
     /**
-     * sets api scope status (active/deactivated)
-     * @param \oauth2\services\id $id
-     * @param bool $status
-     * @throws \oauth2\exceptions\InvalidApiScope
+     * @param int $id
+     * @param bool $active
+     * @return bool
+     * @throws EntityNotFoundException
      */
     public function setStatus($id, $active)
     {
-        $scope = ApiScope::find($id);
-        if (is_null($scope)) {
-            throw new InvalidApiScope(sprintf('scope id %s does not exists!', $id));
-        }
+        return $this->tx_service->transaction(function() use($id, $active){
+            //check that scope exists...
+            $scope = $this->repository->get($id);
+            if (is_null($scope)) {
+                throw new EntityNotFoundException(sprintf('scope id %s does not exists!', $id));
+            }
+            $scope->active = $active;
+            $this->repository->add($scope);
+            return true;
+        });
 
-        return $scope->update(array('active' => $active));
     }
 
     /**
-     * deletes an api scope
-     * @param $id id of api scope
+     * @param int $id
      * @return bool
+     * @throws EntityNotFoundException
      */
     public function delete($id)
     {
-        $res = false;
-        $this->tx_service->transaction(function () use ($id, &$res) {
-
-            $scope = ApiScope::find($id);
+        return $this->tx_service->transaction(function () use ($id) {
+            $scope = $this->repository->get($id);
             if (is_null($scope)) {
-                throw new InvalidApiScope(sprintf('scope id %s does not exists!', $id));
+                throw new EntityNotFoundException(sprintf('scope id %s does not exists!', $id));
             }
-
-            $res = $scope->delete();
+            $this->repository->delete($scope);
+            return true;
         });
-
-        return $res;
     }
 
     /**
@@ -239,7 +225,7 @@ final class ApiScopeService implements IApiScopeService
      * @param $system
      * @param $api_id
      * @param $assigned_by_groups
-     * @throws \oauth2\exceptions\InvalidApi
+     * @throws InvalidApi
      * @return IApiScope
      */
     public function add($name, $short_description, $description, $active, $default, $system, $api_id, $assigned_by_groups)
@@ -257,16 +243,18 @@ final class ApiScopeService implements IApiScopeService
             &$instance
         ) {
 
+            $api = $this->api_repository->get($api_id);
             // check if api exists...
-            if (is_null(Api::find($api_id))) {
+            if (is_null($api)) {
                 throw new InvalidApi(sprintf('api id %s does not exists!.', $api_id));
             }
 
+            $former_scopes = $this->repository->getByName([$name]);
             //check if we have a former scope with selected name
-            if (ApiScope::where('name', '=', $name)->count() > 0) {
+            if ($former_scopes->count() > 0) {
                 throw new InvalidApiScope(sprintf('scope name %s not allowed.', $name));
             }
-
+            // todo : move to factory
             $instance = new ApiScope
             (
                 array
@@ -282,39 +270,23 @@ final class ApiScopeService implements IApiScopeService
                 )
             );
 
-            $instance->Save();
+            $this->repository->add($instance);
         });
 
         return $instance;
     }
 
-    /**
-     * @return mixed
-     */
-    public function getDefaultScopes()
-    {
-        return $scopes = ApiScope::where('default', '=', true)->where('active', '=', true)->get(array('id'));
-    }
-
     /**
      * @return mixed
      */
     public function getAssignedByGroups()
     {
-        $scopes = ApiScope
-            ::with('api')
-            ->with('api.resource_server')
-            ->where('active', '=', true)
-            ->where('assigned_by_groups', '=', true)
-            ->orderBy('api_id')->get();
-
-        $res = array();
-
-        foreach ($scopes as $scope)
+        $res = [];
+        foreach ($this->repository->getAssignableByGroups() as $scope)
         {
             $api = $scope->api()->first();
             if (!is_null($api) && $api->resource_server()->first()->active && $api->active) {
-                array_push($res, $scope);
+                $res[] = $scope;
             }
         }
 
diff --git a/app/Services/OAuth2/ApiService.php b/app/Services/OAuth2/ApiService.php
new file mode 100644
index 00000000..863e52ce
--- /dev/null
+++ b/app/Services/OAuth2/ApiService.php
@@ -0,0 +1,164 @@
+<?php namespace Services\OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\Models\IApi;
+use Models\OAuth2\Api;
+use OAuth2\Repositories\IApiRepository;
+use OAuth2\Services\IApiService;
+use OAuth2\Exceptions\InvalidApi;
+use Utils\Db\ITransactionService;
+use Utils\Exceptions\EntityNotFoundException;
+
+/**
+ * Class ApiService
+ * @package Services\OAuth2
+ */
+class ApiService implements IApiService {
+
+    /**
+     * @var ITransactionService
+     */
+	private $tx_service;
+
+    /**
+     * @var IApiRepository
+     */
+    private $repository;
+
+    /**
+     * ApiService constructor.
+     * @param IApiRepository $repository
+     * @param ITransactionService $tx_service
+     */
+	public function __construct
+    (
+        IApiRepository $repository,
+        ITransactionService $tx_service
+    ){
+        $this->repository = $repository;
+		$this->tx_service = $tx_service;
+	}
+
+    /**
+     * @param int $id
+     * @return bool
+     * @throws EntityNotFoundException
+     */
+    public function delete($id)
+    {
+
+	    return $this->tx_service->transaction(function () use ($id) {
+            $api = $this->repository->get($id);
+            if(is_null($api)) throw new EntityNotFoundException();
+            $this->repository->delete($api);
+            return true;
+        });
+
+    }
+
+    /**
+     * @param $name
+     * @param $description
+     * @param $active
+     * @param $resource_server_id
+     * @return null|IApi
+     */
+    public function add($name, $description, $active, $resource_server_id)
+    {
+
+        if(is_string($active)){
+            $active = strtoupper($active) == 'TRUE' ? true : false;
+        }
+
+	    return $this->tx_service->transaction(function () use ($name, $description, $active, $resource_server_id ) {
+
+            $former_api = $this->repository->getByNameAndResourceServer($name, $resource_server_id);
+            if(!is_null($former_api))
+                throw new InvalidApi(sprintf('api name %s already exists!',$name));
+            // todo : move to factory
+            $instance = new Api(
+                [
+                    'name'               => $name,
+                    'description'        => $description,
+                    'active'             => $active,
+                    'resource_server_id' => $resource_server_id
+                ]
+            );
+
+            $this->repository->add($instance);
+
+            return $instance;
+        });
+
+    }
+
+    /**
+     * @param $id
+     * @param array $params
+     * @return bool
+     * @throws EntityNotFoundException
+     * @throws InvalidApi
+     */
+    public function update($id, array $params){
+
+
+	    return $this->tx_service->transaction(function () use ($id,$params) {
+
+            $api = $this->repository->get($id);
+            if(is_null($api))
+                throw new EntityNotFoundException(sprintf('api id %s does not exists!', $id));
+
+            $allowed_update_params = ['name','description','active'];
+            foreach($allowed_update_params as $param){
+                if(array_key_exists($param,$params)){
+
+                    if($param=='name'){
+                        $former_api = $this->repository->getByNameAndResourceServer($params[$param], $api->resource_server_id);
+                        if(!is_null($former_api) && $former_api->id != $id )
+                            throw new InvalidApi(sprintf('api name %s already exists!', $params[$param]));
+                    }
+
+                    $api->{$param} = $params[$param];
+                }
+            }
+
+            $this->repository->add($api);
+            return true;
+        });
+
+    }
+
+    /**
+     * @param int $id
+     * @param bool $active
+     * @return bool
+     * @throws EntityNotFoundException
+     */
+    public function setStatus($id, $active)
+    {
+        return $this->tx_service->transaction(function() use($id, $active){
+
+            $api = $this->repository->get($id);
+
+            if(is_null($api))
+                throw new EntityNotFoundException(sprintf('api id %s does not exists!', $id));
+
+            $api->active = $active;
+
+            $this->repository->add($api);
+
+            return true;
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/services/oauth2/AssymetricKeyService.php b/app/Services/OAuth2/AsymmetricKeyService.php
similarity index 85%
rename from app/services/oauth2/AssymetricKeyService.php
rename to app/Services/OAuth2/AsymmetricKeyService.php
index 28b9c28b..e876a938 100644
--- a/app/services/oauth2/AssymetricKeyService.php
+++ b/app/Services/OAuth2/AsymmetricKeyService.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace Services\OAuth2;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,14 +12,15 @@
  * limitations under the License.
  **/
 
-namespace services\oauth2;
+use Utils\Db\ITransactionService;
+use OAuth2\Repositories\IAsymmetricKeyRepository;
+use OAuth2\Models\IAsymmetricKey;
 
-use utils\db\ITransactionService;
-use oauth2\repositories\IAssymetricKeyRepository;
-use oauth2\models\IAssymetricKey;
-use DB;
-
-abstract class AssymetricKeyService
+/**
+ * Class AsymmetricKeyService
+ * @package Services\OAuth2
+ */
+abstract class AsymmetricKeyService
 {
     /**
      * @var ITransactionService
@@ -27,12 +28,12 @@ abstract class AssymetricKeyService
     protected $tx_service;
 
     /**
-     * @var IAssymetricKeyRepository
+     * @var IAsymmetricKeyRepository
      */
     protected $repository;
 
     public function __construct(
-        IAssymetricKeyRepository $repository,
+        IAsymmetricKeyRepository $repository,
         ITransactionService $tx_service)
     {
         $this->tx_service        = $tx_service;
@@ -41,7 +42,7 @@ abstract class AssymetricKeyService
 
     /**
      * @param array $params
-     * @return IAssymetricKey
+     * @return IAsymmetricKey
      */
     abstract public function register(array $params);
 
@@ -82,8 +83,6 @@ abstract class AssymetricKeyService
                 return false;
             }
 
-            $owner_id  = $key->oauth2_client_id;
-
             $key_active = $repository->getActiveByCriteria($key->getType(), $key->getUse(), $key->getAlg()->getName());
 
             if($key_active && $params['active'] === true)
@@ -108,5 +107,4 @@ abstract class AssymetricKeyService
         });
     }
 
-
 }
\ No newline at end of file
diff --git a/app/services/oauth2/ClientCrendentialGenerator.php b/app/Services/OAuth2/ClientCredentialGenerator.php
similarity index 60%
rename from app/services/oauth2/ClientCrendentialGenerator.php
rename to app/Services/OAuth2/ClientCredentialGenerator.php
index 9d2801c6..c9999813 100644
--- a/app/services/oauth2/ClientCrendentialGenerator.php
+++ b/app/Services/OAuth2/ClientCredentialGenerator.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace Services\OAuth2;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,19 +12,18 @@
  * limitations under the License.
  **/
 
-namespace services\oauth2;
-
-use oauth2\models\IClient;
-use oauth2\OAuth2Protocol;
-use oauth2\services\IClientCrendentialGenerator;
-use oauth2\services\voud;
+use OAuth2\Models\IClient;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Services\IClientCredentialGenerator;
 use Zend\Math\Rand;
+use DateTime;
+use DateInterval;
 
 /**
- * Class ClientCrendentialGenerator
- * @package services\oauth2
+ * Class ClientCredentialGenerator
+ * @package Services\OAuth2
  */
-final class ClientCrendentialGenerator implements IClientCrendentialGenerator
+final class ClientCredentialGenerator implements IClientCredentialGenerator
 {
 
     /**
@@ -35,14 +34,14 @@ final class ClientCrendentialGenerator implements IClientCrendentialGenerator
     public function generate(IClient $client, $only_secret = false)
     {
         if(!$only_secret)
-            $client->client_id = Rand::getString(32, OAuth2Protocol::VsChar, true) . '.openstack.client';
+            $client->client_id = Rand::getString(32, OAuth2Protocol::VsChar, true) . IClientCredentialGenerator::ClientSuffix;
 
         if ($client->client_type === IClient::ClientType_Confidential)
         {
-            $now = new \DateTime();
-            $client->client_secret = Rand::getString(64, OAuth2Protocol::VsChar, true);
+            $now                              = new DateTime();
+            $client->client_secret            = Rand::getString(64, OAuth2Protocol::VsChar, true);
             // default 6 months
-            $client->client_secret_expires_at = $now->add( new \DateInterval('P6M'));
+            $client->client_secret_expires_at = $now->add( new DateInterval('P6M'));
         }
         return $client;
     }
diff --git a/app/services/oauth2/ClienPublicKeyService.php b/app/Services/OAuth2/ClientPublicKeyService.php
similarity index 58%
rename from app/services/oauth2/ClienPublicKeyService.php
rename to app/Services/OAuth2/ClientPublicKeyService.php
index a3487c64..8e3fbff7 100644
--- a/app/services/oauth2/ClienPublicKeyService.php
+++ b/app/Services/OAuth2/ClientPublicKeyService.php
@@ -1,34 +1,32 @@
-<?php
+<?php namespace Services\OAuth2;
 /**
-* Copyright 2015 OpenStack Foundation
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-**/
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-namespace services\oauth2;
+use OAuth2\Models\IAsymmetricKey;
+use OAuth2\Services\IClientPublicKeyService;
+use Utils\Db\ITransactionService;
+use OAuth2\Repositories\IClientPublicKeyRepository;
+use Models\OAuth2\ClientPublicKey;
+use OAuth2\Repositories\IClientRepository;
+use Services\Exceptions\ValidationException;
+use Utils\Services\IAuthService;
+use DateTime;
 
-use oauth2\models\IAssymetricKey;
-use oauth2\models\IClientPublicKey;
-use oauth2\services\IClienPublicKeyService;
-use utils\db\ITransactionService;
-use oauth2\repositories\IClientPublicKeyRepository;
-use ClientPublicKey;
-use oauth2\repositories\IClientRepository;
-use DB;
-use ValidationException;
-use utils\services\IAuthService;
 /**
- * Class ClienPublicKeyService
- * @package services\oauth2
+ * Class ClientPublicKeyService
+ * @package Services\OAuth2
  */
-final class ClienPublicKeyService extends AssymetricKeyService implements IClienPublicKeyService
+final class ClientPublicKeyService extends AsymmetricKeyService implements IClientPublicKeyService
 {
 
     /**
@@ -41,6 +39,13 @@ final class ClienPublicKeyService extends AssymetricKeyService implements IClien
      */
     private $auth_service;
 
+    /**
+     * ClientPublicKeyService constructor.
+     * @param IClientPublicKeyRepository $repository
+     * @param IClientRepository $client_repository
+     * @param IAuthService $auth_service
+     * @param ITransactionService $tx_service
+     */
     public function __construct(
         IClientPublicKeyRepository $repository,
         IClientRepository          $client_repository,
@@ -48,20 +53,23 @@ final class ClienPublicKeyService extends AssymetricKeyService implements IClien
         ITransactionService        $tx_service
     )
     {
+        parent::__construct($repository, $tx_service);
+
         $this->client_repository = $client_repository;
         $this->auth_service      = $auth_service;
-        parent::__construct($repository, $tx_service);
+
     }
 
     /**
      * @param array $params
-     * @return IAssymetricKey
+     * @return IAsymmetricKey
      */
     public function register(array $params)
     {
         $client_repository = $this->client_repository;
         $repository        = $this->repository;
         $auth_service      = $this->auth_service;
+
         return $this->tx_service->transaction(function() use($params, $repository, $client_repository, $auth_service)
         {
 
@@ -86,8 +94,8 @@ final class ClienPublicKeyService extends AssymetricKeyService implements IClien
                 ->where('type','=', $params['type'])
                 ->where('usage','=', $params['usage'])
                 ->where('alg','=', $params['alg'])
-                ->where('valid_from','<=',new \DateTime($params['valid_to']))
-                ->where('valid_to','>=', new \DateTime($params['valid_from']))
+                ->where('valid_from','<=',new DateTime($params['valid_to']))
+                ->where('valid_to','>=', new DateTime($params['valid_from']))
                 ->first();
 
             $public_key = ClientPublicKey::buildFromPEM
@@ -98,8 +106,8 @@ final class ClienPublicKeyService extends AssymetricKeyService implements IClien
                 $params['pem_content'],
                 $params['alg'],
                 $old_key_active ? false : $params['active'],
-                new \DateTime($params['valid_from']),
-                new \DateTime($params['valid_to'])
+                new DateTime($params['valid_from']),
+                new DateTime($params['valid_to'])
             );
 
             $client->addPublicKey($public_key);
diff --git a/app/services/oauth2/ClientService.php b/app/Services/OAuth2/ClientService.php
similarity index 60%
rename from app/services/oauth2/ClientService.php
rename to app/Services/OAuth2/ClientService.php
index 31fc78bd..ff98014f 100644
--- a/app/services/oauth2/ClientService.php
+++ b/app/Services/OAuth2/ClientService.php
@@ -1,39 +1,48 @@
-<?php
+<?php namespace Services\OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-namespace services\oauth2;
-
-use auth\IUserRepository;
-use Client;
-use DB;
-use Event;
-use Input;
-use oauth2\exceptions\AbsentClientException;
-use oauth2\exceptions\InvalidApiScope;
-use oauth2\exceptions\InvalidClientAuthMethodException;
-use oauth2\exceptions\InvalidClientType;
-use oauth2\exceptions\MissingClientAuthorizationInfo;
-use oauth2\models\ClientAssertionAuthenticationContext;
-use oauth2\models\ClientAuthenticationContext;
-use oauth2\models\ClientCredentialsAuthenticationContext;
-use oauth2\models\IClient;
-use oauth2\OAuth2Protocol;
-use oauth2\services\IApiScope;
-use oauth2\services\IApiScopeService;
-use oauth2\services\IClientCrendentialGenerator;
-use oauth2\services\IClientService;
-use oauth2\services\id;
+use Auth\Repositories\IUserRepository;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Request;
+use Models\OAuth2\Client;
+use OAuth2\Exceptions\AbsentClientException;
+use OAuth2\Exceptions\InvalidApiScope;
+use OAuth2\Exceptions\InvalidClientAuthMethodException;
+use OAuth2\Exceptions\InvalidClientType;
+use OAuth2\Exceptions\MissingClientAuthorizationInfo;
+use OAuth2\Factories\IOAuth2ClientFactory;
+use OAuth2\Models\ClientAssertionAuthenticationContext;
+use OAuth2\Models\ClientAuthenticationContext;
+use OAuth2\Models\ClientCredentialsAuthenticationContext;
+use OAuth2\Models\IClient;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Repositories\IApiScopeRepository;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Services\IApiScopeService;
+use OAuth2\Services\IClientCredentialGenerator;
+use OAuth2\Services\IClientService;
+use Services\Exceptions\ValidationException;
 use URL\Normalizer;
-use utils\db\ITransactionService;
-use utils\exceptions\EntityNotFoundException;
-use utils\http\HttpUtils;
-use utils\services\IAuthService;
-use openid\model\IOpenIdUser;
-use oauth2\repositories\IClientRepository;
-use oauth2\factories\IOAuth2ClientFactory;
-use Request;
+use Utils\Db\ITransactionService;
+use Utils\Exceptions\EntityNotFoundException;
+use Utils\Http\HttpUtils;
+use Utils\Services\IAuthService;
+
 /**
  * Class ClientService
- * @package services\oauth2
+ * @package Services\OAuth2
  */
 class ClientService implements IClientService
 {
@@ -45,13 +54,12 @@ class ClientService implements IClientService
      * @var IApiScopeService
      */
     private $scope_service;
-
     /**
      * @var IUserRepository
      */
     private $user_repository;
     /**
-     * @var IClientCrendentialGenerator
+     * @var IClientCredentialGenerator
      */
     private $client_credential_generator;
 
@@ -65,22 +73,40 @@ class ClientService implements IClientService
      */
     private $client_factory;
 
+    /**
+     * @var IApiScopeRepository
+     */
+    private $scope_repository;
+
+    /**
+     * ClientService constructor.
+     * @param IUserRepository $user_repository
+     * @param IClientRepository $client_repository
+     * @param IAuthService $auth_service
+     * @param IApiScopeService $scope_service
+     * @param IClientCredentialGenerator $client_credential_generator
+     * @param IOAuth2ClientFactory $client_factory
+     * @param IApiScopeRepository $scope_repository
+     * @param ITransactionService $tx_service
+     */
     public function __construct
     (
         IUserRepository             $user_repository,
         IClientRepository           $client_repository,
         IAuthService                $auth_service,
         IApiScopeService            $scope_service,
-        IClientCrendentialGenerator $client_credential_generator,
+        IClientCredentialGenerator  $client_credential_generator,
         IOAuth2ClientFactory        $client_factory,
+        IApiScopeRepository         $scope_repository,
         ITransactionService         $tx_service
     )
     {
         $this->auth_service                = $auth_service;
-        $this->user_repository              = $user_repository;
+        $this->user_repository             = $user_repository;
         $this->scope_service               = $scope_service;
         $this->client_credential_generator = $client_credential_generator;
         $this->client_repository           = $client_repository;
+        $this->scope_repository            = $scope_repository;
         $this->client_factory              = $client_factory;
         $this->tx_service                  = $tx_service;
     }
@@ -93,8 +119,8 @@ class ClientService implements IClientService
      * Alternatively, the authorization server MAY support including the
      * client credentials in the request-body using the following
      * parameters:
-     * implementation of http://tools.ietf.org/html/rfc6749#section-2.3.1
-     * implementation of http://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication
+     * implementation of @see http://tools.ietf.org/html/rfc6749#section-2.3.1
+     * implementation of @see http://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication
      * @throws InvalidClientAuthMethodException
      * @throws MissingClientAuthorizationInfo
      * @return ClientAuthenticationContext
@@ -166,15 +192,16 @@ class ClientService implements IClientService
      * @param array $admin_users
      * @param string $app_logo
      * @return IClient
+     * @throws ValidationException
      */
-    public function addClient
+    public function register
     (
         $application_type,
         $app_name,
         $app_description,
-        $app_url = null,
-        array $admin_users = array(),
-        $app_logo = ''
+        $app_url           = null,
+        array $admin_users = [],
+        $app_logo          = ''
     )
     {
         $scope_service               = $this->scope_service;
@@ -199,17 +226,21 @@ class ClientService implements IClientService
             $client_credential_generator
         ) {
 
-            $client = $client_factory->build($app_name,$current_user, $application_type);
+            if($this->client_repository->getByApplicationName($app_name) != null){
+                throw new ValidationException('there is already another application with that name, please choose another one.');
+            }
+
+            $client = $client_factory->build($app_name, $current_user, $application_type);
             $client = $client_credential_generator->generate($client);
 
             $client->app_logo         = $app_logo;
             $client->app_description  = $app_description;
             $client->website          = $app_url;
+
             $client_repository->add($client);
             //add default scopes
-            $default_scopes = $scope_service->getDefaultScopes();
 
-            foreach ($default_scopes as $default_scope) {
+            foreach ($this->scope_repository->getDefaults() as $default_scope) {
                 if
                 (
                     $default_scope->name === OAuth2Protocol::OfflineAccess_Scope &&
@@ -237,36 +268,35 @@ class ClientService implements IClientService
 
 
     /**
-     * @param $id
+     * @param int $id
      * @param array $params
-     * @throws AbsentClientException
-     * @throws \ValidationException
-     * @return mixed
+     * @throws ValidationException
+     * @throws EntityNotFoundException
+     * @return IClient
      */
     public function update($id, array $params)
     {
-        $this_var          = $this;
         $client_repository = $this->client_repository;
         $user_repository   = $this->user_repository;
         $editing_user      = $this->auth_service->getCurrentUser();
 
-        return $this->tx_service->transaction(function () use ($id, $editing_user, $params, $client_repository, $user_repository, &$this_var) {
+        return $this->tx_service->transaction(function () use ($id, $editing_user, $params, $client_repository, $user_repository) {
 
             $client = $client_repository->get($id);
 
             if (is_null($client)) {
-                throw new AbsentClientException(sprintf('client id %s does not exists.', $id));
+                throw new EntityNotFoundException(sprintf('client id %s does not exists.', $id));
             }
             $app_name   = isset($params['app_name']) ? trim($params['app_name']) : null;
             if(!empty($app_name)) {
                 $old_client = $client_repository->getByApplicationName($app_name);
                 if(!is_null($old_client) && $old_client->id !== $client->id)
-                    throw new \ValidationException('there is already another application with that name, please choose another one.');
+                    throw new ValidationException('there is already another application with that name, please choose another one.');
             }
             $current_app_type = $client->getApplicationType();
             if($current_app_type !== $params['application_type'])
             {
-                throw new \ValidationException('application type does not match.');
+                throw new ValidationException('application type does not match.');
             }
 
             // validate uris
@@ -280,18 +310,18 @@ class ClientService implements IClientService
                             foreach ($redirect_uris as $uri) {
                                 $uri = @parse_url($uri);
                                 if (!isset($uri['scheme'])) {
-                                    throw new \ValidationException('invalid scheme on redirect uri.');
+                                    throw new ValidationException('invalid scheme on redirect uri.');
                                 }
                                 if (HttpUtils::isCustomSchema($uri['scheme'])) {
                                     $already_has_schema_registered = Client::where('redirect_uris', 'like',
                                         '%' . $uri['scheme'] . '://%')->where('id', '<>', $id)->count();
                                     if ($already_has_schema_registered > 0) {
-                                        throw new \ValidationException(sprintf('schema %s:// already registered for another client.',
+                                        throw new ValidationException(sprintf('schema %s:// already registered for another client.',
                                             $uri['scheme']));
                                     }
                                 } else {
                                     if (!HttpUtils::isHttpSchema($uri['scheme'])) {
-                                        throw new \ValidationException(sprintf('scheme %s:// is invalid.',
+                                        throw new ValidationException(sprintf('scheme %s:// is invalid.',
                                             $uri['scheme']));
                                     }
                                 }
@@ -308,10 +338,10 @@ class ClientService implements IClientService
                             foreach ($redirect_uris as $uri) {
                                 $uri = @parse_url($uri);
                                 if (!isset($uri['scheme'])) {
-                                    throw new \ValidationException('invalid scheme on redirect uri.');
+                                    throw new ValidationException('invalid scheme on redirect uri.');
                                 }
                                 if (!HttpUtils::isHttpsSchema($uri['scheme'])) {
-                                    throw new \ValidationException(sprintf('scheme %s:// is invalid.', $uri['scheme']));
+                                    throw new ValidationException(sprintf('scheme %s:// is invalid.', $uri['scheme']));
                                 }
                             }
                         }
@@ -321,10 +351,10 @@ class ClientService implements IClientService
                         foreach ($allowed_origins as $uri) {
                             $uri = @parse_url($uri);
                             if (!isset($uri['scheme'])) {
-                                throw new \ValidationException('invalid scheme on allowed origin uri.');
+                                throw new ValidationException('invalid scheme on allowed origin uri.');
                             }
                             if (!HttpUtils::isHttpsSchema($uri['scheme'])) {
-                                throw new \ValidationException(sprintf('scheme %s:// is invalid.', $uri['scheme']));
+                                throw new ValidationException(sprintf('scheme %s:// is invalid.', $uri['scheme']));
                             }
                         }
                     }
@@ -422,66 +452,90 @@ class ClientService implements IClientService
         });
    }
 
+    /**
+     * @param int $id
+     * @param int $scope_id
+     * @return IClient
+     * @throws EntityNotFoundException
+     */
     public function addClientScope($id, $scope_id)
     {
-        $client = Client::find($id);
-        if (is_null($client)) {
-            throw new EntityNotFoundException(sprintf("client id %s not found!.", $id));
-        }
-        $scope = $this->scope_service->get(intval($scope_id));
-        if(is_null($scope)) throw new EntityNotFoundException(sprintf("scope %s not found!.", $scope_id));
-        $user         = $client->user()->first();
-
-        if($scope->isAssignableByGroups()) {
-
-            $allowed      = false;
-            foreach($user->getGroupScopes() as $group_scope)
-            {
-                if(intval($group_scope->id) === intval($scope_id))
-                {
-                    $allowed = true; break;
-                }
+        return $this->tx_service->transaction(function() use ($id, $scope_id){
+            $client = $this->client_repository->get($id);
+            if (is_null($client)) {
+                throw new EntityNotFoundException(sprintf("client id %s not found!.", $id));
             }
-            if(!$allowed) throw new InvalidApiScope(sprintf('you cant assign to this client api scope %s', $scope_id));
-        }
-        if($scope->isSystem() && !$user->canUseSystemScopes())
-            throw new InvalidApiScope(sprintf('you cant assign to this client api scope %s', $scope_id));
-        $client->scopes()->attach($scope_id);
-        $client->setEditedBy($this->auth_service->getCurrentUser());
-        $client->save();
-        return $client;
+            $scope = $this->scope_repository->get(intval($scope_id));
+            if(is_null($scope)) throw new EntityNotFoundException(sprintf("scope %s not found!.", $scope_id));
+            $user         = $client->user()->first();
+
+            if($scope->isAssignableByGroups()) {
+
+                $allowed      = false;
+                foreach($user->getGroupScopes() as $group_scope)
+                {
+                    if(intval($group_scope->id) === intval($scope_id))
+                    {
+                        $allowed = true; break;
+                    }
+                }
+                if(!$allowed) throw new InvalidApiScope(sprintf('you cant assign to this client api scope %s', $scope_id));
+            }
+            if($scope->isSystem() && !$user->canUseSystemScopes())
+                throw new InvalidApiScope(sprintf('you cant assign to this client api scope %s', $scope_id));
+            $client->scopes()->attach($scope_id);
+            $client->setEditedBy($this->auth_service->getCurrentUser());
+
+            $this->client_repository->add($client);
+            return $client;
+        });
     }
 
+    /**
+     * @param $id
+     * @param $scope_id
+     * @return IClient
+     * @throws EntityNotFoundException
+     */
     public function deleteClientScope($id, $scope_id)
     {
-        $client = Client::find($id);
-        if (is_null($client)) {
-            throw new AbsentClientException(sprintf("client id %s does not exists!", $id));
-        }
-        $client->scopes()->detach($scope_id);
-        $client->setEditedBy($this->auth_service->getCurrentUser());
-        $client->save();
-        return $client;
+        return $this->tx_service->transaction(function() use ($id, $scope_id){
+            $client = $this->client_repository->get($id);
+            if (is_null($client)) {
+                throw new EntityNotFoundException(sprintf("client id %s does not exists!", $id));
+            }
+            $client->scopes()->detach($scope_id);
+            $client->setEditedBy($this->auth_service->getCurrentUser());
+            $this->client_repository->add($client);
+            return $client;
+        });
+
     }
 
+    /**
+     * @param int $id
+     * @return bool
+     * @throws EntityNotFoundException
+     */
     public function deleteClientByIdentifier($id)
     {
-        $res = false;
-        $this->tx_service->transaction(function () use ($id, &$res) {
-            $client = Client::find($id);
-            if (!is_null($client)) {
-                $client->scopes()->detach();
-                Event::fire('oauth2.client.delete', array($client->client_id));
-                $res = $client->delete();
+        return $this->tx_service->transaction(function () use ($id) {
+            $client = $this->client_repository->get($id);
+            if (is_null($client)) {
+                throw new EntityNotFoundException(sprintf("client id %s does not exists!", $id));
             }
+            $client->scopes()->detach();
+            Event::fire('oauth2.client.delete', array($client->client_id));
+            $this->client_repository->delete($client);
+            true;
         });
-        return $res;
     }
 
     /**
      * Regenerates Client Secret
      * @param $id client id
      * @return IClient
+     * @throws EntityNotFoundException
      */
     public function regenerateClientSecret($id)
     {
@@ -491,11 +545,11 @@ class ClientService implements IClientService
         return $this->tx_service->transaction(function () use ($id, $current_user, $client_credential_generator)
         {
 
-            $client = Client::find($id);
+            $client = $this->client_repository->get($id);
 
             if (is_null($client))
             {
-                throw new AbsentClientException(sprintf("client id %d does not exists!.", $id));
+                throw new EntityNotFoundException(sprintf("client id %d does not exists!.", $id));
             }
 
             if ($client->client_type != IClient::ClientType_Confidential)
@@ -512,7 +566,7 @@ class ClientService implements IClientService
 
             $client = $client_credential_generator->generate($client, true);
             $client->setEditedBy($current_user);
-            $client->save();
+            $this->client_repository->add($client);
 
             Event::fire('oauth2.client.regenerate.secret', array($client->client_id));
             return $client;
@@ -522,136 +576,104 @@ class ClientService implements IClientService
     /**
      * @param client $client_id
      * @return mixed
-     * @throws \oauth2\exceptions\AbsentClientException
+     * @throws EntityNotFoundException
      */
     public function lockClient($client_id)
     {
-        $res = false;
-        $this_var = $this;
+        return $this->tx_service->transaction(function () use ($client_id) {
 
-        $this->tx_service->transaction(function () use ($client_id, &$res, &$this_var) {
-
-            $client = $this_var->getClientByIdentifier($client_id);
+            $client = $this->client_repository($client_id);
             if (is_null($client)) {
-                throw new AbsentClientException($client_id, sprintf("client id %s does not exists!", $client_id));
+                throw new EntityNotFoundException($client_id, sprintf("client id %s does not exists!", $client_id));
             }
             $client->locked = true;
-            $res = $client->Save();
+            $this->client_repository->update($client);
+            return true;
         });
 
-        return $res;
     }
 
     /**
-     * @param client $client_id
-     * @return mixed
-     * @throws \oauth2\exceptions\AbsentClientException
+     * @param int $id
+     * @return bool
+     * @throws EntityNotFoundException
      */
-    public function unlockClient($client_id)
+    public function unlockClient($id)
     {
-        $res = false;
-        $this_var = $this;
+        return $this->tx_service->transaction(function () use ($id) {
 
-        $this->tx_service->transaction(function () use ($client_id, &$res, &$this_var) {
-
-            $client = $this_var->getClientByIdentifier($client_id);
+            $client = $this->client_repository->getClientByIdentifier($id);
             if (is_null($client)) {
-                throw new AbsentClientException($client_id, sprintf("client id %s does not exists!", $client_id));
+                throw new EntityNotFoundException($id, sprintf("client id %s does not exists!", $id));
             }
             $client->locked = false;
-            $res = $client->Save();
+            $this->client_repository->update($client);
+            return true;
         });
 
-        return $res;
     }
 
     /**
-     * @param $client_id
-     * @return IClient
+     * @param int $id
+     * @param bool $active
+     * @return bool
+     * @throws EntityNotFoundException
      */
-    public function getClientById($client_id)
-    {
-        $client = Client::where('client_id', '=', $client_id)->first();
-
-        return $client;
-    }
-
     public function activateClient($id, $active)
     {
-        $client = $this->getClientByIdentifier($id);
-        if (is_null($client)) {
-            throw new AbsentClientException(sprintf("client id %s does not exists!", $id));
-        }
-        $client->active = $active;
 
-        return $client->Save();
-    }
-
-    public function getClientByIdentifier($id)
-    {
-        $client = Client::where('id', '=', $id)->first();
-
-        return $client;
+        return $this->tx_service->transaction(function () use ($id, $active) {
+
+            $client = $this->client_repository->getClientByIdentifier($id);
+            if (is_null($client)) {
+                throw new EntityNotFoundException($id, sprintf("client id %s does not exists!", $id));
+            }
+            $client->active = $active;
+            $this->client_repository->update($client);
+            return true;
+        });
     }
 
+    /**
+     * @param int $id
+     * @param bool $use_refresh_token
+     * @return bool
+     * @throws EntityNotFoundException
+     */
     public function setRefreshTokenUsage($id, $use_refresh_token)
     {
-        $client = $this->getClientByIdentifier($id);
-        if (is_null($client)) {
-            throw new AbsentClientException(sprintf("client id %s does not exists!", $id));
-        }
-        $client->use_refresh_token = $use_refresh_token;
-        $client->setEditedBy($this->auth_service->getCurrentUser());
-        return $client->Save();
+        return $this->tx_service->transaction(function () use ($id, $use_refresh_token) {
+
+            $client = $this->client_repository->getClientByIdentifier($id);
+            if (is_null($client)) {
+                throw new EntityNotFoundException($id, sprintf("client id %s does not exists!", $id));
+            }
+            $client->use_refresh_token = $use_refresh_token;
+            $client->setEditedBy($this->auth_service->getCurrentUser());
+            $this->client_repository->update($client);
+            return true;
+        });
     }
 
+    /**
+     * @param int $id
+     * @param bool $rotate_refresh_token
+     * @return bool
+     * @throws EntityNotFoundException
+     */
     public function setRotateRefreshTokenPolicy($id, $rotate_refresh_token)
     {
-        $client = $this->getClientByIdentifier($id);
-        if (is_null($client)) {
-            throw new AbsentClientException(sprintf("client id %s does not exists!", $id));
-        }
+        return $this->tx_service->transaction(function () use ($id, $rotate_refresh_token) {
 
-        $client->rotate_refresh_token = $rotate_refresh_token;
-        $client->setEditedBy($this->auth_service->getCurrentUser());
-        return $client->Save();
-    }
+            $client = $this->client_repository->getClientByIdentifier($id);
+            if (is_null($client)) {
+                throw new EntityNotFoundException($id, sprintf("client id %s does not exists!", $id));
+            }
 
-    public function existClientAppName($app_name)
-    {
-        return Client::where('app_name', '=', $app_name)->count() > 0;
-    }
-
-    /**
-     * gets an api scope by id
-     * @param $id id of api scope
-     * @return IApiScope
-     */
-    public function get($id)
-    {
-        return Client::find($id);
-    }
-
-    /**
-     * @param int $page_nbr
-     * @param int $page_size
-     * @param array $filters
-     * @param array $fields
-     * @return mixed
-     */
-    public function getAll($page_nbr = 1, $page_size = 10, array $filters = array(), array $fields = array('*'))
-    {
-        DB::getPaginator()->setCurrentPage($page_nbr);
-
-        return Client::Filter($filters)->paginate($page_size, $fields);
-    }
-
-    /**
-     * @param string $origin
-     * @return IClient
-     */
-    public function getByOrigin($origin)
-    {
-        return Client::where('allowed_origins', 'like', '%'.$origin.'%')->first();
+            $client->rotate_refresh_token = $rotate_refresh_token;
+            $client->setEditedBy($this->auth_service->getCurrentUser());
+            $this->client_repository->update($client);
+            return true;
+        });
     }
 }
\ No newline at end of file
diff --git a/app/Services/OAuth2/HttpIClientJWKSetReader.php b/app/Services/OAuth2/HttpIClientJWKSetReader.php
new file mode 100644
index 00000000..7edafae7
--- /dev/null
+++ b/app/Services/OAuth2/HttpIClientJWKSetReader.php
@@ -0,0 +1,60 @@
+<?php namespace Services\OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use jwk\IJWKSet;
+use jwk\impl\JWKSet;
+use OAuth2\Models\IClient;
+use OAuth2\Services\IClientJWKSetReader;
+use GuzzleHttp\Client as HttpClient;
+use GuzzleHttp\Exception\RequestException as HttpRequestException;
+use Utils\Http\HttpContentType;
+use Log;
+/**
+ * Class HttpIClientJWKSetReader
+ * @package Services\OAuth2
+ */
+final class HttpIClientJWKSetReader implements IClientJWKSetReader
+{
+
+    /**
+     * @param IClient $client
+     * @return IJWKSet
+     */
+    public function read(IClient $client)
+    {
+        try {
+            $jwk_set_uri = $client->getJWKSUri();
+            if (empty($jwk_set_uri)) return null;
+
+            $client = new HttpClient([
+                'defaults' => [
+                    'timeout' => Config::get('curl.timeout', 60),
+                    'allow_redirects' => Config::get('curl.allow_redirects', false),
+                    'verify' => Config::get('curl.verify_ssl_cert', true)
+                ]
+            ]);
+
+            $response  = $client->get($jwk_set_uri);
+            if ($response->getStatusCode() !== 200) return null;
+            $content_type = $response->getHeader('content-type');
+            if (is_null($content_type)) return null;
+            if (!$content_type->hasValue(HttpContentType::Json)) return null;
+            return JWKSet::fromJson($response->getBody());
+        }
+        catch (HttpRequestException $ex)
+        {
+            Log::warning($ex->getMessage());
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/services/oauth2/IdTokenBuilderImpl.php b/app/Services/OAuth2/IdTokenBuilderImpl.php
similarity index 82%
rename from app/services/oauth2/IdTokenBuilderImpl.php
rename to app/Services/OAuth2/IdTokenBuilderImpl.php
index f52ef39e..b55ba0ef 100644
--- a/app/services/oauth2/IdTokenBuilderImpl.php
+++ b/app/Services/OAuth2/IdTokenBuilderImpl.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace Services\OAuth2;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,29 +12,34 @@
  * limitations under the License.
  **/
 
-namespace services\oauth2;
-
+use jwe\IJWE;
 use jwe\impl\JWEFactory;
 use jwe\impl\specs\JWE_ParamsSpecification;
+use jwk\exceptions\InvalidJWKAlgorithm;
+use jwk\exceptions\InvalidJWKType;
 use jwk\IJWK;
+use jws\IJWS;
 use jws\impl\specs\JWS_ParamsSpecification;
 use jws\JWSFactory;
 use jwt\IBasicJWT;
+use jwt\IJWT;
 use jwt\impl\JWTClaimSet;
 use jwt\impl\UnsecuredJWT;
-use oauth2\builders\IdTokenBuilder;
-use oauth2\exceptions\RecipientKeyNotFoundException;
-use oauth2\heuristics\ClientEncryptionKeyFinder;
-use oauth2\heuristics\ServerSigningKeyFinder;
-use oauth2\models\IClient;
-use oauth2\models\JWTResponseInfo;
-use oauth2\repositories\IServerPrivateKeyRepository;
-use oauth2\services\IClientJWKSetReader;
+use OAuth2\Builders\IdTokenBuilder;
+use OAuth2\Exceptions\InvalidClientType;
+use OAuth2\Exceptions\RecipientKeyNotFoundException;
+use OAuth2\Exceptions\ServerKeyNotFoundException;
+use OAuth2\Heuristics\ClientEncryptionKeyFinder;
+use OAuth2\Heuristics\ServerSigningKeyFinder;
+use OAuth2\Models\IClient;
+use OAuth2\Models\JWTResponseInfo;
+use OAuth2\Repositories\IServerPrivateKeyRepository;
+use OAuth2\Services\IClientJWKSetReader;
 use utils\json_types\StringOrURI;
 
 /**
  * Class IdTokenBuilderImpl
- * @package services\oauth2;
+ * @package Services\OAuth2
  */
 final class IdTokenBuilderImpl implements IdTokenBuilder
 {
@@ -67,10 +72,10 @@ final class IdTokenBuilderImpl implements IdTokenBuilder
      * @param JWTClaimSet $claim_set
      * @param JWTResponseInfo $info
      * @param IClient $client
-     * @return \jwe\IJWE|\jws\IJWS|\jwt\IJWT
+     * @return IJWT
      * @throws RecipientKeyNotFoundException
-     * @throws \oauth2\exceptions\InvalidClientType
-     * @throws \oauth2\exceptions\ServerKeyNotFoundException
+     * @throws InvalidClientType
+     * @throws ServerKeyNotFoundException
      */
     public function buildJWT(JWTClaimSet $claim_set, JWTResponseInfo $info, IClient $client)
     {
@@ -132,10 +137,10 @@ final class IdTokenBuilderImpl implements IdTokenBuilder
      * @param StringOrURI $alg
      * @param StringOrURI $enc
      * @param IBasicJWT $jwt
-     * @return \jwe\IJWE
+     * @return IJWE
      * @throws RecipientKeyNotFoundException
-     * @throws \jwk\exceptions\InvalidJWKAlgorithm
-     * @throws \jwk\exceptions\InvalidJWKType
+     * @throws InvalidJWKAlgorithm
+     * @throws InvalidJWKType
      */
     static private function buildJWE(IJWK $recipient_key, StringOrURI $alg, StringOrURI $enc, IBasicJWT $jwt)
     {
@@ -160,9 +165,9 @@ final class IdTokenBuilderImpl implements IdTokenBuilder
      * @param IJWK $jwk
      * @param $alg
      * @param JWTClaimSet $claim_set
-     * @return \jws\IJWS
-     * @throws \jwk\exceptions\InvalidJWKAlgorithm
-     * @throws \jwk\exceptions\InvalidJWKType
+     * @return IJWS
+     * @throws InvalidJWKAlgorithm
+     * @throws InvalidJWKType
      */
     static private function buildJWS(IJWK $jwk, $alg, JWTClaimSet $claim_set)
     {
diff --git a/app/services/oauth2/OAuth2MementoSessionSerializerService.php b/app/Services/OAuth2/OAuth2MementoSessionSerializerService.php
similarity index 87%
rename from app/services/oauth2/OAuth2MementoSessionSerializerService.php
rename to app/Services/OAuth2/OAuth2MementoSessionSerializerService.php
index ffa9e280..e790d86b 100644
--- a/app/services/oauth2/OAuth2MementoSessionSerializerService.php
+++ b/app/Services/OAuth2/OAuth2MementoSessionSerializerService.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace Services\OAuth2;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,15 +12,13 @@
  * limitations under the License.
  **/
 
-namespace services\oauth2;
+use OAuth2\Requests\OAuth2RequestMemento;
+use OAuth2\Services\IMementoOAuth2SerializerService;
+use Illuminate\Support\Facades\Session;
 
-use oauth2\requests\OAuth2RequestMemento;
-use oauth2\services\IMementoOAuth2SerializerService;
-
-use Session;
 /**
  * Class OAuth2MementoSessionSerializerService
- * @package services\oauth2
+ * @package Services\OAuth2
  */
 final class OAuth2MementoSessionSerializerService implements IMementoOAuth2SerializerService
 {
diff --git a/app/Services/OAuth2/OAuth2ServiceProvider.php b/app/Services/OAuth2/OAuth2ServiceProvider.php
new file mode 100644
index 00000000..1cea7ba8
--- /dev/null
+++ b/app/Services/OAuth2/OAuth2ServiceProvider.php
@@ -0,0 +1,116 @@
+<?php namespace Services\OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Illuminate\Support\ServiceProvider;
+use OAuth2\Services\AccessTokenGenerator;
+use OAuth2\Services\AuthorizationCodeGenerator;
+use OAuth2\Services\OAuth2ServiceCatalog;
+use OAuth2\Services\RefreshTokenGenerator;
+use Utils\Services\UtilsServiceCatalog;
+use Illuminate\Support\Facades\App;
+
+/**
+ * Class OAuth2ServiceProvider
+ * @package Services\OAuth2
+ */
+final class OAuth2ServiceProvider extends ServiceProvider
+{
+    protected $defer = true;
+
+    public function boot()
+    {
+    }
+
+    public function register()
+    {
+        App::singleton(\OAuth2\IResourceServerContext::class, \Services\OAuth2\ResourceServerContext::class);
+        App::singleton(OAuth2ServiceCatalog::ClientCredentialGenerator, \Services\OAuth2\ClientCredentialGenerator::class);
+        App::singleton(OAuth2ServiceCatalog::ClientService, \Services\OAuth2\ClientService::class);
+        App::singleton(OAuth2ServiceCatalog::ClientPublicKeyService, \Services\OAuth2\ClientPublicKeyService::class);
+        App::singleton(OAuth2ServiceCatalog::ServerPrivateKeyService, \Services\OAuth2\ServerPrivateKeyService::class);
+        App::singleton(OAuth2ServiceCatalog::ScopeService, \Services\OAuth2\ApiScopeService::class);
+        App::singleton(OAuth2ServiceCatalog::ResourceServerService, \Services\OAuth2\ResourceServerService::class);
+        App::singleton(OAuth2ServiceCatalog::ApiService, \Services\OAuth2\ApiService::class);
+        App::singleton(OAuth2ServiceCatalog::ApiEndpointService, \Services\OAuth2\ApiEndpointService::class);
+        App::singleton(OAuth2ServiceCatalog::UserConsentService, \Services\OAuth2\UserConsentService::class);
+        App::singleton(OAuth2ServiceCatalog::OpenIDProviderConfigurationService, \Services\OAuth2\OpenIDProviderConfigurationService::class);
+        App::singleton(OAuth2ServiceCatalog::MementoSerializerService, \Services\OAuth2\OAuth2MementoSessionSerializerService::class);
+        App::singleton(OAuth2ServiceCatalog::SecurityContextService, \Services\OAuth2\SecurityContextService::class);
+        App::singleton(OAuth2ServiceCatalog::PrincipalService, \Services\OAuth2\PrincipalService::class);
+        App::singleton(\OAuth2\Services\IClientJWKSetReader::class, \Services\OAuth2\HttpIClientJWKSetReader::class);
+        App::singleton(\OAuth2\Services\IApiScopeGroupService::class, \Services\OAuth2\ApiScopeGroupService::class);
+
+        App::singleton(\OAuth2\Builders\IdTokenBuilder::class,function() {
+            return new IdTokenBuilderImpl
+            (
+                App::make(\OAuth2\Repositories\IServerPrivateKeyRepository::class),
+                new HttpIClientJWKSetReader
+            );
+        });
+
+        App::singleton(OAuth2ServiceCatalog::TokenService, function()
+        {
+            return new TokenService
+            (
+                App::make(OAuth2ServiceCatalog::ClientService),
+                App::make(UtilsServiceCatalog::LockManagerService),
+                App::make(UtilsServiceCatalog::ServerConfigurationService),
+                App::make(UtilsServiceCatalog::CacheService),
+                App::make(UtilsServiceCatalog::AuthenticationService),
+                App::make(OAuth2ServiceCatalog::UserConsentService),
+                new AuthorizationCodeGenerator(App::make(UtilsServiceCatalog::CacheService)),
+                new AccessTokenGenerator(App::make(UtilsServiceCatalog::CacheService)),
+                new RefreshTokenGenerator(App::make(UtilsServiceCatalog::CacheService)),
+                App::make(\OAuth2\Repositories\IServerPrivateKeyRepository::class),
+                new HttpIClientJWKSetReader,
+                App::make(OAuth2ServiceCatalog::SecurityContextService),
+                App::make(OAuth2ServiceCatalog::PrincipalService),
+                App::make(\OAuth2\Builders\IdTokenBuilder::class),
+                App::make(\OAuth2\Repositories\IClientRepository::class),
+                App::make(\OAuth2\Repositories\IAccessTokenRepository::class),
+                App::make(\OAuth2\Repositories\IRefreshTokenRepository::class),
+                App::make(\OAuth2\Repositories\IResourceServerRepository::class),
+                App::make(UtilsServiceCatalog::TransactionService)
+            );
+        });
+
+        //OAUTH2 resource server endpoints
+        App::singleton(\OAuth2\ResourceServer\IUserService::class, \Services\OAuth2\ResourceServer\UserService::class);
+    }
+
+    public function provides()
+    {
+        return [
+            \OAuth2\IResourceServerContext::class,
+            OAuth2ServiceCatalog::ClientCredentialGenerator,
+            OAuth2ServiceCatalog::ClientService,
+            OAuth2ServiceCatalog::ClientPublicKeyService,
+            OAuth2ServiceCatalog::ServerPrivateKeyService,
+            OAuth2ServiceCatalog::ScopeService,
+            OAuth2ServiceCatalog::ResourceServerService,
+            OAuth2ServiceCatalog::ApiService,
+            OAuth2ServiceCatalog::ApiEndpointService,
+            OAuth2ServiceCatalog::UserConsentService,
+            OAuth2ServiceCatalog::OpenIDProviderConfigurationService,
+            OAuth2ServiceCatalog::MementoSerializerService,
+            OAuth2ServiceCatalog::SecurityContextService,
+            OAuth2ServiceCatalog::PrincipalService,
+            \OAuth2\Services\IClientJWKSetReader::class,
+            \OAuth2\Services\IApiScopeGroupService::class,
+            \OAuth2\Builders\IdTokenBuilder::class,
+            OAuth2ServiceCatalog::TokenService,
+            \OAuth2\ResourceServer\IUserService::class
+        ];
+    }
+}
\ No newline at end of file
diff --git a/app/services/oauth2/OpenIDProviderConfigurationService.php b/app/Services/OAuth2/OpenIDProviderConfigurationService.php
similarity index 65%
rename from app/services/oauth2/OpenIDProviderConfigurationService.php
rename to app/Services/OAuth2/OpenIDProviderConfigurationService.php
index d9e0d059..5ff7a774 100644
--- a/app/services/oauth2/OpenIDProviderConfigurationService.php
+++ b/app/Services/OAuth2/OpenIDProviderConfigurationService.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace Services\OAuth2;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,16 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace services\oauth2;
-
-use oauth2\discovery\IOpenIDProviderConfigurationService;
-use Config;
-use URL;
+use OAuth2\Discovery\IOpenIDProviderConfigurationService;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\URL;
 
 /**
  * Class OpenIDProviderConfigurationService
- * @package services\oauth2
+ * @package Services\OAuth2
  */
 final class OpenIDProviderConfigurationService implements IOpenIDProviderConfigurationService
 {
@@ -38,7 +35,7 @@ final class OpenIDProviderConfigurationService implements IOpenIDProviderConfigu
      */
     public function getAuthEndpoint()
     {
-        return URL::action("OAuth2ProviderController@authorize");
+        return URL::action("OAuth2\OAuth2ProviderController@auth");
     }
 
     /**
@@ -46,7 +43,7 @@ final class OpenIDProviderConfigurationService implements IOpenIDProviderConfigu
      */
     public function getTokenEndpoint()
     {
-        return URL::action("OAuth2ProviderController@token");
+        return URL::action("OAuth2\OAuth2ProviderController@token");
     }
 
     /**
@@ -54,7 +51,7 @@ final class OpenIDProviderConfigurationService implements IOpenIDProviderConfigu
      */
     public function getUserInfoEndpoint()
     {
-        return URL::action("OAuth2UserApiController@userInfo");
+        return URL::action("Api\OAuth2\OAuth2UserApiController@userInfo");
     }
 
     /**
@@ -62,7 +59,7 @@ final class OpenIDProviderConfigurationService implements IOpenIDProviderConfigu
      */
     public function getJWKSUrl()
     {
-        return URL::action("OAuth2ProviderController@certs");
+        return URL::action("OAuth2\OAuth2ProviderController@certs");
     }
 
     /**
@@ -70,7 +67,7 @@ final class OpenIDProviderConfigurationService implements IOpenIDProviderConfigu
      */
     public function getRevocationEndpoint()
     {
-        return URL::action("OAuth2ProviderController@revoke");
+        return URL::action("OAuth2\OAuth2ProviderController@revoke");
     }
 
     /**
@@ -78,7 +75,7 @@ final class OpenIDProviderConfigurationService implements IOpenIDProviderConfigu
      */
     public function getIntrospectionEndpoint()
     {
-        return URL::action("OAuth2ProviderController@introspection");
+        return URL::action("OAuth2\OAuth2ProviderController@introspection");
     }
 
     /**
@@ -86,7 +83,7 @@ final class OpenIDProviderConfigurationService implements IOpenIDProviderConfigu
      */
     public function getCheckSessionIFrame()
     {
-        return URL::action("OAuth2ProviderController@checkSessionIFrame");
+        return URL::action("OAuth2\OAuth2ProviderController@checkSessionIFrame");
     }
 
     /**
@@ -94,6 +91,6 @@ final class OpenIDProviderConfigurationService implements IOpenIDProviderConfigu
      */
     public function getEndSessionEndpoint()
     {
-        return URL::action("OAuth2ProviderController@endSession");
+        return URL::action("OAuth2\OAuth2ProviderController@endSession");
     }
 }
\ No newline at end of file
diff --git a/app/services/oauth2/PrincipalService.php b/app/Services/OAuth2/PrincipalService.php
similarity index 87%
rename from app/services/oauth2/PrincipalService.php
rename to app/Services/OAuth2/PrincipalService.php
index 1b0d1bfb..abf3a087 100644
--- a/app/services/oauth2/PrincipalService.php
+++ b/app/Services/OAuth2/PrincipalService.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace Services\OAuth2;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,22 +12,15 @@
  * limitations under the License.
  **/
 
-namespace services\oauth2;
+use Illuminate\Support\Facades\Cookie;
+use Illuminate\Support\Facades\Session;
+use OAuth2\Models\IPrincipal;
+use OAuth2\Models\Principal;
+use OAuth2\Services\IPrincipalService;
 
-use oauth2\models\IPrincipal;
-use oauth2\models\Principal;
-use oauth2\services\IPrincipalService;
-use Session;
-use Crypt;
-use Cookie;
-use Config;
-use Auth;
-use utils\services\IAuthService;
-use utils\services\UtilsServiceCatalog;
-use App;
 /**
  * Class PrincipalService
- * @package services\oauth2
+ * @package Services\OAuth2
  */
 final class PrincipalService implements IPrincipalService
 {
diff --git a/app/services/oauth2/resource_server/UserService.php b/app/Services/OAuth2/ResourceServer/UserService.php
similarity index 67%
rename from app/services/oauth2/resource_server/UserService.php
rename to app/Services/OAuth2/ResourceServer/UserService.php
index ee206ffe..9b261355 100644
--- a/app/services/oauth2/resource_server/UserService.php
+++ b/app/Services/OAuth2/ResourceServer/UserService.php
@@ -1,28 +1,39 @@
-<?php
-
-namespace services\oauth2\resource_server;
-
+<?php namespace Services\OAuth2\ResourceServer;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Auth\Repositories\IUserRepository;
 use Exception;
 use jwt\impl\JWTClaimSet;
 use jwt\JWTClaim;
-use oauth2\AddressClaim;
-use oauth2\IResourceServerContext;
-use oauth2\resource_server\IUserService;
-use oauth2\resource_server\OAuth2ProtectedService;
-use oauth2\services\IClientService;
-use oauth2\StandardClaims;
-use openid\services\IUserService as IAPIUserService;
-use utils\json_types\JsonArray;
+use OAuth2\AddressClaim;
+use OAuth2\IResourceServerContext;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\ResourceServer\IUserService;
+use OAuth2\ResourceServer\OAuth2ProtectedService;
+use OAuth2\Services\IClientService;
+use OAuth2\StandardClaims;
+use OpenId\Services\IUserService as IAPIUserService;
+use Utils\Exceptions\EntityNotFoundException;
 use utils\json_types\JsonValue;
 use utils\json_types\StringOrURI;
-use utils\services\IAuthService;
-use utils\services\ILogService;
-use utils\services\IServerConfigurationService;
+use Utils\Services\IAuthService;
+use Utils\Services\ILogService;
+use Utils\Services\IServerConfigurationService;
 
 /**
  * Class UserService
  * OAUTH2 Protected Endpoint
- * @package services\oauth2\resource_server
+ * @package Services\OAuth2\ResourceServer
  */
 class UserService extends OAuth2ProtectedService implements IUserService
 {
@@ -36,22 +47,38 @@ class UserService extends OAuth2ProtectedService implements IUserService
     private $configuration_service;
 
     /**
-     * @var IClientService
+     * @var IClientRepository
      */
-    private $client_service;
+    private $client_repository;
 
     /**
      * @var IAuthService
      */
     private $auth_service;
 
+    /**
+     * @var IUserRepository
+     */
+    private $user_repository;
+
+    /**
+     * UserService constructor.
+     * @param IAPIUserService $user_service
+     * @param IResourceServerContext $resource_server_context
+     * @param IServerConfigurationService $configuration_service
+     * @param ILogService $log_service
+     * @param IClientRepository $client_repository
+     * @param IUserRepository $user_repository
+     * @param IAuthService $auth_service
+     */
     public function __construct
     (
         IAPIUserService $user_service,
         IResourceServerContext $resource_server_context,
         IServerConfigurationService $configuration_service,
         ILogService $log_service,
-        IClientService $client_service,
+        IClientRepository $client_repository,
+        IUserRepository $user_repository,
         IAuthService $auth_service
     )
     {
@@ -59,8 +86,9 @@ class UserService extends OAuth2ProtectedService implements IUserService
 
         $this->user_service          = $user_service;
         $this->configuration_service = $configuration_service;
-        $this->client_service        = $client_service;
+        $this->client_repository     = $client_repository;
         $this->auth_service          = $auth_service;
+        $this->user_repository       = $user_repository;
     }
 
     /**
@@ -74,14 +102,16 @@ class UserService extends OAuth2ProtectedService implements IUserService
         try
         {
 
-            $me = $this->resource_server_context->getCurrentUserId();
+            $current_user_id = $this->resource_server_context->getCurrentUserId();
 
-            if (is_null($me)) {
+            if (is_null($current_user_id)) {
                 throw new Exception('me is no set!.');
             }
 
-            $current_user = $this->user_service->get($me);
-            $scopes = $this->resource_server_context->getCurrentScope();
+            $current_user = $this->user_repository->get($current_user_id);
+            if(is_null($current_user)) throw new EntityNotFoundException();
+
+            $scopes       = $this->resource_server_context->getCurrentScope();
 
             if (in_array(self::UserProfileScope_Address, $scopes)) {
                 // Address Claims
@@ -94,8 +124,8 @@ class UserService extends OAuth2ProtectedService implements IUserService
             if (in_array(self::UserProfileScope_Profile, $scopes)) {
                 // Profile Claims
                 $assets_url = $this->configuration_service->getConfigValue('Assets.Url');
-                $pic_url = $current_user->getPic();
-                $pic_url = str_contains($pic_url, 'http') ? $pic_url : $assets_url . $pic_url;
+                $pic_url    = $current_user->getPic();
+                $pic_url    = str_contains($pic_url, 'http') ? $pic_url : $assets_url . $pic_url;
 
                 $data[StandardClaims::Name]       = $current_user->getFullName();
                 $data[StandardClaims::GivenName]  = $current_user->getFirstName();
@@ -127,16 +157,17 @@ class UserService extends OAuth2ProtectedService implements IUserService
         try
         {
 
-            $me        = $this->resource_server_context->getCurrentUserId();
-            $client_id = $this->resource_server_context->getCurrentClientId();
-            $client    = $this->client_service->getClientById($client_id);
+            $current_user_id = $this->resource_server_context->getCurrentUserId();
+            $client_id       = $this->resource_server_context->getCurrentClientId();
+            $client          = $this->client_repository->getClientById($client_id);
 
-            if (is_null($me))
+            if (is_null($current_user_id))
             {
                 throw new Exception('me is no set!.');
             }
 
-            $current_user = $this->user_service->get($me);
+            $current_user = $this->user_repository->get($current_user_id);
+            if(is_null($current_user)) throw new EntityNotFoundException();
             $scopes       = $this->resource_server_context->getCurrentScope();
 
             $claim_set = new JWTClaimSet
@@ -171,8 +202,8 @@ class UserService extends OAuth2ProtectedService implements IUserService
             {
                 // Profile Claims
                 $assets_url = $this->configuration_service->getConfigValue('Assets.Url');
-                $pic_url = $current_user->getPic();
-                $pic_url = str_contains($pic_url, 'http') ? $pic_url : $assets_url . $pic_url;
+                $pic_url    = $current_user->getPic();
+                $pic_url    = str_contains($pic_url, 'http') ? $pic_url : $assets_url . $pic_url;
 
                 $claim_set->addClaim(new JWTClaim(StandardClaims::Name, new StringOrURI($current_user->getFullName())));
                 $claim_set->addClaim(new JWTClaim(StandardClaims::GivenName, new StringOrURI($current_user->getFirstName())));
diff --git a/app/services/oauth2/ResourceServerContext.php b/app/Services/OAuth2/ResourceServerContext.php
similarity index 57%
rename from app/services/oauth2/ResourceServerContext.php
rename to app/Services/OAuth2/ResourceServerContext.php
index 84bc537c..56995d33 100644
--- a/app/services/oauth2/ResourceServerContext.php
+++ b/app/Services/OAuth2/ResourceServerContext.php
@@ -1,15 +1,28 @@
-<?php
+<?php namespace Services\OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-namespace services\oauth2;
-
-use oauth2\IResourceServerContext;
+use OAuth2\IResourceServerContext;
 
 /**
  * Class ResourceServerContext
- * @package services\oauth2
+ * @package Services\OAuth2
  */
 class ResourceServerContext implements IResourceServerContext {
 
+    /**
+     * @var array
+     */
     private $auth_context;
 
     /**
@@ -54,10 +67,12 @@ class ResourceServerContext implements IResourceServerContext {
     }
 
     /**
-     * @param $auth_context
+     * @param array$auth_context
+     * @return $this
      */
-    public function setAuthorizationContext($auth_context)
+    public function setAuthorizationContext(array $auth_context)
     {
         $this->auth_context = $auth_context;
+        return $this;
     }
 }
\ No newline at end of file
diff --git a/app/Services/OAuth2/ResourceServerService.php b/app/Services/OAuth2/ResourceServerService.php
new file mode 100644
index 00000000..f8aef983
--- /dev/null
+++ b/app/Services/OAuth2/ResourceServerService.php
@@ -0,0 +1,278 @@
+<?php namespace Services\OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Models\OAuth2\ResourceServer;
+use OAuth2\Exceptions\InvalidResourceServer;
+use OAuth2\Models\IClient;
+use OAuth2\Models\IResourceServer;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Repositories\IResourceServerRepository;
+use OAuth2\Services\IClientService;
+use OAuth2\Services\IResourceServerService;
+use Utils\Db\ITransactionService;
+use Utils\Exceptions\EntityNotFoundException;
+
+/**
+ * Class ResourceServerService
+ * @package Services\OAuth2
+ */
+final class ResourceServerService implements IResourceServerService
+{
+
+    /**
+     * @var IClientService
+     */
+    private $client_service;
+
+    /**
+     * @var ITransactionService
+     */
+    private $tx_service;
+
+    /**
+     * @var IResourceServerRepository
+     */
+    private $repository;
+
+    /**
+     * @var IClientRepository
+     */
+    private $client_repository;
+
+    /**
+     * ResourceServerService constructor.
+     * @param IClientService $client_service
+     * @param IClientRepository $client_repository
+     * @param IResourceServerRepository $repository
+     * @param ITransactionService $tx_service
+     */
+    public function __construct
+    (
+        IClientService $client_service,
+        IClientRepository $client_repository,
+        IResourceServerRepository $repository,
+        ITransactionService $tx_service
+    )
+    {
+        $this->client_service = $client_service;
+        $this->repository = $repository;
+        $this->client_repository = $client_repository;
+        $this->tx_service = $tx_service;
+    }
+
+    /**
+     * @param string $host
+     * @param string $ips
+     * @param string $friendly_name
+     * @param bool $active
+     * @return IResourceServer
+     * @throws InvalidResourceServer
+     */
+    public function add($host, $ips, $friendly_name, $active)
+    {
+
+        $client_service = $this->client_service;
+
+        if (is_string($active)) {
+            $active = strtoupper($active) == 'TRUE' ? true : false;
+        }
+
+        return $this->tx_service->transaction(function () use (
+            $host,
+            $ips,
+            $friendly_name,
+            $active,
+            $client_service
+        ) {
+
+            if ($this->repository->getByHost($host) != null) {
+                throw new InvalidResourceServer
+                (
+                    sprintf('there is already another resource server with that hostname (%s).',$host)
+                );
+            }
+
+            if ($this->repository->getByIp($ips) != null) {
+                throw new InvalidResourceServer
+                (
+                    sprintf('there is already another resource server with that ip (%s).', $ips)
+                );
+            }
+
+            if ($this->repository->getByFriendlyName($friendly_name) != null) {
+                throw new InvalidResourceServer
+                (
+                    sprintf('there is already another resource server with that friendly name (%s).', $friendly_name)
+                );
+            }
+
+            // todo : move to factory
+            $instance = new ResourceServer
+            (
+                [
+                    'host'          => $host,
+                    'ips'           => $ips,
+                    'active'        => $active,
+                    'friendly_name' => $friendly_name
+                ]
+            );
+
+            $this->repository->add($instance);
+
+            // creates a new client for this brand new resource server
+            $new_client = $client_service->register
+            (
+                IClient::ApplicationType_Service,
+                $host . '.confidential.application',
+                $friendly_name . ' confidential oauth2 application'
+            );
+
+            $new_client->resource_server()->associate($instance);
+            // does not expires ...
+            $new_client->client_secret_expires_at = null;
+            $this->client_repository->add($new_client);
+            return $instance;
+        });
+
+    }
+
+    /**
+     * @param int $id
+     * @param array $params
+     * @return bool
+     * @throws InvalidResourceServer
+     * @throws EntityNotFoundException
+     */
+    public function update($id, array $params)
+    {
+
+
+        return $this->tx_service->transaction(function () use ($id, $params) {
+
+            $resource_server = $this->repository->get($id);
+
+            if (is_null($resource_server)) {
+                throw new EntityNotFoundException(sprintf('resource server id %s does not exists!', $id));
+            }
+
+            $allowed_update_params = array('host', 'ips', 'active', 'friendly_name');
+
+            foreach ($allowed_update_params as $param) {
+                if (array_key_exists($param, $params)) {
+
+                    if ($param == 'host') {
+                        $former_resource_server = $this->repository->getByHost($params[$param]);
+                        if (!is_null($former_resource_server) && $former_resource_server->id != $id) {
+                            throw new InvalidResourceServer
+                            (
+                                sprintf('there is already another resource server with that hostname (%s).',$params[$param])
+                            );
+                        }
+                    }
+
+                    if ($param == 'friendly_name') {
+                        $former_resource_server = $this->repository->getByFriendlyName($params[$param]);
+                        if (!is_null($former_resource_server) && $former_resource_server->id != $id) {
+                            throw new InvalidResourceServer
+                            (
+                                sprintf('there is already another resource server with that friendly name (%s).', $params[$param])
+                            );
+                        }
+                    }
+
+                    $resource_server->{$param} = $params[$param];
+                }
+            }
+            $this->repository->add($resource_server);
+            return true;
+        });
+    }
+
+
+    /**
+     * @param int $id
+     * @param bool $active
+     * @return bool
+     * @throws EntityNotFoundException
+     */
+    public function setStatus($id, $active)
+    {
+        return $this->tx_service->transaction(function () use ($id, $active) {
+            $resource_server = $this->repository->get($id);
+
+            if (is_null($resource_server)) {
+                throw new EntityNotFoundException(sprintf('resource server id %s does not exists!', $id));
+            }
+            $resource_server->active = $active;
+            $this->repository->add($resource_server);
+            return true;
+        });
+    }
+
+    /**
+     * @param int $id
+     * @return bool
+     * @throws EntityNotFoundException
+     */
+    public function delete($id)
+    {
+
+
+        return $this->tx_service->transaction(function () use ($id) {
+
+            $resource_server = $this->repository->get($id);
+
+            if (is_null($resource_server)) {
+                throw new EntityNotFoundException(sprintf('resource server id %s does not exists!', $id));
+            }
+
+            $client = $resource_server->client()->first();
+            if (!is_null($client)) {
+                $this->client_repository->delete($client);
+            }
+
+            $this->repository->delete($resource_server);
+            return true;
+        });
+
+    }
+
+    /**
+     * @param int $id
+     * @return string
+     * @throws EntityNotFoundException
+     */
+    public function regenerateClientSecret($id)
+    {
+
+        return $this->tx_service->transaction(function () use ($id) {
+
+            $resource_server = $this->repository->get($id);
+
+            if (is_null($resource_server)) {
+                throw new EntityNotFoundException(sprintf('resource server id %s does not exists!', $id));
+            }
+
+            $client = $resource_server->client()->first();
+            if (is_null($client))
+                throw new EntityNotFoundException(sprintf('client not found for resource server id %s!', $id));
+
+            $client = $this->client_service->regenerateClientSecret($client->id);
+
+            return $client->getClientSecret();
+
+        });
+    }
+
+}
diff --git a/app/services/oauth2/SecurityContextService.php b/app/Services/OAuth2/SecurityContextService.php
similarity index 86%
rename from app/services/oauth2/SecurityContextService.php
rename to app/Services/OAuth2/SecurityContextService.php
index 362df5b1..7803d3e5 100644
--- a/app/services/oauth2/SecurityContextService.php
+++ b/app/Services/OAuth2/SecurityContextService.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace Services\OAuth2;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,16 +12,13 @@
  * limitations under the License.
  **/
 
-namespace services\oauth2;
-
-
-use oauth2\models\SecurityContext;
-use oauth2\services\ISecurityContextService;
-use Session;
+use OAuth2\Models\SecurityContext;
+use OAuth2\Services\ISecurityContextService;
+use Illuminate\Support\Facades\Session;
 
 /**
  * Class SecurityContextService
- * @package services\oauth2
+ * @package Services\OAuth2
  */
 final class SecurityContextService implements ISecurityContextService
 {
@@ -49,13 +46,14 @@ final class SecurityContextService implements ISecurityContextService
 
     /**
      * @param SecurityContext $security_context
-     * @return void
+     * @return $this
      */
     public function save(SecurityContext $security_context)
     {
         Session::put(self::RequestedUserIdParam, $security_context->getRequestedUserId());
         Session::put(self::RequestedAuthTime, $security_context->isAuthTimeRequired());
         Session::save();
+        return $this;
     }
 
     /**
@@ -66,5 +64,6 @@ final class SecurityContextService implements ISecurityContextService
         Session::remove(self::RequestedUserIdParam);
         Session::remove(self::RequestedAuthTime);
         Session::save();
+        return $this;
     }
 }
\ No newline at end of file
diff --git a/app/services/oauth2/ServerPrivateKeyService.php b/app/Services/OAuth2/ServerPrivateKeyService.php
similarity index 69%
rename from app/services/oauth2/ServerPrivateKeyService.php
rename to app/Services/OAuth2/ServerPrivateKeyService.php
index 94ca4df4..fd84d73e 100644
--- a/app/services/oauth2/ServerPrivateKeyService.php
+++ b/app/Services/OAuth2/ServerPrivateKeyService.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace Services\OAuth2;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,23 +12,20 @@
  * limitations under the License.
  **/
 
-namespace services\oauth2;
-
-use oauth2\models\IAssymetricKey;
-use oauth2\services\IServerPrivateKey;
-use oauth2\services\IServerPrivateKeyService;
-use oauth2\repositories\IServerPrivateKeyRepository;
-use utils\db\ITransactionService;
-use ServerPrivateKey;
-use DB;
+use OAuth2\Models\IAsymmetricKey;
+use OAuth2\Services\IServerPrivateKeyService;
+use OAuth2\Repositories\IServerPrivateKeyRepository;
+use Utils\Db\ITransactionService;
+use Models\OAuth2\ServerPrivateKey;
+use DateTime;
 use Crypt_RSA;
-use ValidationException;
+use Services\Exceptions\ValidationException;
 
 /**
  * Class ServerPrivateKeyService
- * @package services\oauth2
+ * @package Services\OAuth2
  */
-final class ServerPrivateKeyService extends AssymetricKeyService implements IServerPrivateKeyService
+final class ServerPrivateKeyService extends AsymmetricKeyService implements IServerPrivateKeyService
 {
 
     /**
@@ -36,6 +33,11 @@ final class ServerPrivateKeyService extends AssymetricKeyService implements ISer
      */
     private $rsa;
 
+    /**
+     * ServerPrivateKeyService constructor.
+     * @param IServerPrivateKeyRepository $repository
+     * @param ITransactionService $tx_service
+     */
     public function __construct
     (
         IServerPrivateKeyRepository $repository,
@@ -48,7 +50,7 @@ final class ServerPrivateKeyService extends AssymetricKeyService implements ISer
 
     /**
      * @param array $params
-     * @return IAssymetricKey
+     * @return IAsymmetricKey
      * @throws ValidationException
      */
     public function register(array $params)
@@ -58,19 +60,18 @@ final class ServerPrivateKeyService extends AssymetricKeyService implements ISer
 
         return $this->tx_service->transaction(function() use($params, $rsa, $repository)
         {
-            $pem      = isset($params['pem_content']) ? $params['pem_content'] : '';
-            $password = $params['password'];
+            $pem      = isset($params['pem_content']) ? trim($params['pem_content']) : '';
+            $password = isset($params['password'])? trim($params['password']) : '';
 
             $old_active_key = $repository->getByValidityRange
             (
                 $params['type'],
                 $params['usage'],
                 $params['alg'],
-                new \DateTime($params['valid_from']),
-                new \DateTime($params['valid_to'])
+                new DateTime($params['valid_from']),
+                new DateTime($params['valid_to'])
             )->first();
 
-
             if(empty($pem))
             {
                 if(!empty($password))
@@ -86,12 +87,11 @@ final class ServerPrivateKeyService extends AssymetricKeyService implements ISer
                 $pem = $res['privatekey'];
             }
 
-
             $key = ServerPrivateKey::build
             (
                 $params['kid'],
-                new \DateTime($params['valid_from']),
-                new \DateTime($params['valid_to']),
+                new DateTime($params['valid_from']),
+                new DateTime($params['valid_to']),
                 $params['type'],
                 $params['usage'],
                 $params['alg'],
diff --git a/app/services/oauth2/TokenService.php b/app/Services/OAuth2/TokenService.php
similarity index 71%
rename from app/services/oauth2/TokenService.php
rename to app/Services/OAuth2/TokenService.php
index 1aca01cd..5ae5b17d 100644
--- a/app/services/oauth2/TokenService.php
+++ b/app/Services/OAuth2/TokenService.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace Services\OAuth2;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,70 +12,67 @@
  * limitations under the License.
  **/
 
-namespace services\oauth2;
-
-use AccessToken as DBAccessToken;
-use DB;
-use Event;
-use Session;
-use Crypt;
-use Log;
-use libs\oauth2\exceptions\ReplayAttackAuthCodeException;
-use libs\oauth2\exceptions\ReplayAttackRefreshTokenException;
-use oauth2\exceptions\RevokedAccessTokenException;
-use oauth2\exceptions\RevokedAccessTokenExceptionxtends;
-use oauth2\exceptions\RevokedRefreshTokenException;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Session;
 use jwa\cryptographic_algorithms\HashFunctionAlgorithm;
 use jwt\IBasicJWT;
 use jwt\impl\JWTClaimSet;
 use jwt\JWTClaim;
-use oauth2\builders\IdTokenBuilder;
-use oauth2\exceptions\AbsentClientException;
-use oauth2\exceptions\AbsentCurrentUserException;
-use oauth2\exceptions\ExpiredAccessTokenException;
-use oauth2\exceptions\InvalidAccessTokenException;
-use oauth2\exceptions\InvalidAuthorizationCodeException;
-use oauth2\exceptions\InvalidClientCredentials;
-use oauth2\exceptions\InvalidGrantTypeException;
-use oauth2\exceptions\RecipientKeyNotFoundException;
-use oauth2\exceptions\ReplayAttackException;
-use oauth2\heuristics\EncryptionClientPublicKeyFinder;
-use oauth2\heuristics\SigningClientPublicKeyFinder;
-use oauth2\models\AccessToken;
-use oauth2\models\AuthorizationCode;
-use oauth2\models\IClient;
-use oauth2\models\RefreshToken;
-use oauth2\OAuth2Protocol;
-use oauth2\repositories\IServerPrivateKeyRepository;
-use oauth2\services\Authorization;
-use oauth2\services\IClientJWKSetReader;
-use oauth2\services\IClientService;
-use oauth2\services\IPrincipalService;
-use oauth2\services\ISecurityContextService;
-use oauth2\services\ITokenService;
-use oauth2\services\IUserConsentService;
-use RefreshToken as RefreshTokenDB;
-use RefreshToken as DBRefreshToken;
+use OAuth2\Models\AccessToken;
+use Models\OAuth2\AccessToken as AccessTokenDB;
+use Models\OAuth2\RefreshToken as RefreshTokenDB;
+use Models\OAuth2\ResourceServer;
+use OAuth2\Builders\IdTokenBuilder;
+use OAuth2\Exceptions\AbsentClientException;
+use OAuth2\Exceptions\AbsentCurrentUserException;
+use OAuth2\Exceptions\ExpiredAccessTokenException;
+use OAuth2\Exceptions\InvalidAccessTokenException;
+use OAuth2\Exceptions\InvalidAuthorizationCodeException;
+use OAuth2\Exceptions\InvalidClientCredentials;
+use OAuth2\Exceptions\InvalidGrantTypeException;
+use OAuth2\Exceptions\ReplayAttackAuthCodeException;
+use OAuth2\Exceptions\ReplayAttackException;
+use OAuth2\Exceptions\ReplayAttackRefreshTokenException;
+use OAuth2\Exceptions\RevokedAccessTokenException;
+use OAuth2\Exceptions\RevokedRefreshTokenException;
+use OAuth2\Models\AuthorizationCode;
+use OAuth2\Models\IClient;
+use OAuth2\Models\RefreshToken;
+use OAuth2\Repositories\IAccessTokenRepository;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Repositories\IRefreshTokenRepository;
+use OAuth2\Repositories\IResourceServerRepository;
+use OAuth2\Services\ITokenService;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Repositories\IServerPrivateKeyRepository;
+use OAuth2\Services\IClientJWKSetReader;
+use OAuth2\Services\IClientService;
+use OAuth2\Services\IPrincipalService;
+use OAuth2\Services\ISecurityContextService;
+use OAuth2\Services\IUserConsentService;
 use utils\Base64UrlRepresentation;
 use utils\ByteUtil;
-use utils\db\ITransactionService;
-use utils\exceptions\UnacquiredLockException;
-use utils\IPHelper;
+use Utils\Db\ITransactionService;
+use Utils\Exceptions\ConfigurationException;
+use Utils\Exceptions\UnacquiredLockException;
+use Utils\IPHelper;
 use utils\json_types\JsonValue;
 use utils\json_types\NumericDate;
 use utils\json_types\StringOrURI;
-use utils\services\IAuthService;
-use utils\services\ICacheService;
-use utils\services\IdentifierGenerator;
-use utils\services\ILockManagerService;
-use utils\services\IServerConfigurationService;
+use Utils\Services\IAuthService;
+use Utils\Services\ICacheService;
+use Utils\Services\IdentifierGenerator;
+use Utils\Services\ILockManagerService;
+use Utils\Services\IServerConfigurationService;
 use Zend\Crypt\Hash;
-use utils\exceptions\ConfigurationException;
+use Exception;
 
 /**
  * Class TokenService
  * Provides all Tokens related operations (create, get and revoke)
- * @package services\oauth2
+ * @package Services\OAuth2
  */
 final class TokenService implements ITokenService
 {
@@ -141,6 +138,7 @@ final class TokenService implements ITokenService
      * @var IClientJWKSetReader
      */
     private $jwk_set_reader_service;
+
     /**
      * @var ITransactionService
      */
@@ -162,22 +160,25 @@ final class TokenService implements ITokenService
     private $id_token_builder;
 
     /**
-     * @param IClientService $client_service
-     * @param ILockManagerService $lock_manager_service
-     * @param IServerConfigurationService $configuration_service
-     * @param ICacheService $cache_service
-     * @param IAuthService $auth_service
-     * @param IUserConsentService $user_consent_service
-     * @param IdentifierGenerator $auth_code_generator
-     * @param IdentifierGenerator $access_token_generator
-     * @param IdentifierGenerator $refresh_token_generator
-     * @param IServerPrivateKeyRepository $server_private_key_repository
-     * @param IClientJWKSetReader $jwk_set_reader_service
-     * @param ISecurityContextService $security_context_service
-     * @param IPrincipalService $principal_service
-     * @param IdTokenBuilder $id_token_builder
-     * @param ITransactionService $tx_service
+     * @var IClientRepository
      */
+    private $client_repository;
+
+    /**
+     * @var IAccessTokenRepository
+     */
+    private $access_token_repository;
+
+    /**
+     * @var IRefreshTokenRepository
+     */
+    private $refresh_token_repository;
+
+    /**
+     * @var IResourceServerRepository
+     */
+    private $resource_server_repository;
+
     public function __construct
     (
         IClientService $client_service,
@@ -194,6 +195,10 @@ final class TokenService implements ITokenService
         ISecurityContextService $security_context_service,
         IPrincipalService $principal_service,
         IdTokenBuilder $id_token_builder,
+        IClientRepository $client_repository,
+        IAccessTokenRepository $access_token_repository,
+        IRefreshTokenRepository $refresh_token_repository,
+        IResourceServerRepository $resource_server_repository,
         ITransactionService $tx_service
     )
     {
@@ -211,16 +216,18 @@ final class TokenService implements ITokenService
         $this->security_context_service      = $security_context_service;
         $this->principal_service             = $principal_service;
         $this->id_token_builder              = $id_token_builder;
+        $this->client_repository             = $client_repository;
+        $this->access_token_repository       = $access_token_repository;
+        $this->refresh_token_repository      = $refresh_token_repository;
+        $this->resource_server_repository    = $resource_server_repository;
         $this->tx_service                    = $tx_service;
 
-        $this_var = $this;
-
-        Event::listen('oauth2.client.delete', function ($client_id) use (&$this_var) {
-            $this_var->revokeClientRelatedTokens($client_id);
+        Event::listen('oauth2.client.delete', function ($client_id) {
+            $this->revokeClientRelatedTokens($client_id);
         });
 
-        Event::listen('oauth2.client.regenerate.secret', function ($client_id) use (&$this_var) {
-            $this_var->revokeClientRelatedTokens($client_id);
+        Event::listen('oauth2.client.regenerate.secret', function ($client_id) {
+            $this->revokeClientRelatedTokens($client_id);
         });
     }
 
@@ -314,8 +321,8 @@ final class TokenService implements ITokenService
     /**
      * @param $value
      * @return AuthorizationCode
-     * @throws \oauth2\exceptions\ReplayAttackException
-     * @throws \oauth2\exceptions\InvalidAuthorizationCodeException
+     * @throws ReplayAttackException
+     * @throws InvalidAuthorizationCodeException
      */
     public function getAuthorizationCode($value)
     {
@@ -408,10 +415,11 @@ final class TokenService implements ITokenService
             )
         );
 
-        $cache_service  = $this->cache_service;
-        $client_service = $this->client_service;
-        $auth_service   = $this->auth_service;
-        $this_var       = $this;
+        $cache_service           = $this->cache_service;
+        $client_service          = $this->client_service;
+        $auth_service            = $this->auth_service;
+        $client_repository       = $this->client_repository;
+        $access_token_repository = $this->access_token_repository;
 
         return $this->tx_service->transaction(function () use (
             $auth_code,
@@ -420,7 +428,8 @@ final class TokenService implements ITokenService
             $cache_service,
             $client_service,
             $auth_service,
-            $this_var
+            $client_repository,
+            $access_token_repository
         ) {
 
             $value        = $access_token->getValue();
@@ -428,27 +437,29 @@ final class TokenService implements ITokenService
             //oauth2 client id
             $client_id    = $access_token->getClientId();
             $user_id      = $access_token->getUserId();
-            $client       = $client_service->getClientById($client_id);
+            $client       = $client_repository->getClientById($client_id);
             $user         = $auth_service->getUserById($user_id);
 
-            $access_token_db = new DBAccessToken
+            // TODO; move to a factory
+
+            $access_token_db = new AccessTokenDB
             (
-                array
-                (
-                    'value'    => $hashed_value,
-                    'from_ip'  => IPHelper::getUserIp(),
+                [
+                    'value'                         => $hashed_value,
+                    'from_ip'                       => IPHelper::getUserIp(),
                     'associated_authorization_code' => Hash::compute('sha256', $auth_code->getValue()),
-                    'lifetime' => $access_token->getLifetime(),
-                    'scope'    => $access_token->getScope(),
-                    'audience' => $access_token->getAudience()
-                )
+                    'lifetime'                      => $access_token->getLifetime(),
+                    'scope'                         => $access_token->getScope(),
+                    'audience'                      => $access_token->getAudience()
+                ]
             );
 
             $access_token_db->client()->associate($client);
 
             $access_token_db->user()->associate($user);
 
-            $access_token_db->save();
+            $access_token_repository->add($access_token_db);
+
             //check if use refresh tokens...
             Log::debug
             (
@@ -490,11 +501,11 @@ final class TokenService implements ITokenService
                 )
                 {
                     Log::debug('creating refresh token ....');
-                    $this_var->createRefreshToken($access_token);
+                    $this->createRefreshToken($access_token);
                 }
             }
 
-            $this_var->storesAccessTokenOnCache($access_token);
+            $this->storesAccessTokenOnCache($access_token);
             //stores brand new access token hash value on a set by client id...
             $cache_service->addMemberSet($client_id . TokenService::ClientAccessTokenPrefixList, $hashed_value);
 
@@ -531,41 +542,41 @@ final class TokenService implements ITokenService
             )
         );
 
-        $cache_service  = $this->cache_service;
-        $client_service = $this->client_service;
-        $auth_service   = $this->auth_service;
-        $this_var       = $this;
+        $cache_service           = $this->cache_service;
+        $client_repository       = $this->client_repository;
+        $auth_service            = $this->auth_service;
+        $access_token_repository = $this->access_token_repository;
 
-        $this->tx_service->transaction(function () use (
+        return $this->tx_service->transaction(function () use (
             $client_id,
             $scope,
             $audience,
             $user_id,
-            &$access_token,
-            &$this_var,
-            &$cache_service,
-            &$client_service,
-            &$auth_service
+            $access_token,
+            $cache_service,
+            $client_repository,
+            $access_token_repository,
+            $auth_service
         ) {
 
 
-            $value = $access_token->getValue();
+            $value        = $access_token->getValue();
             $hashed_value = Hash::compute('sha256', $value);
 
-            $this_var->storesAccessTokenOnCache($access_token);
+            $this->storesAccessTokenOnCache($access_token);
 
             $client_id = $access_token->getClientId();
-            $client = $client_service->getClientById($client_id);
+            $client    = $client_repository->getClientById($client_id);
 
-            //stores in DB
-            $access_token_db = new DBAccessToken(
-                array(
-                    'value' => $hashed_value,
-                    'from_ip' => IPHelper::getUserIp(),
+            // todo: move to a factory
+            $access_token_db = new AccessTokenDB(
+                [
+                    'value'    => $hashed_value,
+                    'from_ip'  => IPHelper::getUserIp(),
                     'lifetime' => $access_token->getLifetime(),
-                    'scope' => $access_token->getScope(),
+                    'scope'    => $access_token->getScope(),
                     'audience' => $access_token->getAudience()
-                )
+                ]
             );
 
             $access_token_db->client()->associate($client);
@@ -575,16 +586,14 @@ final class TokenService implements ITokenService
                 $access_token_db->user()->associate($user);
             }
 
-            $access_token_db->Save();
+            $access_token_repository->add($access_token_db);
 
             //stores brand new access token hash value on a set by client id...
             $cache_service->addMemberSet($client_id . TokenService::ClientAccessTokenPrefixList, $hashed_value);
-            $cache_service->incCounter($client_id . TokenService::ClientAccessTokensQty,
-                TokenService::ClientAccessTokensQtyLifetime);
-
+            $cache_service->incCounter($client_id . TokenService::ClientAccessTokensQty, TokenService::ClientAccessTokensQtyLifetime);
+            return $access_token;
         });
 
-        return $access_token;
     }
 
     /**
@@ -595,30 +604,29 @@ final class TokenService implements ITokenService
     public function createAccessTokenFromRefreshToken(RefreshToken $refresh_token, $scope = null)
     {
 
-        $cache_service          = $this->cache_service;
-        $client_service         = $this->client_service;
-        $configuration_service  = $this->configuration_service;
-        $auth_service           = $this->auth_service;
-        $access_token_generator = $this->access_token_generator;
-        $this_var               = $this;
-
+        $cache_service           = $this->cache_service;
+        $client_repository       = $this->client_repository;
+        $configuration_service   = $this->configuration_service;
+        $auth_service            = $this->auth_service;
+        $access_token_generator  = $this->access_token_generator;
+        $access_token_repository = $this->access_token_repository;
 
         //preserve entire operation on db transaction...
         return $this->tx_service->transaction(function () use (
             $refresh_token,
             $scope,
-            $this_var,
             $cache_service,
-            $client_service,
+            $client_repository,
             $auth_service,
             $configuration_service,
+            $access_token_repository,
             $access_token_generator
         ) {
 
             $refresh_token_value         = $refresh_token->getValue();
-            $refresh_token_hashed_value = Hash::compute('sha256', $refresh_token_value);
+            $refresh_token_hashed_value  = Hash::compute('sha256', $refresh_token_value);
             //clear current access tokens as invalid
-            $this_var->clearAccessTokensForRefreshToken($refresh_token->getValue());
+            $this->clearAccessTokensForRefreshToken($refresh_token->getValue());
 
             //validate scope if present...
             if (!is_null($scope) && empty($scope))
@@ -658,19 +666,19 @@ final class TokenService implements ITokenService
                 )
             );
 
-            $value = $access_token->getValue();
+            $value        = $access_token->getValue();
             $hashed_value = Hash::compute('sha256', $value);
 
-            $this_var->storesAccessTokenOnCache($access_token);
+            $this->storesAccessTokenOnCache($access_token);
 
             //get user id
             $user_id = $access_token->getUserId();
             //get current client
             $client_id = $access_token->getClientId();
-            $client = $client_service->getClientById($client_id);
+            $client    = $client_repository->getClientById($client_id);
 
-            //stores in DB
-            $access_token_db = new DBAccessToken
+            //todo : move to a factory
+            $access_token_db = new AccessTokenDB
             (
                 array
                 (
@@ -683,7 +691,7 @@ final class TokenService implements ITokenService
             );
 
             //save relationships
-            $refresh_token_db = DBRefreshToken::where('value', '=', $refresh_token_hashed_value)->first();
+            $refresh_token_db = $this->refresh_token_repository->getByValue($refresh_token_hashed_value);
             $access_token_db->refresh_token()->associate($refresh_token_db);
 
             $access_token_db->client()->associate($client);
@@ -694,7 +702,7 @@ final class TokenService implements ITokenService
                 $access_token_db->user()->associate($user);
             }
 
-            $access_token_db->Save();
+            $access_token_repository->add($access_token_db);
 
             //stores brand new access token hash value on a set by client id...
             $cache_service->addMemberSet($client_id . TokenService::ClientAccessTokenPrefixList, $hashed_value);
@@ -709,13 +717,13 @@ final class TokenService implements ITokenService
 
     /**
      * @param AccessToken $access_token
-     * @throws \oauth2\exceptions\InvalidAccessTokenException
+     * @throws InvalidAccessTokenException
      */
     public function storesAccessTokenOnCache(AccessToken $access_token)
     {
         //stores in REDIS
 
-        $value = $access_token->getValue();
+        $value        = $access_token->getValue();
         $hashed_value = Hash::compute('sha256', $value);
 
         if ($this->cache_service->exists($hashed_value)) {
@@ -724,11 +732,13 @@ final class TokenService implements ITokenService
 
         $auth_code = !is_null($access_token->getAuthCode()) ? Hash::compute('sha256',
             $access_token->getAuthCode()) : '';
+
         $refresh_token_value = !is_null($access_token->getRefreshToken()) ? Hash::compute('sha256',
             $access_token->getRefreshToken()->getValue()) : '';
+
         $user_id = !is_null($access_token->getUserId()) ? $access_token->getUserId() : 0;
 
-        $this->cache_service->storeHash($hashed_value, array(
+        $this->cache_service->storeHash($hashed_value, [
             'user_id'       => $user_id,
             'client_id'     => $access_token->getClientId(),
             'scope'         => $access_token->getScope(),
@@ -738,14 +748,14 @@ final class TokenService implements ITokenService
             'audience'      => $access_token->getAudience(),
             'from_ip'       => IPHelper::getUserIp(),
             'refresh_token' => $refresh_token_value
-        ), intval($access_token->getLifetime()));
+        ], intval($access_token->getLifetime()));
     }
 
     /**
-     * @param DBAccessToken $access_token
-     * @throws \oauth2\exceptions\InvalidAccessTokenException
+     * @param AccessTokenDB $access_token
+     * @throws InvalidAccessTokenException
      */
-    public function storesDBAccessTokenOnCache(DBAccessToken $access_token)
+    public function storeAccessTokenDBOnCache(AccessTokenDB $access_token)
     {
         //stores in Cache
 
@@ -754,15 +764,16 @@ final class TokenService implements ITokenService
         }
 
         $refresh_token_value = '';
-        $refresh_token_db = $access_token->refresh_token()->first();
+        $refresh_token_db    = $access_token->getRefreshToken();
+
         if (!is_null($refresh_token_db)) {
             $refresh_token_value = $refresh_token_db->value;
         }
 
         $user_id = !is_null($access_token->user_id) ? $access_token->user_id : 0;
-        $client  = $access_token->client()->first();
+        $client  = $access_token->getClient();
 
-        $this->cache_service->storeHash($access_token->value, array(
+        $this->cache_service->storeHash($access_token->value, [
                 'user_id'       => $user_id,
                 'client_id'     => $client->client_id,
                 'scope'         => $access_token->scope,
@@ -772,8 +783,7 @@ final class TokenService implements ITokenService
                 'from_ip'       => $access_token->from_ip,
                 'audience'      => $access_token->audience,
                 'refresh_token' => $refresh_token_value
-            )
-            , intval($access_token->lifetime));
+            ], intval($access_token->lifetime));
 
     }
 
@@ -782,21 +792,21 @@ final class TokenService implements ITokenService
      * @param bool $is_hashed
      * @return AccessToken
      * @throws InvalidAccessTokenException
-     * @throws \Exception
+     * @throws Exception
      */
     public function getAccessToken($value, $is_hashed = false)
     {
-        $cache_service         = $this->cache_service;
-        $lock_manager_service  = $this->lock_manager_service;
-        $configuration_service = $this->configuration_service;
-        $this_var              = $this;
+        $cache_service           = $this->cache_service;
+        $lock_manager_service    = $this->lock_manager_service;
+        $configuration_service   = $this->configuration_service;
+        $access_token_repository = $this->access_token_repository;
 
         return $this->tx_service->transaction(function () use (
-            $this_var,
             $value,
             $is_hashed,
             $cache_service,
             $lock_manager_service,
+            $access_token_repository,
             $configuration_service
         ) {
             //hash the given value, bc tokens values are stored hashed on DB
@@ -808,16 +818,16 @@ final class TokenService implements ITokenService
                 // check cache ...
                 if (!$cache_service->exists($hashed_value))
                 {
-                    $lock_manager_service->lock('lock.get.accesstoken.' . $hashed_value, function() use($value, $hashed_value, $this_var){
+                    $lock_manager_service->lock('lock.get.accesstoken.' . $hashed_value, function() use($value, $hashed_value, $access_token_repository){
                         // check on DB...
-                        $access_token_db = DBAccessToken::where('value', '=', $hashed_value)->first();
+                        $access_token_db = $access_token_repository->getByValue($hashed_value);
                         if (is_null($access_token_db))
                         {
-                            if($this_var->isAccessTokenRevoked($hashed_value))
+                            if($this->isAccessTokenRevoked($hashed_value))
                             {
                                 throw new RevokedAccessTokenException(sprintf('Access token %s is revoked!', $value));
                             }
-                            else if($this_var->isAccessTokenVoid($hashed_value)) // check if its marked on cache as expired ...
+                            else if($this->isAccessTokenVoid($hashed_value)) // check if its marked on cache as expired ...
                             {
                                 throw new ExpiredAccessTokenException(sprintf('Access token %s is expired!', $value));
                             }
@@ -833,7 +843,7 @@ final class TokenService implements ITokenService
                             throw new ExpiredAccessTokenException(sprintf('Access token %s is expired!', $value));
                         }
                         //reload on cache
-                        $this_var->storesDBAccessTokenOnCache($access_token_db);
+                        $this->storeAccessTokenDBOnCache($access_token_db);
                     });
                 }
 
@@ -862,8 +872,8 @@ final class TokenService implements ITokenService
                     null,
                     $configuration_service->getConfigValue('OAuth2.AuthorizationCode.Lifetime'),
                     $cache_values['from_ip'],
-                    $access_type = OAuth2Protocol::OAuth2Protocol_AccessType_Online,
-                    $approval_prompt = OAuth2Protocol::OAuth2Protocol_Approval_Prompt_Auto,
+                    $access_type               = OAuth2Protocol::OAuth2Protocol_AccessType_Online,
+                    $approval_prompt           = OAuth2Protocol::OAuth2Protocol_Approval_Prompt_Auto,
                     $has_previous_user_consent = false,
                     null,
                     null,
@@ -880,13 +890,13 @@ final class TokenService implements ITokenService
                 $refresh_token_value = $cache_values['refresh_token'];
 
                 if (!empty($refresh_token_value)) {
-                    $refresh_token = $this_var->getRefreshToken($refresh_token_value, true);
+                    $refresh_token = $this->getRefreshToken($refresh_token_value, true);
                     $access_token->setRefreshToken($refresh_token);
                 }
             }
             catch (UnacquiredLockException $ex1)
             {
-                throw new InvalidAccessTokenException("access token %s ", $value);
+                throw new InvalidAccessTokenException(sprintf("access token %s ", $value));
             }
             return $access_token;
         });
@@ -906,9 +916,9 @@ final class TokenService implements ITokenService
         if (!is_array($current_audience)) {
             $current_audience = array($current_audience);
         }
-        return \ResourceServer::where('ips','like', '%'.$current_ip.'%')
-            ->where('active', '=', true)
-            ->whereIn('host', $current_audience)->count() > 0;
+
+        $resource_server = $this->resource_server_repository->getByAudienceAndIpAndActive($current_audience, $current_ip);
+        return !is_null($resource_server);
     }
 
 
@@ -926,53 +936,60 @@ final class TokenService implements ITokenService
             )
         );
 
-        $client_service = $this->client_service;
-        $auth_service = $this->auth_service;
-        $cache_service = $this->cache_service;
-        $this_var = $this;
+        $client_repository        = $this->client_repository;
+        $auth_service             = $this->auth_service;
+        $cache_service            = $this->cache_service;
+        $access_token_repository  = $this->access_token_repository;
+        $refresh_token_repository = $this->refresh_token_repository;
 
-        $this->tx_service->transaction(function () use (
-            &$refresh_token,
-            &$access_token,
-            &$this_var,
-            &$client_service,
-            &$auth_service,
-            &$cache_service
+        return $this->tx_service->transaction(function () use (
+            $refresh_token,
+            $access_token,
+            $client_repository,
+            $auth_service,
+            $cache_service,
+            $access_token_repository,
+            $refresh_token_repository
         ) {
-            $value = $refresh_token->getValue();
+            $value        = $refresh_token->getValue();
             //hash the given value, bc tokens values are stored hashed on DB
             $hashed_value = Hash::compute('sha256', $value);
-            $client_id = $refresh_token->getClientId();
-            $user_id = $refresh_token->getUserId();
-            $client = $client_service->getClientById($client_id);
-            $user = $auth_service->getUserById($user_id);
-            //stores in DB
-            $refresh_token_db = new DBRefreshToken (
-                array(
-                    'value' => $hashed_value,
+            $client_id    = $refresh_token->getClientId();
+            $user_id      = $refresh_token->getUserId();
+            $client       = $client_repository->getClientById($client_id);
+            $user         = $auth_service->getUserById($user_id);
+
+            // todo: move to a factory
+            $refresh_token_db = new RefreshTokenDB (
+                [
+                    'value'    => $hashed_value,
                     'lifetime' => $refresh_token->getLifetime(),
-                    'scope' => $refresh_token->getScope(),
-                    'from_ip' => IPHelper::getUserIp(),
+                    'scope'    => $refresh_token->getScope(),
+                    'from_ip'  => IPHelper::getUserIp(),
                     'audience' => $access_token->getAudience(),
-                )
+                ]
             );
 
             $refresh_token_db->client()->associate($client);
             $refresh_token_db->user()->associate($user);
-            $refresh_token_db->Save();
+            $refresh_token_repository->add($refresh_token_db);
             //associate current access token to refresh token on DB
-            $access_token_db = DBAccessToken::where('value', '=',
-                Hash::compute('sha256', $access_token->getValue()))->first();
+            $access_token_db = $this->access_token_repository->getByValue(Hash::compute('sha256', $access_token->getValue()));
             $access_token_db->refresh_token()->associate($refresh_token_db);
-            $access_token_db->Save();
+
+            $access_token_repository->add($access_token_db);
 
             $access_token->setRefreshToken($refresh_token);
 
-            $cache_service->incCounter($client_id . TokenService::ClientRefreshTokensQty,
-                TokenService::ClientRefreshTokensQtyLifetime);
+            $cache_service->incCounter
+            (
+                $client_id . TokenService::ClientRefreshTokensQty,
+                TokenService::ClientRefreshTokensQtyLifetime
+            );
+
+            return $refresh_token;
         });
 
-        return $refresh_token;
     }
 
     /**
@@ -988,7 +1005,7 @@ final class TokenService implements ITokenService
         //hash the given value, bc tokens values are stored hashed on DB
         $hashed_value     = !$is_hashed ? Hash::compute('sha256', $value) : $value;
 
-        $refresh_token_db = DBRefreshToken::where('value', '=', $hashed_value)->first();
+        $refresh_token_db = $this->refresh_token_repository->getByValue($hashed_value);
 
         if (is_null($refresh_token_db))
         {
@@ -1017,7 +1034,7 @@ final class TokenService implements ITokenService
             throw new InvalidGrantTypeException(sprintf("refresh token %s is expired!", $value));
         }
 
-        $client = $refresh_token_db->client()->first();
+        $client = $refresh_token_db->getClient();
 
         $refresh_token = RefreshToken::load
         (
@@ -1045,32 +1062,46 @@ final class TokenService implements ITokenService
      */
     public function revokeAuthCodeRelatedTokens($auth_code)
     {
-        $auth_code_hashed_value = Hash::compute('sha256', $auth_code);
-        $cache_service = $this->cache_service;
+        $auth_code_hashed_value   = Hash::compute('sha256', $auth_code);
+        $cache_service            = $this->cache_service;
+        $access_token_repository  = $this->access_token_repository;
+        $refresh_token_repository = $this->refresh_token_repository;
 
-        $this->tx_service->transaction(function () use ($auth_code_hashed_value, &$cache_service) {
+        $this->tx_service->transaction(function () use
+        (
+            $auth_code_hashed_value,
+            $cache_service,
+            $access_token_repository,
+            $refresh_token_repository
+        ) {
             //get related access tokens
-            $db_access_tokens = DBAccessToken::where('associated_authorization_code', '=',
-                $auth_code_hashed_value)->get();
+            $db_access_token    = $access_token_repository->getByAuthCode($auth_code_hashed_value);
+            if(is_null($db_access_token)) return;
 
-            foreach ($db_access_tokens as $db_access_token) {
-
-                $client = $db_access_token->client()->first();
-                $access_token_value = $db_access_token->value;
-                $refresh_token_db = $db_access_token->refresh_token()->first();
-
-                if (!is_null($refresh_token_db)) {
-                    $refresh_token_db->delete();
-                }
-                //remove auth code from client list on cache
-                $cache_service->deleteMemberSet($client->client_id . TokenService::ClientAuthCodePrefixList,
-                    $auth_code_hashed_value);
+            $client             = $db_access_token->getClient();
+            $access_token_value = $db_access_token->value;
+            $refresh_token_db   = $db_access_token->refresh_token()->first();
+            //remove auth code from client list on cache
+            $cache_service->deleteMemberSet
+            (
+                $client->client_id . TokenService::ClientAuthCodePrefixList,
+                $auth_code_hashed_value
+            );
                 //remove access token from client list on cache
-                $cache_service->deleteMemberSet($client->client_id . TokenService::ClientAccessTokenPrefixList,
-                    $access_token_value);
-                $cache_service->delete($access_token_value);
-                $db_access_token->delete();
+            $cache_service->deleteMemberSet
+            (
+                $client->client_id . TokenService::ClientAccessTokenPrefixList,
+                $access_token_value
+            );
+
+            $cache_service->delete($access_token_value);
+
+            $access_token_repository->delete($db_access_token);
+
+            if (!is_null($refresh_token_db)) {
+                $this->revokeRefreshToken($refresh_token_db->value, true);
             }
+
         });
     }
 
@@ -1083,31 +1114,39 @@ final class TokenService implements ITokenService
     public function revokeAccessToken($value, $is_hashed = false)
     {
 
-        $cache_service = $this->cache_service;
-        $this_var      = $this;
+        $cache_service            = $this->cache_service;
+        $access_token_repository  = $this->access_token_repository;
+
+        return $this->tx_service->transaction(function () use
+        (
+            $value,
+            $is_hashed,
+            $cache_service,
+            $access_token_repository
+        ) {
 
-        return $this->tx_service->transaction(function () use ($value, $is_hashed, $cache_service, $this_var) {
-            $res = 0;
             //hash the given value, bc tokens values are stored hashed on DB
             $hashed_value = !$is_hashed ? Hash::compute('sha256', $value) : $value;
 
-            $access_token_db = DBAccessToken::where('value', '=', $hashed_value)->first();
+            $access_token_db = $access_token_repository->getByValue($hashed_value);
+
             if(is_null($access_token_db)) return false;
-            $client          = $access_token_db->client()->first();
+
+            $client          = $access_token_db->getClient();
             //delete from cache
-            $res = $cache_service->delete($hashed_value);
-            $res = $cache_service->deleteMemberSet
+            $cache_service->delete($hashed_value);
+            $cache_service->deleteMemberSet
             (
                 $client->client_id . TokenService::ClientAccessTokenPrefixList,
                 $access_token_db->value
             );
 
             //check on DB... and delete it
-            $res = $access_token_db->delete();
+            $access_token_repository->delete($access_token_db);
 
-            $this_var->markAccessTokenAsRevoked($hashed_value);
+            $this->markAccessTokenAsRevoked($hashed_value);
 
-            return $res > 0;
+            return true;
         });
 
     }
@@ -1119,31 +1158,37 @@ final class TokenService implements ITokenService
      */
     public function expireAccessToken($value, $is_hashed = false)
     {
-        $cache_service = $this->cache_service;
-        $this_var      = $this;
+        $cache_service            = $this->cache_service;
+        $access_token_repository  = $this->access_token_repository;
 
-        return $this->tx_service->transaction(function () use ($value, $is_hashed, $cache_service, $this_var) {
-            $res = 0;
+        return $this->tx_service->transaction(function () use
+        (
+            $value,
+            $is_hashed,
+            $cache_service,
+            $access_token_repository
+        ) {
             //hash the given value, bc tokens values are stored hashed on DB
             $hashed_value = !$is_hashed ? Hash::compute('sha256', $value) : $value;
 
-            $access_token_db = DBAccessToken::where('value', '=', $hashed_value)->first();
+            $access_token_db = $access_token_repository->getByValue($hashed_value);
+
             if(is_null($access_token_db)) return false;
-            $client          = $access_token_db->client()->first();
+
+            $client          = $access_token_db->getClient();
             //delete from cache
-            $res = $cache_service->delete($hashed_value);
-            $res = $cache_service->deleteMemberSet
+            $cache_service->delete($hashed_value);
+            $cache_service->deleteMemberSet
             (
                 $client->client_id . TokenService::ClientAccessTokenPrefixList,
                 $access_token_db->value
             );
 
-            //check on DB... and delete it
-            $res = $access_token_db->delete();
+            $access_token_repository->delete($access_token_db);
 
-            $this_var->markAccessTokenAsVoid($hashed_value);
+            $this->markAccessTokenAsVoid($hashed_value);
 
-            return $res > 0;
+            return true;
         });
     }
 
@@ -1154,23 +1199,22 @@ final class TokenService implements ITokenService
     public function revokeClientRelatedTokens($client_id)
     {
         //get client auth codes
-        $auth_codes     = $this->cache_service->getSet($client_id . self::ClientAuthCodePrefixList);
+        $auth_codes        = $this->cache_service->getSet($client_id . self::ClientAuthCodePrefixList);
         //get client access tokens
-        $access_tokens  = $this->cache_service->getSet($client_id . self::ClientAccessTokenPrefixList);
+        $access_tokens     = $this->cache_service->getSet($client_id . self::ClientAccessTokenPrefixList);
+        $client_repository = $this->client_repository;
+        $cache_service     = $this->cache_service;
 
-        $client_service = $this->client_service;
-        $cache_service  = $this->cache_service;
-        $this_var       = $this;
 
         $this->tx_service->transaction(function () use (
             $client_id,
             $auth_codes,
             $access_tokens,
             $cache_service,
-            $client_service,
-            $this_var
+            $client_repository
+
         ) {
-            $client = $client_service->getClientById($client_id);
+            $client = $client_repository->getClientById($client_id);
 
             if (is_null($client))
             {
@@ -1182,12 +1226,12 @@ final class TokenService implements ITokenService
             //revoke on db
             foreach($client->access_tokens()->get() as $at)
             {
-                $this_var->markAccessTokenAsRevoked($at->value);
+                $this->markAccessTokenAsRevoked($at->value);
             }
 
             foreach($client->refresh_tokens()->get() as $rt)
             {
-                $this_var->markRefreshTokenAsRevoked($rt);
+                $this->markRefreshTokenAsRevoked($rt);
             }
 
             $client->access_tokens()->delete();
@@ -1272,9 +1316,12 @@ final class TokenService implements ITokenService
      */
     public function invalidateRefreshToken($value, $is_hashed = false)
     {
-        $hashed_value = !$is_hashed ? Hash::compute('sha256', $value) : $value;
-        $res          = RefreshTokenDB::where('value', '=', $hashed_value)->update(array('void' => true));
-        return $res > 0;
+        $hashed_value  = !$is_hashed ? Hash::compute('sha256', $value) : $value;
+        $refresh_token = $this->refresh_token_repository->getByValue($hashed_value);
+        if(is_null($refresh_token)) return false;
+        $refresh_token->setVoid();
+        $this->refresh_token_repository->add($refresh_token);
+        return true;
     }
 
     /**
@@ -1285,136 +1332,63 @@ final class TokenService implements ITokenService
      */
     public function revokeRefreshToken($value, $is_hashed = false)
     {
-        $res = false;
-        $this_var = $this;
-
-        $this->tx_service->transaction(function () use ($value, $is_hashed, &$res, &$this_var) {
-            $res = $this_var->invalidateRefreshToken($value, $is_hashed);
-            $res = $res && $this_var->clearAccessTokensForRefreshToken($value, $is_hashed);
+        return $this->tx_service->transaction(function () use ($value, $is_hashed) {
+            $res = $this->invalidateRefreshToken($value, $is_hashed);
+            return $res && $this->clearAccessTokensForRefreshToken($value, $is_hashed);
         });
 
-        return $res;
     }
 
     /**
      * Revokes all access tokens for a give refresh token
-     * @param $value refresh token value
+     * @param string $value refresh token value
      * @param bool $is_hashed
      * @return bool|void
      */
     public function clearAccessTokensForRefreshToken($value, $is_hashed = false)
     {
 
-        $hashed_value  = !$is_hashed ? Hash::compute('sha256', $value) : $value;
-        $cache_service = $this->cache_service;
-        $this_var      = $this;
+        $hashed_value             = !$is_hashed ? Hash::compute('sha256', $value) : $value;
+        $cache_service            = $this->cache_service;
+        $access_token_repository  = $this->access_token_repository;
+        $refresh_token_repository = $this->refresh_token_repository;
 
-        return $this->tx_service->transaction(function () use ($hashed_value, $cache_service, $this_var) {
+        return $this->tx_service->transaction(function () use
+        (
+            $hashed_value,
+            $cache_service,
+            $access_token_repository, $refresh_token_repository) {
 
-            $res = false;
-            $refresh_token_db = DBRefreshToken::where('value', '=', $hashed_value)->first();
+            $refresh_token_db = $refresh_token_repository->getByValue($hashed_value);
 
             if (!is_null($refresh_token_db))
             {
-                $access_tokens_db = DBAccessToken::where('refresh_token_id', '=', $refresh_token_db->id)->get();
+                $access_tokens_db = $access_token_repository->getByRefreshToken($refresh_token_db->id);
 
-                if (!count($access_tokens_db))
-                {
-                    $res = true;
-                }
+                if (count($access_tokens_db) == 0) return false;
 
                 foreach ($access_tokens_db as $access_token_db)
                 {
 
-                    $res    = $cache_service->delete($access_token_db->value);
-                    $client = $access_token_db->client()->first();
-                    $res    = $cache_service->deleteMemberSet
-                              (
-                                $client->client_id . TokenService::ClientAccessTokenPrefixList,
-                                $access_token_db->value
-                              );
+                    $cache_service->delete($access_token_db->value);
+                    $client = $access_token_db->getClient();
+                    $cache_service->deleteMemberSet
+                    (
+                        $client->client_id . TokenService::ClientAccessTokenPrefixList,
+                        $access_token_db->value
+                    );
 
-                    $this_var->markAccessTokenAsRevoked($access_token_db->value);
+                    $this->markAccessTokenAsRevoked($access_token_db->value);
 
-                    $access_token_db->delete();
 
+                    $this->access_token_repository->delete($access_token_db);
                 }
             }
 
-            return $res;
+            return true;
         });
     }
 
-    public function getAccessTokenByClient($client_id)
-    {
-        $client = $this->client_service->getClientById($client_id);
-        if (is_null($client)) {
-            throw new AbsentClientException(sprintf("client id %d does not exists!", $client_id));
-        }
-        $res = array();
-        // not void condition
-        $access_tokens = $client->access_tokens()->whereRaw(" DATE_ADD(created_at, INTERVAL lifetime second) >= UTC_TIMESTAMP() ")->get();
-        foreach ($access_tokens as $access_token) {
-            if (!$access_token->isVoid()) {
-                array_push($res, $access_token);
-            }
-        }
-
-        return $res;
-    }
-
-    public function getRefreshTokenByClient($client_id)
-    {
-        $client = $this->client_service->getClientById($client_id);
-        if (is_null($client))
-        {
-            throw new AbsentClientException(sprintf("client id %d does not exists!", $client_id));
-        }
-        $res = array();
-        $refresh_tokens = $client->refresh_tokens()->where('void', '=', false)->get();
-        foreach ($refresh_tokens as $refresh_token) {
-            if (!$refresh_token->isVoid()) {
-                array_push($res, $refresh_token);
-            }
-        }
-
-        return $res;
-    }
-
-    public function getAccessTokenByUserId($user_id)
-    {
-        $user = $this->auth_service->getUserById($user_id);
-        if (is_null($user)) {
-            throw new AbsentClientException(sprintf("user id %d does not exists!", $user_id));
-        }
-        $res = array();
-        $access_tokens = $user->access_tokens()->get();
-        foreach ($access_tokens as $access_token) {
-            if (!$access_token->isVoid()) {
-                array_push($res, $access_token);
-            }
-        }
-
-        return $res;
-    }
-
-    public function getRefreshTokenByUserId($user_id)
-    {
-        $user = $this->auth_service->getUserById($user_id);
-        if (is_null($user)) {
-            throw new AbsentClientException(sprintf("user id %d does not exists!", $user_id));
-        }
-        $res = array();
-        $refresh_tokens = $user->refresh_tokens()->where('void', '=', false)->get();
-        foreach ($refresh_tokens as $refresh_token) {
-            if (!$refresh_token->isVoid()) {
-                array_push($res, $refresh_token);
-            }
-        }
-
-        return $res;
-    }
-
     /**
      * @param string $nonce
      * @param string $client_id
@@ -1438,7 +1412,7 @@ final class TokenService implements ITokenService
         $issuer    = $this->configuration_service->getSiteUrl();
         if(empty($issuer)) throw new ConfigurationException('missing idp url');
 
-        $client            = $this->client_service->getClientById($client_id);
+        $client            = $this->client_repository->getClientById($client_id);
         $id_token_lifetime = $this->configuration_service->getConfigValue('OAuth2.IdToken.Lifetime');
 
         if (is_null($client))
@@ -1571,9 +1545,9 @@ final class TokenService implements ITokenService
     )
     {
 
-        $ac                     = $auth_code->getValue();
-        $ac_len                 = $hashing_alg->getHashKeyLen() / 2 ;
-        $encoder                = new Base64UrlRepresentation();
+        $ac      = $auth_code->getValue();
+        $ac_len  = $hashing_alg->getHashKeyLen() / 2 ;
+        $encoder = new Base64UrlRepresentation();
 
         if($ac_len > ByteUtil::bitLength(strlen($ac)))
             throw new InvalidClientCredentials('invalid auth code length!.');
@@ -1631,7 +1605,7 @@ final class TokenService implements ITokenService
     public function getAccessTokenByAuthCode(AuthorizationCode $auth_code)
     {
         $auth_code_value = Hash::compute('sha256', $auth_code->getValue());
-        $db_access_token = DBAccessToken::where('associated_authorization_code', '=', $auth_code_value)->first();
+        $db_access_token = $this->access_token_repository->getByAuthCode($auth_code_value);
         if(is_null($db_access_token)) return null;
         return $this->getAccessToken($db_access_token->value, true);
     }
diff --git a/app/Services/OAuth2/UserConsentService.php b/app/Services/OAuth2/UserConsentService.php
new file mode 100644
index 00000000..05695557
--- /dev/null
+++ b/app/Services/OAuth2/UserConsentService.php
@@ -0,0 +1,110 @@
+<?php namespace Services\OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Models\OAuth2\Client;
+use OAuth2\Exceptions\AbsentClientException;
+use OAuth2\Models\IUserConsent;
+use OAuth2\Services\IUserConsentService;
+use Models\OAuth2\UserConsent;
+use Utils\Exceptions\EntityNotFoundException;
+use Utils\MathUtils;
+/**
+ * Class UserConsentService
+ * @package Services\OAuth2
+ */
+class UserConsentService implements IUserConsentService
+{
+
+    /**
+     * @param int $user_id
+     * @param string $client_id
+     * @param string $scopes
+     * @return IUserConsent
+     */
+    public function get($user_id, $client_id, $scopes)
+    {
+
+        $set   = explode(' ', $scopes);
+        $size  = count($set) - 1;
+        $perm  = range(0, $size);
+        $j     = 0;
+        $perms = [];
+
+        do
+        {
+            foreach ($perm as $i)
+            {
+                $perms[$j][] = $set[$i];
+            }
+        } while ($perm = MathUtils::nextPermutation($perm, $size) and ++$j);
+
+
+        $query1 = UserConsent::where('user_id', '=', $user_id)->where('client_id', '=', $client_id);
+
+        $query2 = UserConsent::where('user_id', '=', $user_id)->where('client_id', '=', $client_id);
+
+
+        $query1 = $query1->where(function ($query) use($perms)
+        {
+            foreach ($perms as $p)
+            {
+                $str = join(' ', $p);
+                $query = $query->orWhere('scopes', '=', $str);
+            }
+
+            return $query;
+        });
+
+
+        $query2 = $query2->where(function ($query) use($perms)
+        {
+            foreach ($perms as $p)
+            {
+                $str = join(' ', $p);
+                $query = $query->orWhere('scopes', 'like', '%'.$str.'%');
+            }
+
+            return $query;
+        });
+
+
+        $consent = $query1->first();
+
+        if (is_null($consent)) {
+            $consent = $query2->first();
+        }
+
+        return $consent;
+    }
+
+    /**
+     * @param int $user_id
+     * @param string $client_id
+     * @param string $scopes
+     * @return IUserConsent|void
+     * @throws EntityNotFoundException
+     */
+    public function add($user_id, $client_id, $scopes)
+    {
+        $consent = new UserConsent();
+
+        if (is_null(Client::find($client_id))) {
+            throw new EntityNotFoundException();
+        }
+
+        $consent->client_id = $client_id;
+        $consent->user_id   = $user_id;
+        $consent->scopes    = $scopes;
+        $consent->Save();
+    }
+}
\ No newline at end of file
diff --git a/app/Services/OpenId/AssociationService.php b/app/Services/OpenId/AssociationService.php
new file mode 100644
index 00000000..ca47b09a
--- /dev/null
+++ b/app/Services/OpenId/AssociationService.php
@@ -0,0 +1,243 @@
+<?php namespace Services\OpenId;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Exceptions\InvalidAssociation;
+use OpenId\Exceptions\OpenIdInvalidRealmException;
+use OpenId\Exceptions\ReplayAttackException;
+use OpenId\Helpers\OpenIdErrorMessages;
+use OpenId\Models\IAssociation;
+use OpenId\Repositories\IOpenIdAssociationRepository;
+use OpenId\Services\IAssociationService;
+use Models\OpenId\OpenIdAssociation;
+use Utils\Db\ITransactionService;
+use Utils\Exceptions\UnacquiredLockException;
+use Utils\Services\ICacheService;
+use Utils\Services\ILockManagerService;
+
+/**
+ * Class AssociationService
+ * @package Services\OpenId
+ */
+class AssociationService implements IAssociationService
+{
+    /**
+     * @var ILockManagerService
+     */
+    private $lock_manager_service;
+    /**
+     * @var ICacheService
+     */
+    private $cache_service;
+    /**
+     * @var IOpenIdAssociationRepository
+     */
+    private $repository;
+
+    /**
+     * @var ITransactionService
+     */
+    private $tx_service;
+
+    /**
+     * AssociationService constructor.
+     * @param IOpenIdAssociationRepository $repository
+     * @param ILockManagerService $lock_manager_service
+     * @param ICacheService $cache_service
+     * @param ITransactionService $tx_service
+     */
+    public function __construct
+    (
+        IOpenIdAssociationRepository $repository,
+        ILockManagerService $lock_manager_service,
+        ICacheService $cache_service,
+        ITransactionService $tx_service
+    ) {
+        $this->lock_manager_service = $lock_manager_service;
+        $this->cache_service        = $cache_service;
+        $this->repository           = $repository;
+        $this->tx_service           = $tx_service;
+    }
+
+    /**
+     * gets a given association by handle, and if association exists and its type is private, then lock it
+     * to prevent subsequent usage ( private association could be used once)
+     * @param $handle
+     * @param null $realm
+     * @return null|IAssociation
+     * @throws ReplayAttackException
+     * @throws InvalidAssociation
+     * @throws OpenIdInvalidRealmException
+     */
+    public function getAssociation($handle, $realm = null)
+    {
+
+        return $this->tx_service->transaction(function() use($handle, $realm) {
+
+            $lock_name = 'lock.get.assoc.' . $handle;
+
+            try {
+                // check if association is on cache
+                if (!$this->cache_service->exists($handle)) {
+                    // if not , check on db
+                    $assoc = $this->repository->getByHandle($handle);
+                    if (is_null($assoc)) {
+                        throw new InvalidAssociation(sprintf('openid association %s does not exists!', $handle));
+                    }
+                    //check association lifetime ...
+                    $remaining_lifetime = $assoc->getRemainingLifetime();
+                    if ($remaining_lifetime < 0) {
+                        $this->deleteAssociation($handle);
+
+                        return null;
+                    }
+                    //convert secret to hexa representation
+                    // bin2hex
+                    $secret_unpack = \unpack('H*', $assoc->secret);
+                    $secret_unpack = array_shift($secret_unpack);
+                    //repopulate cache
+                    $this->cache_service->storeHash($handle, [
+                        "type" => $assoc->type,
+                        "mac_function" => $assoc->mac_function,
+                        "issued" => $assoc->issued,
+                        "lifetime" => $assoc->lifetime,
+                        "secret" => $secret_unpack,
+                        "realm" => $assoc->realm
+                    ], $remaining_lifetime);
+                }
+
+                //get hash from cache
+                $cache_values = $this->cache_service->getHash($handle, [
+                    "type",
+                    "mac_function",
+                    "issued",
+                    "lifetime",
+                    "secret",
+                    "realm"
+                ]);
+
+                if ($cache_values['type'] == IAssociation::TypePrivate) {
+                    if (is_null($realm) || empty($realm) || $cache_values['realm'] != $realm) {
+                        throw new OpenIdInvalidRealmException(sprintf(OpenIdErrorMessages::InvalidPrivateAssociationMessage,
+                            $handle, $realm));
+                    }
+                    // only one time we could use this handle
+                    $this->lock_manager_service->acquireLock($lock_name);
+                }
+
+                //convert hex 2 bin
+                $secret = \pack('H*', $cache_values['secret']);
+                $assoc  = new OpenIdAssociation();
+
+                $assoc->type         = $cache_values['type'];
+                $assoc->mac_function = $cache_values['mac_function'];
+                $assoc->issued       = $cache_values['issued'];
+                $assoc->lifetime     = intval($cache_values['lifetime']);
+                $assoc->secret       = $secret;
+                $realm               = $cache_values['realm'];
+
+                if (!empty($realm)) {
+                    $assoc->realm = $realm;
+                }
+
+                return $assoc;
+
+            } catch (UnacquiredLockException $ex1) {
+                throw new ReplayAttackException
+                (
+                    sprintf(OpenIdErrorMessages::ReplayAttackPrivateAssociationAlreadyUsed, $handle)
+                );
+            }
+        });
+    }
+
+    /**
+     * @param $handle
+     * @return bool
+     */
+    public function deleteAssociation($handle)
+    {
+        return $this->tx_service->transaction(function() use($handle){
+
+            $this->cache_service->delete($handle);
+            $assoc = $this->repository->getByHandle($handle);
+            if (!is_null($assoc)) {
+                return $this->repository->delete($assoc);
+            }
+
+            return false;
+        });
+    }
+
+    /**
+     * @param IAssociation $association
+     * @return IAssociation
+     * @throws ReplayAttackException
+     */
+    public function addAssociation(IAssociation $association)
+    {
+        return $this->tx_service->transaction(function() use($association){
+
+            $assoc = new OpenIdAssociation();
+            try {
+                $lock_name = 'lock.add.assoc.' . $association->getHandle();
+
+                $this->lock_manager_service->acquireLock($lock_name);
+
+                $assoc->identifier   = $association->getHandle();;
+                $assoc->secret       = $association->getSecret();
+                $assoc->type         = $association->getType();;
+                $assoc->mac_function = $association->getMacFunction();
+                $assoc->lifetime     = intval($association->getLifetime());
+                $assoc->issued       = $association->getIssued();
+
+                if (!is_null($association->getRealm())) {
+                    $assoc->realm = $association->getRealm();
+                }
+
+                if ($association->getType() == IAssociation::TypeSession) {
+                    $this->repository->add($assoc);
+                }
+                //convert secret to hexa representation
+                // bin2hex
+                $secret_unpack = \unpack('H*', $association->getSecret());
+                $secret_unpack = array_shift($secret_unpack);
+
+                $this->cache_service->storeHash($association->getHandle(),
+                    [
+                        "type"         => $association->getType(),
+                        "mac_function" => $association->getMacFunction(),
+                        "issued"       => $association->getIssued(),
+                        "lifetime"     => intval($association->getLifetime()),
+                        "secret"       => $secret_unpack,
+                        "realm"        => !is_null($association->getRealm()) ? $association->getRealm() : ''
+                    ],
+                    intval($association->getLifetime())
+                );
+
+            } catch (UnacquiredLockException $ex1) {
+                throw new ReplayAttackException
+                (
+                    sprintf
+                    (
+                        OpenIdErrorMessages::ReplayAttackPrivateAssociationAlreadyUsed,
+                        $association->getHandle()
+                    )
+                );
+            }
+
+            return $assoc;
+
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/app/services/openid/NonceService.php b/app/Services/OpenId/NonceService.php
similarity index 75%
rename from app/services/openid/NonceService.php
rename to app/Services/OpenId/NonceService.php
index b4cebec6..f7964eaf 100644
--- a/app/services/openid/NonceService.php
+++ b/app/Services/OpenId/NonceService.php
@@ -1,23 +1,33 @@
-<?php
+<?php namespace Services\OpenId;
 
-namespace services\openid;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
 use Exception;
-use Log;
-use openid\exceptions\ReplayAttackException;
-use openid\helpers\OpenIdErrorMessages;
-use openid\model\OpenIdNonce;
-use openid\services\INonceService;
-use utils\exceptions\UnacquiredLockException;
-use utils\services\IdentifierGenerator;
-use utils\services\ILockManagerService;
-use utils\services\ICacheService;
-use utils\services\IServerConfigurationService;
-use Zend\Math\Rand;
+use Illuminate\Support\Facades\Log;
+use OpenId\Exceptions\ReplayAttackException;
+use OpenId\Helpers\OpenIdErrorMessages;
+use OpenId\Models\OpenIdNonce;
+use OpenId\Services\INonceService;
+use Utils\Exceptions\UnacquiredLockException;
+use Utils\Services\ICacheService;
+use Utils\Services\IdentifierGenerator;
+use Utils\Services\ILockManagerService;
+use Utils\Services\IServerConfigurationService;
 
 /**
  * Class NonceService
- * @package services\openid
+ * @package Services\OpenId
  */
 final class NonceService implements INonceService
 {
@@ -59,23 +69,29 @@ final class NonceService implements INonceService
     /**
      * @param OpenIdNonce $nonce
      * @throws ReplayAttackException
-     * @return bool
+     * @return $this
      */
     public function lockNonce(OpenIdNonce $nonce)
     {
-        $raw_nonce = $nonce->getRawFormat();
+        $raw_nonce     = $nonce->getRawFormat();
         $lock_lifetime = $this->configuration_service->getConfigValue("Nonce.Lifetime");
         try {
             $this->lock_manager_service->acquireLock('lock.nonce.' . $raw_nonce, $lock_lifetime);
         } catch (UnacquiredLockException $ex) {
             throw new ReplayAttackException(sprintf(OpenIdErrorMessages::ReplayAttackNonceAlreadyUsed, $nonce->getRawFormat()));
         }
+        return $this;
     }
 
+    /**
+     * @param OpenIdNonce $nonce
+     * @return $this
+     */
     public function unlockNonce(OpenIdNonce $nonce)
     {
         $raw_nonce = $nonce->getRawFormat();
         $this->lock_manager_service->releaseLock('lock.nonce.' . $raw_nonce);
+        return $this;
     }
 
 
@@ -95,19 +111,12 @@ final class NonceService implements INonceService
         return $this->nonce_generator->generate(new OpenIdNonce(255));
     }
 
-    /**
-     * @return string
-     */
-    private function makeNonceSalt(){
-        return Rand::getString(self::NonceSaltLength, self::NoncePopulation, true);
-    }
-
     /**
      * @param OpenIdNonce $nonce
      * @param string $signature
      * @param string $realm
-     * @return mixed|void
-     * @throws \openid\exceptions\ReplayAttackException
+     * @return $this
+     * @throws ReplayAttackException
      */
     public function markNonceAsInvalid(OpenIdNonce $nonce, $signature, $realm)
     {
@@ -126,12 +135,14 @@ final class NonceService implements INonceService
             $this->cache_service->delete($key);
             throw $ex;
         }
+        return $this;
     }
 
     /**
      * @param OpenIdNonce $nonce
      * @param string $signature
      * @param string $realm
+     * @return $this;
      */
     public function associateNonce(OpenIdNonce $nonce, $signature, $realm)
     {
@@ -142,5 +153,6 @@ final class NonceService implements INonceService
         } catch (Exception $ex) {
             Log::error($ex);
         }
+        return $this;
     }
 }
\ No newline at end of file
diff --git a/app/services/openid/OpenIdMementoSessionSerializerService.php b/app/Services/OpenId/OpenIdMementoSessionSerializerService.php
similarity index 56%
rename from app/services/openid/OpenIdMementoSessionSerializerService.php
rename to app/Services/OpenId/OpenIdMementoSessionSerializerService.php
index 00796b30..09480ec3 100644
--- a/app/services/openid/OpenIdMementoSessionSerializerService.php
+++ b/app/Services/OpenId/OpenIdMementoSessionSerializerService.php
@@ -1,15 +1,23 @@
-<?php
-
-namespace services\openid;
-
-use openid\requests\OpenIdMessageMemento;
-use openid\services\IMementoOpenIdSerializerService;
-
-use Session;
+<?php namespace Services\OpenId;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Requests\OpenIdMessageMemento;
+use OpenId\Services\IMementoOpenIdSerializerService;
+use Illuminate\Support\Facades\Session;
 
 /**
  * Class OpenIdMementoSessionSerializerService
- * @package services\openid
+ * @package Services\OpenId
  */
 class OpenIdMementoSessionSerializerService implements IMementoOpenIdSerializerService
 {
diff --git a/app/Services/OpenId/OpenIdProvider.php b/app/Services/OpenId/OpenIdProvider.php
new file mode 100644
index 00000000..09fdc63a
--- /dev/null
+++ b/app/Services/OpenId/OpenIdProvider.php
@@ -0,0 +1,66 @@
+<?php namespace Services\OpenId;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\ServiceProvider;
+use OpenId\Services\NonceUniqueIdentifierGenerator;
+use OpenId\Services\OpenIdServiceCatalog;
+use Utils\Services\UtilsServiceCatalog;
+
+/**
+ * Class OpenIdProvider
+ * @package Services\OpenId
+ */
+final class OpenIdProvider extends ServiceProvider {
+
+    protected $defer = true;
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        //register on boot bc we rely on Illuminate\Redis\ServiceProvider\RedisServiceProvider
+        App::singleton(OpenIdServiceCatalog::MementoSerializerService, 'Services\\OpenId\\OpenIdMementoSessionSerializerService');
+        App::singleton(OpenIdServiceCatalog::ServerExtensionsService, 'Services\\OpenId\\ServerExtensionsService');
+        App::singleton(OpenIdServiceCatalog::AssociationService, 'Services\\OpenId\\AssociationService');
+        App::singleton(OpenIdServiceCatalog::TrustedSitesService, 'Services\\OpenId\\TrustedSitesService');
+        App::singleton(OpenIdServiceCatalog::ServerConfigurationService, 'Services\\Utils\\ServerConfigurationService');
+        App::singleton(OpenIdServiceCatalog::UserService, 'Services\\OpenId\\UserService');
+
+        App::singleton(OpenIdServiceCatalog::NonceService, function(){
+            return new NonceService(
+                App::make(UtilsServiceCatalog::LockManagerService),
+                App::make(UtilsServiceCatalog::CacheService),
+                App::make(UtilsServiceCatalog::ServerConfigurationService),
+                new NonceUniqueIdentifierGenerator(App::make(UtilsServiceCatalog::CacheService))
+            );
+        });
+    }
+
+    public function provides()
+    {
+        return [
+            OpenIdServiceCatalog::MementoSerializerService,
+            OpenIdServiceCatalog::ServerExtensionsService,
+            OpenIdServiceCatalog::AssociationService,
+            OpenIdServiceCatalog::TrustedSitesService,
+            OpenIdServiceCatalog::ServerConfigurationService,
+            OpenIdServiceCatalog::UserService,
+            OpenIdServiceCatalog::NonceService,
+        ];
+    }
+}
\ No newline at end of file
diff --git a/app/Services/OpenId/ServerExtensionsService.php b/app/Services/OpenId/ServerExtensionsService.php
new file mode 100644
index 00000000..5800b01b
--- /dev/null
+++ b/app/Services/OpenId/ServerExtensionsService.php
@@ -0,0 +1,58 @@
+<?php namespace Services\OpenId;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Services\IServerExtensionsService;
+use Utils\Services\ServiceLocator;
+use Models\OpenId\ServerExtension;
+use ReflectionClass;
+
+/**
+ * Class ServerExtensionsService
+ * @package Services\OpenId
+ */
+class ServerExtensionsService implements IServerExtensionsService
+{
+
+	/**
+	 * @return array
+	 */
+	public function getAllActiveExtensions()
+    {
+        $extensions = ServerExtension::where('active', '=', true)->get();
+        $res        = [];
+        foreach ($extensions as $extension) {
+            $class_name = $extension->extension_class;
+            if (empty($class_name)) continue;
+
+	        $class              = new ReflectionClass($class_name);
+	        $constructor        = $class->getConstructor();
+	        $constructor_params = $constructor->getParameters();
+
+	        $deps = [];
+
+	        foreach($constructor_params as $constructor_param){
+				$param_class  = $constructor_param->getClass();
+				$name         = $constructor_param->getName();
+				if(is_null($param_class)){
+					$deps[] = $extension->$name;
+				}
+		        else{
+			        $deps [] = ServiceLocator::getInstance()->getService($param_class->getName());
+		        }
+			}
+
+            $res[] = $class->newInstanceArgs($deps);;
+        }
+        return $res;
+    }
+}
\ No newline at end of file
diff --git a/app/services/openid/TrustedSitesService.php b/app/Services/OpenId/TrustedSitesService.php
similarity index 69%
rename from app/services/openid/TrustedSitesService.php
rename to app/Services/OpenId/TrustedSitesService.php
index 5b806dc4..c5acbe72 100644
--- a/app/services/openid/TrustedSitesService.php
+++ b/app/Services/OpenId/TrustedSitesService.php
@@ -1,24 +1,41 @@
-<?php
-namespace services\openid;
+<?php namespace Services\OpenId;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
 use Exception;
-use openid\exceptions\OpenIdInvalidRealmException;
-use openid\helpers\OpenIdUriHelper;
-use openid\model\IOpenIdUser;
-use openid\services\ITrustedSitesService;
-use OpenIdTrustedSite;
-use utils\services\IAuthService;
-use utils\services\ILogService;
-use openid\repositories\IOpenIdTrustedSiteRepository;
+use Models\OpenId\OpenIdTrustedSite;
+use OpenId\Repositories\IOpenIdTrustedSiteRepository;
+use OpenId\Exceptions\OpenIdInvalidRealmException;
+use OpenId\Helpers\OpenIdUriHelper;
+use OpenId\Models\IOpenIdUser;
+use OpenId\Models\ITrustedSite;
+use OpenId\Services\ITrustedSitesService;
+use Utils\Services\IAuthService;
+use Utils\Services\ILogService;
 
 /**
  * Class TrustedSitesService
- * @package services\openid
+ * @package Services\OpenId
  */
 class TrustedSitesService implements ITrustedSitesService
 {
-
+	/**
+	 * @var IOpenIdTrustedSiteRepository
+	 */
 	private $repository;
+	/**
+	 * @var ILogService
+	 */
 	private $log_service;
 
 	/**
@@ -36,8 +53,8 @@ class TrustedSitesService implements ITrustedSitesService
 	 * @param             $realm
 	 * @param             $policy
 	 * @param array       $data
-	 * @return bool1|ITrustedSite
-	 * @throws \Exception
+	 * @return bool|ITrustedSite
+	 * @throws Exception
 	 */
 	public function addTrustedSite(IOpenIdUser $user, $realm, $policy, $data = array())
 	{
@@ -45,11 +62,13 @@ class TrustedSitesService implements ITrustedSitesService
 
 			if (!OpenIdUriHelper::isValidRealm($realm))
 				throw new OpenIdInvalidRealmException(sprintf('realm %s is invalid', $realm));
+
 			$site          = new OpenIdTrustedSite;
 			$site->realm   = $realm;
 			$site->policy  = $policy;
 			$site->user_id = $user->getId();
 			$site->data    = json_encode($data);
+
 			return $this->repository->add($site)?$site:false;
 
 		} catch (Exception $ex) {
@@ -77,7 +96,7 @@ class TrustedSitesService implements ITrustedSitesService
 	 * @param             $realm
 	 * @param array       $data
 	 * @return array|mixed
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function getTrustedSites(IOpenIdUser $user, $realm, $data = array())
 	{
@@ -119,16 +138,17 @@ class TrustedSitesService implements ITrustedSitesService
 	 */
 	private function getSubDomains($url)
 	{
-		$res = array();
-		$url = strtolower($url);
+		$res    = array();
+		$url    = strtolower($url);
 		$scheme = $this->getScheme($url);
 		//add entire url as first domain
 		array_push($res, $url);
+
 		$ends_with_slash = substr($url, -1) == '/';
-		$url = parse_url($url);
-		$authority = $url['host'];
-		$components = explode('.', $authority);
-		$len = count($components);
+		$url             = parse_url($url);
+		$authority       = $url['host'];
+		$components      = explode('.', $authority);
+		$len             = count($components);
 
 		for ($i = 0; $i < $len; $i++) {
 			if ($components[$i] == '*') continue;
@@ -143,14 +163,15 @@ class TrustedSitesService implements ITrustedSitesService
 	}
 
 	/**
-	 * @param $url
+	 * @param string $url
 	 * @return string
 	 */
 	private function getScheme($url)
 	{
-		$url = strtolower($url);
-		$url = parse_url($url);
+		$url    = strtolower($url);
+		$url    = parse_url($url);
 		$scheme = 'http://';
+
 		if (isset($url['scheme']) && !empty($url['scheme'])) {
 			$scheme = $url['scheme'] . '://';
 		}
diff --git a/app/Services/OpenId/UserService.php b/app/Services/OpenId/UserService.php
new file mode 100644
index 00000000..592fbf3f
--- /dev/null
+++ b/app/Services/OpenId/UserService.php
@@ -0,0 +1,254 @@
+<?php namespace Services\OpenId;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Auth\IUserNameGeneratorService;
+use Auth\Repositories\IUserRepository;
+use Auth\User;
+use Models\Member;
+use OpenId\Models\IOpenIdUser;
+use OpenId\Services\IUserService;
+use Services\Exceptions\ValidationException;
+use Utils\Db\ITransactionService;
+use Utils\Exceptions\EntityNotFoundException;
+use Utils\Services\ILogService;
+use Illuminate\Support\Facades\Mail;
+use Utils\Services\IServerConfigurationService;
+
+/**
+ * Class UserService
+ * @package Services\OpenId
+ */
+final class UserService implements IUserService
+{
+
+     /**
+     * @var IUserRepository
+     */
+    private $repository;
+    /**
+     * @var ILogService
+     */
+    private $log_service;
+    /**
+     * @var ITransactionService
+     */
+    private $tx_service;
+
+    /**
+     * @var IUserNameGeneratorService
+     */
+    private $user_name_generator;
+
+    /**
+     * @var IServerConfigurationService
+     */
+    private $configuration_service;
+
+    /**
+     * UserService constructor.
+     * @param IUserRepository $repository
+     * @param IUserNameGeneratorService $user_name_generator
+     * @param ITransactionService $tx_service
+     * @param IServerConfigurationService $configuration_service
+     * @param ILogService $log_service
+     */
+    public function __construct
+    (
+        IUserRepository $repository,
+        IUserNameGeneratorService $user_name_generator,
+        ITransactionService $tx_service,
+        IServerConfigurationService $configuration_service,
+        ILogService $log_service
+    )
+    {
+        $this->repository            = $repository;
+        $this->user_name_generator   = $user_name_generator;
+        $this->configuration_service = $configuration_service;
+        $this->log_service           = $log_service;
+        $this->tx_service            = $tx_service;
+    }
+
+
+    /**
+     * @param int $user_id
+     * @return void
+     * @throws EntityNotFoundException
+     */
+    public function updateLastLoginDate($user_id)
+    {
+        $this->tx_service->transaction(function() use($user_id){
+            $user = $this->repository->get($user_id);
+            if(is_null($user)) throw new EntityNotFoundException();
+            $user->last_login_date = gmdate("Y-m-d H:i:s", time());
+            $this->repository->add($user);
+        });
+    }
+
+    /**
+     * @param int $user_id
+     * @return void
+     * @throws EntityNotFoundException
+     */
+    public function updateFailedLoginAttempts($user_id)
+    {
+         $this->tx_service->transaction(function() use($user_id){
+            $user = $this->repository->get($user_id);
+            if(is_null($user)) throw new EntityNotFoundException();
+            $user->login_failed_attempt += 1;
+            $this->repository->add($user);
+        });
+    }
+
+    /**
+     * @param int $user_id
+     * @return void
+     * @throws EntityNotFoundException
+     */
+    public function lockUser($user_id)
+    {
+        $this->tx_service->transaction(function() use($user_id){
+            $user = $this->repository->get($user_id);
+            if(is_null($user)) throw new EntityNotFoundException();
+
+            $user->lock = true;
+            $this->repository->add($user);
+
+            $support_email = $this->configuration_service->getConfigValue('SupportEmail');
+            Mail::send('emails.auth.user_locked', [
+                'user_name'     => $user->getFullName(),
+                'attempts'      => $user->login_failed_attempt,
+                'support_email' => $support_email,
+            ], function($message) use ($user, $support_email)
+            {
+                $message
+                    ->from($support_email, 'OpenStack Support Team')
+                    ->to($user->getEmail(), $user->getFullName())
+                    ->subject('OpenStackId - your user has been locked!');
+            });
+        });
+    }
+
+    /**
+     * @param int $user_id
+     * @return void
+     * @throws EntityNotFoundException
+     */
+    public function unlockUser($user_id)
+    {
+        $this->tx_service->transaction(function() use($user_id){
+            $user = $this->repository->get($user_id);
+            if(is_null($user)) throw new EntityNotFoundException();
+            $user->lock = false;
+            $this->repository->update($user);
+        });
+    }
+
+    /**
+     * @param int $user_id
+     * @return void
+     * @throws EntityNotFoundException
+     */
+    public function activateUser($user_id)
+    {
+        $this->tx_service->transaction(function() use($user_id){
+            $user = $this->repository->get($user_id);
+            if(is_null($user))  throw new EntityNotFoundException();
+            $user->active = true;
+            $this->repository->update($user);
+        });
+    }
+
+    /**
+     * @param int $user_id
+     * @return void
+     * @throws EntityNotFoundException
+     */
+    public function deActivateUser($user_id)
+    {
+        $this->tx_service->transaction(function() use($user_id){
+            $user = $this->repository->get($user_id);
+            if(is_null($user)) throw new EntityNotFoundException();
+            $user->active = false;
+            $this->repository->update($user);
+        });
+    }
+
+    /**
+     * @param int $user_id
+     * @param bool $show_pic
+     * @param bool $show_full_name
+     * @param bool $show_email
+     * @return bool
+     * @throws EntityNotFoundException
+     */
+    public function saveProfileInfo($user_id, $show_pic, $show_full_name, $show_email)
+    {
+
+        return $this->tx_service->transaction(function() use($user_id, $show_pic, $show_full_name, $show_email){
+            $user = $this->repository->get($user_id);
+            if(is_null($user)) throw new EntityNotFoundException();
+
+            $user->public_profile_show_photo    = $show_pic;
+            $user->public_profile_show_fullname = $show_full_name;
+            $user->public_profile_show_email    = $show_email;
+
+            $this->repository->update($user);
+            return true;
+        });
+    }
+
+    /**
+     * @param Member $member
+     * @return IOpenIdUser
+     */
+    public function buildUser(Member $member)
+    {
+        $repository          = $this->repository;
+        $user_name_generator = $this->user_name_generator;
+
+        return $this->tx_service->transaction(function () use($member, $user_name_generator, $repository){
+            //create user
+            $old_user = $repository->getByExternalId($member->ID);
+            if(!is_null($old_user))
+                throw new ValidationException(sprintf('already exists an user with external_identifier %s', $member->ID));
+
+            $user                       = new User();
+            $user->external_identifier  = $member->ID;
+            $user->identifier           = $member->ID;
+            $user->last_login_date      = gmdate("Y-m-d H:i:s", time());
+            $user->active               = true;
+            $user->lock                 = false;
+            $user->login_failed_attempt = 0;
+
+            $done                  = false;
+            $fragment_nbr          = 1;
+            $identifier            = $original_identifier = $user_name_generator->generate($member);
+            do
+            {
+                $old_user = $repository->getByIdentifier($identifier);
+                if(!is_null($old_user))
+                {
+                    $identifier = $original_identifier . IUserNameGeneratorService::USER_NAME_CHAR_CONNECTOR . $fragment_nbr;
+                    $fragment_nbr++;
+                    continue;
+                }
+                $user->identifier = $identifier;
+                break;
+            } while (1);
+            $repository->add($user);
+            return $user;
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/app/services/security_policies/AbstractBlacklistSecurityPolicy.php b/app/Services/SecurityPolicies/AbstractBlacklistSecurityPolicy.php
similarity index 65%
rename from app/services/security_policies/AbstractBlacklistSecurityPolicy.php
rename to app/Services/SecurityPolicies/AbstractBlacklistSecurityPolicy.php
index 50d7c78a..0f8e2ce3 100644
--- a/app/services/security_policies/AbstractBlacklistSecurityPolicy.php
+++ b/app/Services/SecurityPolicies/AbstractBlacklistSecurityPolicy.php
@@ -1,33 +1,55 @@
-<?php
-
-namespace services;
-
-use Auth;
-use BannedIP;
-use DB;
-use Log;
-use utils\db\ITransactionService;
-use utils\IPHelper;
-use utils\services\ICacheService;
-use utils\services\ILockManagerService;
-use utils\services\ISecurityPolicy;
-use utils\services\ISecurityPolicyCounterMeasure;
-use utils\services\IServerConfigurationService;
+<?php namespace Services\SecurityPolicies;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
+use Illuminate\Support\Facades\Auth;
+use Models\BannedIP;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Utils\Db\ITransactionService;
+use Utils\IPHelper;
+use Utils\Services\ICacheService;
+use Utils\Services\ILockManagerService;
+use Utils\Services\ISecurityPolicy;
+use Utils\Services\ISecurityPolicyCounterMeasure;
+use Utils\Services\IServerConfigurationService;
+use Exception;
 /**
  * Class AbstractBlacklistSecurityPolicy
- * @package services
+ * @package Services\SecurityPolicies
  */
 abstract class AbstractBlacklistSecurityPolicy implements ISecurityPolicy
 {
 
+    /**
+     * @var IServerConfigurationService
+     */
     protected $server_configuration_service;
     /**
      * @var ISecurityPolicyCounterMeasure
      */
     protected $counter_measure;
+    /**
+     * @var ILockManagerService
+     */
     protected $lock_manager_service;
+    /**
+     * @var ICacheService
+     */
     protected $cache_service;
+    /**
+     * @var ITransactionService
+     */
     protected $tx_service;
 
     /**
@@ -48,9 +70,14 @@ abstract class AbstractBlacklistSecurityPolicy implements ISecurityPolicy
         $this->tx_service = $tx_service;
     }
 
+    /**
+     * @param ISecurityPolicyCounterMeasure $counter_measure
+     * @return $this
+     */
     public function setCounterMeasure(ISecurityPolicyCounterMeasure $counter_measure)
     {
         $this->counter_measure = $counter_measure;
+        return $this;
     }
 
     /**
diff --git a/app/services/security_policies/AuthorizationCodeRedeemPolicy.php b/app/Services/SecurityPolicies/AuthorizationCodeRedeemPolicy.php
similarity index 61%
rename from app/services/security_policies/AuthorizationCodeRedeemPolicy.php
rename to app/Services/SecurityPolicies/AuthorizationCodeRedeemPolicy.php
index f4aea210..a5a082c3 100644
--- a/app/services/security_policies/AuthorizationCodeRedeemPolicy.php
+++ b/app/Services/SecurityPolicies/AuthorizationCodeRedeemPolicy.php
@@ -1,18 +1,28 @@
-<?php
-namespace services;
-
-use DB;
-use Log;
+<?php namespace Services\SecurityPolicies;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 use Exception;
-use libs\oauth2\exceptions\ReplayAttackAuthCodeException;
-use utils\db\ITransactionService;
-use utils\services\ICacheService;
-use utils\services\ILockManagerService;
-use utils\services\IServerConfigurationService;
+use OAuth2\Exceptions\ReplayAttackAuthCodeException;
+use Utils\Db\ITransactionService;
+use Utils\Services\ICacheService;
+use Utils\Services\ILockManagerService;
+use Utils\Services\IServerConfigurationService;
 
 /**
  * Class AuthorizationCodeRedeemPolicy
- * @package services
+ * @package Services\SecurityPolicies
  */
 final class AuthorizationCodeRedeemPolicy extends AbstractBlacklistSecurityPolicy
 {
@@ -44,7 +54,7 @@ final class AuthorizationCodeRedeemPolicy extends AbstractBlacklistSecurityPolic
     /**
      * Apply security policy on a exception
      * @param Exception $ex
-     * @return void
+     * @return $this
      */
     public function apply(Exception $ex)
     {
@@ -64,6 +74,7 @@ final class AuthorizationCodeRedeemPolicy extends AbstractBlacklistSecurityPolic
         } catch (Exception $ex) {
             Log::error($ex);
         }
+        return $this;
     }
 
 }
\ No newline at end of file
diff --git a/app/services/security_policies/BlacklistSecurityPolicy.php b/app/Services/SecurityPolicies/BlacklistSecurityPolicy.php
similarity index 81%
rename from app/services/security_policies/BlacklistSecurityPolicy.php
rename to app/Services/SecurityPolicies/BlacklistSecurityPolicy.php
index b967de47..47997b49 100644
--- a/app/services/security_policies/BlacklistSecurityPolicy.php
+++ b/app/Services/SecurityPolicies/BlacklistSecurityPolicy.php
@@ -1,25 +1,36 @@
-<?php
+<?php namespace Services\SecurityPolicies;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-namespace services;
-
-use BannedIP;
 use DateTime;
-use DB;
 use Exception;
-use Log;
-use oauth2\services\IResourceServerService;
-use UserExceptionTrail;
-use utils\db\ITransactionService;
-use utils\exceptions\UnacquiredLockException;
-use utils\IPHelper;
-use utils\services\ICacheService;
-use utils\services\ILockManagerService;
-use utils\services\IServerConfigurationService;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Models\BannedIP;
+use Models\IWhiteListedIPRepository;
+use Models\UserExceptionTrail;
+use OAuth2\Repositories\IResourceServerRepository;
+use Utils\Db\ITransactionService;
+use Utils\Exceptions\UnacquiredLockException;
+use Utils\IPHelper;
+use Utils\Services\ICacheService;
+use Utils\Services\ILockManagerService;
+use Utils\Services\IServerConfigurationService;
 
 /**
  * Class BlacklistSecurityPolicy
  * implements check point security pattern
- * @package services
+ * @package Services\SecurityPolicies
  */
 class BlacklistSecurityPolicy extends AbstractBlacklistSecurityPolicy
 {
@@ -30,28 +41,35 @@ class BlacklistSecurityPolicy extends AbstractBlacklistSecurityPolicy
     private $exception_dictionary = array();
 
     /**
-     * @var IResourceServerService
+     * @var IResourceServerRepository
      */
-    private $resource_server_service;
+    private $resource_server_repository;
+
+    /**
+     * @var IWhiteListedIPRepository
+     */
+    private $white_listed_ip_repository;
 
     /**
      * BlacklistSecurityPolicy constructor.
+     * @param IWhiteListedIPRepository $white_listed_ip_repository
      * @param IServerConfigurationService $server_configuration_service
      * @param ILockManagerService $lock_manager_service
      * @param ICacheService $cache_service
-     * @param IResourceServerService $resource_server_service
+     * @param IResourceServerRepository $resource_server_repository
      * @param ITransactionService $tx_service
      */
     public function __construct
     (
+        IWhiteListedIPRepository    $white_listed_ip_repository,
         IServerConfigurationService $server_configuration_service,
         ILockManagerService         $lock_manager_service,
         ICacheService               $cache_service,
-        IResourceServerService      $resource_server_service,
+        IResourceServerRepository   $resource_server_repository,
         ITransactionService         $tx_service
     ) {
         parent::__construct($server_configuration_service, $lock_manager_service, $cache_service, $tx_service);
-        $this->resource_server_service = $resource_server_service;
+        $this->resource_server_repository = $resource_server_repository;
         // here we configure on which exceptions are we interested and the max occurrence attempts and initial delay on tar pit for
         // offending IP address
         $this->exception_dictionary = array(
@@ -100,6 +118,7 @@ class BlacklistSecurityPolicy extends AbstractBlacklistSecurityPolicy
                 'BlacklistSecurityPolicy.OAuth2.BearerTokenDisclosureAttemptInitialDelay'
             ),
         );
+        $this->white_listed_ip_repository = $white_listed_ip_repository;
     }
 
     /**
@@ -164,7 +183,7 @@ class BlacklistSecurityPolicy extends AbstractBlacklistSecurityPolicy
     /**
      * @param Exception $ex
      * @throws Exception
-     * @return void
+     * @return $this
      */
     public function apply(Exception $ex)
     {
@@ -198,7 +217,7 @@ class BlacklistSecurityPolicy extends AbstractBlacklistSecurityPolicy
                 );
 
                 $initial_delay_on_tar_pit = intval($this->server_configuration_service->getConfigValue($params[1]));
-                if (!$this->isIPAddressWhitelisted($remote_ip) && $exception_count >= $max_attempts)
+                if (!$this->isIPAddressWhiteListed($remote_ip) && $exception_count >= $max_attempts)
                 {
                     Log::warning
                     (
@@ -221,16 +240,18 @@ class BlacklistSecurityPolicy extends AbstractBlacklistSecurityPolicy
             Log::error($ex);
             throw $ex;
         }
+        return $this;
     }
 
     /**
      * @param string $ip
      * @return bool
      */
-    private function isIPAddressWhitelisted($ip)
+    private function isIPAddressWhiteListed($ip)
     {
-        $resource_server = $this->resource_server_service->getByIPAddress($ip);
-        $white_listed_ip = \WhiteListedIP::where('ip','=', $ip)->first();
+        $resource_server = $this->resource_server_repository->getByIp($ip);
+        $white_listed_ip = $this->white_listed_ip_repository->getByIp($ip);
+
         return !is_null($resource_server) || !is_null($white_listed_ip);
     }
 
diff --git a/app/Services/SecurityPolicies/DelayCounterMeasure.php b/app/Services/SecurityPolicies/DelayCounterMeasure.php
new file mode 100644
index 00000000..13249981
--- /dev/null
+++ b/app/Services/SecurityPolicies/DelayCounterMeasure.php
@@ -0,0 +1,58 @@
+<?php namespace Services\SecurityPolicies;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Exception;
+use Illuminate\Support\Facades\Log;
+use Utils\IPHelper;
+use Utils\Services\ICacheService;
+use Utils\Services\ISecurityPolicyCounterMeasure;
+
+/**
+ * Class DelayCounterMeasure
+ * @package Services\SecurityPolicies
+ */
+class DelayCounterMeasure implements ISecurityPolicyCounterMeasure
+{
+    /**
+     * @var ICacheService
+     */
+    private $cache_service;
+
+    /**
+     * DelayCounterMeasure constructor.
+     * @param ICacheService $cache_service
+     */
+    public function __construct(ICacheService $cache_service){
+        $this->cache_service = $cache_service;
+    }
+
+    /**
+     * @param array $params
+     * @return $this
+     */
+    public function trigger(array $params = array())
+    {
+        try {
+            $remote_address = IPHelper::getUserIp();
+            if ($this->cache_service->exists($remote_address)) {
+                Log::warning(sprintf("DelayCounterMeasure: attempt from banned ip %s",$remote_address));
+                $hits = intval($this->cache_service->getSingleValue($remote_address));
+                sleep(2 ^ $hits);
+            }
+        } catch (Exception $ex) {
+            Log::error($ex);
+        }
+        return $this;
+    }
+}
\ No newline at end of file
diff --git a/app/Services/SecurityPolicies/LockUserCounterMeasure.php b/app/Services/SecurityPolicies/LockUserCounterMeasure.php
new file mode 100644
index 00000000..5b889fd6
--- /dev/null
+++ b/app/Services/SecurityPolicies/LockUserCounterMeasure.php
@@ -0,0 +1,80 @@
+<?php namespace Services\SecurityPolicies;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Auth\Repositories\IUserRepository;
+use Exception;
+use Illuminate\Support\Facades\Log;
+use OpenId\Services\IUserService;
+use Utils\Services\ISecurityPolicyCounterMeasure;
+use Utils\Services\IServerConfigurationService;
+
+/**
+ * Class LockUserCounterMeasure
+ * @package Services\SecurityPolicies
+ */
+class LockUserCounterMeasure implements ISecurityPolicyCounterMeasure
+{
+    /**
+     * @var IServerConfigurationService
+     */
+    private $server_configuration;
+    /**
+     * @var IUserService
+     */
+    private $user_service;
+    /**
+     * @var IUserRepository
+     */
+    private $repository;
+
+    /**
+     * LockUserCounterMeasure constructor.
+     * @param IUserRepository $repository
+     * @param IUserService $user_service
+     * @param IServerConfigurationService $server_configuration
+     */
+    public function __construct(
+        IUserRepository $repository,
+        IUserService $user_service,
+        IServerConfigurationService $server_configuration
+    ) {
+        $this->user_service = $user_service;
+        $this->server_configuration = $server_configuration;
+        $this->repository = $repository;
+    }
+
+    /**
+     * @param array $params
+     * @return $this
+     */
+    public function trigger(array $params = array())
+    {
+        try {
+            if (isset($params["user_identifier"])) {
+                $user_identifier = $params["user_identifier"];
+                $user            = $this->repository->getByExternalId($user_identifier);
+                if (!is_null($user)) {
+                    //apply lock policy
+                    if (intval($user->login_failed_attempt) < intval($this->server_configuration->getConfigValue("MaxFailed.Login.Attempts"))) {
+                        $this->user_service->updateFailedLoginAttempts($user->id);
+                    } else {
+                        $this->user_service->lockUser($user->id);
+                    }
+                }
+            }
+        } catch (Exception $ex) {
+            Log::error($ex);
+        }
+        return $this;
+    }
+}
\ No newline at end of file
diff --git a/app/Services/SecurityPolicies/LockUserSecurityPolicy.php b/app/Services/SecurityPolicies/LockUserSecurityPolicy.php
new file mode 100644
index 00000000..de6a887d
--- /dev/null
+++ b/app/Services/SecurityPolicies/LockUserSecurityPolicy.php
@@ -0,0 +1,68 @@
+<?php namespace Services\SecurityPolicies;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Exception;
+use Illuminate\Support\Facades\Log;
+use Auth\Exceptions\AuthenticationInvalidPasswordAttemptException;
+use Utils\Services\ISecurityPolicy;
+use Utils\Services\ISecurityPolicyCounterMeasure;
+
+/**
+ * Class LockUserSecurityPolicy
+ * @package Services\SecurityPolicies
+ */
+final class LockUserSecurityPolicy implements ISecurityPolicy
+{
+    /**
+     * @var ISecurityPolicyCounterMeasure
+     */
+    private $counter_measure;
+    /**
+     * Check if current security policy is meet or not
+     * @return bool
+     */
+    public function check()
+    {
+        return true;
+    }
+
+    /**
+     * @param ISecurityPolicyCounterMeasure $counter_measure
+     * @return $this
+     */
+    public function setCounterMeasure(ISecurityPolicyCounterMeasure $counter_measure)
+    {
+        $this->counter_measure = $counter_measure;
+        return $this;
+    }
+
+    /**
+     * Apply security policy on a exception
+     * @param Exception $ex
+     * @return $this
+     */
+    public function apply(Exception $ex)
+    {
+        try {
+            if($ex instanceof AuthenticationInvalidPasswordAttemptException) {
+                $user_identifier = $ex->getIdentifier();
+                if (!is_null($user_identifier) && !empty($user_identifier))
+                    $this->counter_measure->trigger(array('user_identifier' => $user_identifier));
+            }
+        } catch (Exception $ex) {
+            Log::error($ex);
+        }
+        return $this;
+    }
+}
\ No newline at end of file
diff --git a/app/Services/SecurityPolicies/OAuth2LockClientCounterMeasure.php b/app/Services/SecurityPolicies/OAuth2LockClientCounterMeasure.php
new file mode 100644
index 00000000..42340b79
--- /dev/null
+++ b/app/Services/SecurityPolicies/OAuth2LockClientCounterMeasure.php
@@ -0,0 +1,56 @@
+<?php namespace Services\SecurityPolicies;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Exception;
+use Illuminate\Support\Facades\Log;
+use OAuth2\Services\IClientService;
+use Utils\Services\ISecurityPolicyCounterMeasure;
+
+/**
+ * Class OAuth2LockClientCounterMeasure
+ * @package Services\SecurityPolicies
+ */
+class OAuth2LockClientCounterMeasure implements ISecurityPolicyCounterMeasure{
+
+    /**
+     * @var IClientService
+     */
+	private $client_service;
+
+    /**
+     * OAuth2LockClientCounterMeasure constructor.
+     * @param IClientService $client_service
+     */
+	public function __construct(IClientService $client_service){
+		$this->client_service    = $client_service;
+	}
+
+    /**
+     * @param array $params
+     * @return $this
+     */
+    public function trigger(array $params = array())
+    {
+        try{
+
+            if (isset($params["client_id"])) {
+                 $this->client_service->lockClient(intval($params['client_id']));
+            }
+        }
+        catch(Exception $ex){
+            Log::error($ex);
+        }
+        return $this;
+    }
+}
\ No newline at end of file
diff --git a/app/Services/SecurityPolicies/OAuth2SecurityPolicy.php b/app/Services/SecurityPolicies/OAuth2SecurityPolicy.php
new file mode 100644
index 00000000..cbbf6da7
--- /dev/null
+++ b/app/Services/SecurityPolicies/OAuth2SecurityPolicy.php
@@ -0,0 +1,128 @@
+<?php namespace Services\SecurityPolicies;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Exception;
+use OAuth2\Exceptions\OAuth2ClientBaseException;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Services\IClientService;
+use Utils\Services\ISecurityPolicy;
+use Utils\Services\ISecurityPolicyCounterMeasure;
+use Models\OAuth2\OAuth2TrailException;
+use Utils\Services\IServerConfigurationService;
+use Utils\IPHelper;
+
+/**
+ * Class OAuth2SecurityPolicy
+ * @package Services\SecurityPolicies
+ */
+class OAuth2SecurityPolicy  implements ISecurityPolicy {
+
+    /**
+     * @var ISecurityPolicyCounterMeasure
+     */
+    protected $counter_measure;
+    /**
+     * @var array
+     */
+    private $exception_dictionary = array();
+    /**
+     * @var IServerConfigurationService
+     */
+    private $server_configuration_service;
+    /**
+     * @var IClientRepository
+     */
+    private $client_repository;
+
+    /**
+     * OAuth2SecurityPolicy constructor.
+     * @param IServerConfigurationService $server_configuration_service
+     * @param IClientRepository $client_repository
+     */
+    public function __construct(IServerConfigurationService $server_configuration_service, IClientRepository $client_repository)
+    {
+        $this->server_configuration_service = $server_configuration_service;
+	    $this->client_repository            = $client_repository;
+
+        $this->exception_dictionary = array(
+            'auth2\exceptions\BearerTokenDisclosureAttemptException' => array('OAuth2SecurityPolicy.MaxBearerTokenDisclosureAttempts'),
+            'auth2\exceptions\InvalidClientException'                => array('OAuth2SecurityPolicy.MaxInvalidClientExceptionAttempts'),
+            'auth2\exceptions\InvalidRedeemAuthCodeException'        => array('OAuth2SecurityPolicy.MaxInvalidRedeemAuthCodeAttempts'),
+            'auth2\exceptions\InvalidClientCredentials'              => array('OAuth2SecurityPolicy.MaxInvalidClientCredentialsAttempts'),
+        );
+    }
+    /**
+     * Check if current security policy is meet or not
+     * @return boolean
+     */
+    public function check()
+    {
+        return true;
+    }
+
+    /**
+     * Apply security policy on a exception
+     * @param Exception $ex
+     * @return $this
+     */
+    public function apply(Exception $ex)
+    {
+        try {
+            if($ex instanceof OAuth2ClientBaseException){
+                $client_id = $ex->getClientId();
+                //save oauth2 exception by client id
+                if (!is_null($client_id) && !empty($client_id)){
+                    $client                = $this->client_repository->getClientById($client_id);
+                    if(!is_null($client)) {
+                        $exception_class       = get_class($ex);
+                        $trail                 = new OAuth2TrailException();
+                        $trail->from_ip        = IPHelper::getUserIp();
+                        $trail->exception_type = $exception_class;
+                        $trail->client_id      = $client->getId();
+                        $trail->Save();
+
+                        //check exception count by type on last "MinutesWithoutExceptions" minutes...
+                        $exception_count = intval(OAuth2TrailException::where('client_id', '=', intval($client->getId()))
+                            ->where('exception_type', '=', $exception_class)
+                            ->where('created_at', '>', DB::raw('( UTC_TIMESTAMP() - INTERVAL ' . $this->server_configuration_service->getConfigValue("OAuth2SecurityPolicy.MinutesWithoutExceptions") . ' MINUTE )'))
+                            ->count());
+
+                        if(array_key_exists($exception_class,$this->exception_dictionary)){
+                            $params                   = $this->exception_dictionary[$exception_class];
+                            $max_attempts             = !is_null($params[0]) && !empty($params[0])? intval($this->server_configuration_service->getConfigValue($params[0])):0;
+                            if ($exception_count >= $max_attempts)
+                                $this->counter_measure->trigger(array('client_id' => $client->getId()));
+                        }
+                    }
+                }
+            }
+
+        } catch (Exception $ex) {
+            Log::error($ex);
+        }
+        return $this;
+    }
+
+    /**
+     * @param ISecurityPolicyCounterMeasure $counter_measure
+     * @return $this
+     */
+    public function setCounterMeasure(ISecurityPolicyCounterMeasure $counter_measure)
+    {
+        $this->counter_measure = $counter_measure;
+        return $this;
+    }
+}
\ No newline at end of file
diff --git a/app/Services/SecurityPolicies/RevokeAuthorizationCodeRelatedTokens.php b/app/Services/SecurityPolicies/RevokeAuthorizationCodeRelatedTokens.php
new file mode 100644
index 00000000..07acd05c
--- /dev/null
+++ b/app/Services/SecurityPolicies/RevokeAuthorizationCodeRelatedTokens.php
@@ -0,0 +1,59 @@
+<?php namespace Services\SecurityPolicies;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+use Illuminate\Support\Facades\Log;
+use OAuth2\Services\ITokenService;
+use Utils\Services\ISecurityPolicyCounterMeasure;
+/**
+ * Implements
+ * @see http://tools.ietf.org/html/rfc6819#section-5.2.1.1
+ * Automatic Revocation of Derived Tokens If Abuse Is Detected
+ * If an authorization server observes multiple attempts to redeem an
+ * authorization grant (e.g., such as an authorization "code"), the
+ * authorization server may want to revoke all tokens granted based on
+ * the authorization grant.
+ * Class RevokeAuthorizationCodeRelatedTokens
+ * @package Services\SecurityPolicies
+ */
+final class RevokeAuthorizationCodeRelatedTokens implements ISecurityPolicyCounterMeasure {
+
+    /**
+     * @var ITokenService
+     */
+	private $token_service;
+
+	/**
+	 * @param ITokenService $token_service
+	 */
+	public function __construct(ITokenService $token_service){
+		$this->token_service = $token_service;
+	}
+
+    /**
+     * @param array $params
+     * @return $this|void
+     */
+    public function trigger(array $params = array())
+    {
+        try {
+            if (isset($params["auth_code"])) {
+                $auth_code = $params["auth_code"];
+                $this->token_service->revokeAuthCodeRelatedTokens($auth_code);
+            }
+        } catch (Exception $ex) {
+            Log::error($ex);
+        }
+        return $this;
+    }
+}
\ No newline at end of file
diff --git a/app/Services/ServicesProvider.php b/app/Services/ServicesProvider.php
new file mode 100644
index 00000000..4eb1c7d1
--- /dev/null
+++ b/app/Services/ServicesProvider.php
@@ -0,0 +1,88 @@
+<?php namespace Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Support\ServiceProvider;
+use Utils\Services\UtilsServiceCatalog;
+use Services\Utils\CheckPointService;
+use Illuminate\Support\Facades\App;
+
+/**
+ * Class ServicesProvider
+ * @package Services
+ */
+final class ServicesProvider extends ServiceProvider
+{
+    protected $defer = true;
+
+    public function boot(){
+    }
+
+    public function register(){
+
+        App::singleton(\Services\IUserActionService::class, \Services\UserActionService::class);
+        App::singleton(\Services\SecurityPolicies\DelayCounterMeasure::class,  \Services\SecurityPolicies\DelayCounterMeasure::class);
+        App::singleton(\Services\SecurityPolicies\LockUserCounterMeasure::class, \Services\SecurityPolicies\LockUserCounterMeasure::class);
+        App::singleton(\Services\SecurityPolicies\RevokeAuthorizationCodeRelatedTokens::class,  \Services\SecurityPolicies\RevokeAuthorizationCodeRelatedTokens::class);
+        App::singleton(\Services\SecurityPolicies\BlacklistSecurityPolicy::class,  \Services\SecurityPolicies\BlacklistSecurityPolicy::class);
+        App::singleton(\Services\SecurityPolicies\LockUserSecurityPolicy::class,  \Services\SecurityPolicies\LockUserSecurityPolicy::class);
+        App::singleton(\Services\SecurityPolicies\OAuth2LockClientCounterMeasure::class,  \Services\SecurityPolicies\OAuth2LockClientCounterMeasure::class);
+        App::singleton(\Services\SecurityPolicies\OAuth2SecurityPolicy::class, \Services\SecurityPolicies\OAuth2SecurityPolicy::class);
+        App::singleton(\Services\SecurityPolicies\AuthorizationCodeRedeemPolicy::class,\Services\SecurityPolicies\AuthorizationCodeRedeemPolicy::class);
+
+        App::singleton(UtilsServiceCatalog::CheckPointService,
+            function(){
+                //set security policies
+                $delay_counter_measure = App::make(\Services\SecurityPolicies\DelayCounterMeasure::class);
+
+                $blacklist_security_policy = App::make(\Services\SecurityPolicies\BlacklistSecurityPolicy::class);
+                $blacklist_security_policy->setCounterMeasure($delay_counter_measure);
+
+                $revoke_tokens_counter_measure = App::make(\Services\SecurityPolicies\RevokeAuthorizationCodeRelatedTokens::class);
+
+                $authorization_code_redeem_Policy = App::make(\Services\SecurityPolicies\AuthorizationCodeRedeemPolicy::class);
+                $authorization_code_redeem_Policy->setCounterMeasure($revoke_tokens_counter_measure);
+
+                $lock_user_counter_measure = App::make(\Services\SecurityPolicies\LockUserCounterMeasure::class);
+
+                $lock_user_security_policy = App::make(\Services\SecurityPolicies\LockUserSecurityPolicy::class);
+                $lock_user_security_policy->setCounterMeasure($lock_user_counter_measure);
+
+                $oauth2_lock_client_counter_measure = App::make(\Services\SecurityPolicies\OAuth2LockClientCounterMeasure::class);
+                $oauth2_security_policy             = App::make(\Services\SecurityPolicies\OAuth2SecurityPolicy::class);
+                $oauth2_security_policy->setCounterMeasure($oauth2_lock_client_counter_measure);
+
+                $checkpoint_service = new CheckPointService($blacklist_security_policy);
+                $checkpoint_service->addPolicy($lock_user_security_policy);
+                $checkpoint_service->addPolicy($authorization_code_redeem_Policy);
+                $checkpoint_service->addPolicy($oauth2_security_policy);
+                return $checkpoint_service;
+            });
+
+    }
+
+    public function provides()
+    {
+        return [
+            \Services\IUserActionService::class,
+            \Services\SecurityPolicies\DelayCounterMeasure::class,
+            \Services\SecurityPolicies\LockUserCounterMeasure::class,
+            \Services\SecurityPolicies\RevokeAuthorizationCodeRelatedTokens::class,
+            \Services\SecurityPolicies\BlacklistSecurityPolicy::class,
+            \Services\SecurityPolicies\LockUserSecurityPolicy::class,
+            \Services\SecurityPolicies\OAuth2LockClientCounterMeasure::class,
+            \Services\SecurityPolicies\OAuth2SecurityPolicy::class,
+            \Services\SecurityPolicies\AuthorizationCodeRedeemPolicy::class,
+            UtilsServiceCatalog::CheckPointService,
+        ];
+    }
+}
\ No newline at end of file
diff --git a/app/Services/UserActionService.php b/app/Services/UserActionService.php
new file mode 100644
index 00000000..fe7dcec5
--- /dev/null
+++ b/app/Services/UserActionService.php
@@ -0,0 +1,72 @@
+<?php namespace Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Auth\Repositories\IUserRepository;
+use Exception;
+use Models\UserAction;
+use Illuminate\Support\Facades\Log;
+use Utils\Db\ITransactionService;
+
+/**
+ * Class UserActionService
+ * @package Services
+ */
+final class UserActionService implements IUserActionService
+{
+    /**
+     * @var IUserRepository
+     */
+    private $user_repository;
+    /**
+     * @var ITransactionService
+     */
+    private $tx_service;
+
+    public function __construct(IUserRepository $user_repository, ITransactionService $tx_service)
+    {
+        $this->user_repository = $user_repository;
+        $this->tx_service      = $tx_service;
+    }
+
+    /**
+     * @param int $user_id
+     * @param string $ip
+     * @param string $user_action
+     * @param null|string $realm
+     * @return bool
+     */
+    public function addUserAction($user_id, $ip, $user_action, $realm = null)
+    {
+        return $this->tx_service->transaction(function() use($user_id, $ip, $user_action, $realm){
+            try {
+
+                $action              = new UserAction();
+                $action->from_ip     = $ip;
+                $action->user_action = $user_action;
+                $action->realm       = $realm;
+                $user                = $this->user_repository->get($user_id);
+
+                if ($user) {
+                    $user->actions()->save($action);
+                    return true;
+                }
+                return false;
+            } catch (Exception $ex) {
+                Log::error($ex);
+                return false;
+            }
+        });
+
+    }
+} 
\ No newline at end of file
diff --git a/app/services/utils/BannedIPService.php b/app/Services/Utils/BannedIPService.php
similarity index 61%
rename from app/services/utils/BannedIPService.php
rename to app/Services/Utils/BannedIPService.php
index b5f656e0..c4d50f27 100644
--- a/app/services/utils/BannedIPService.php
+++ b/app/Services/Utils/BannedIPService.php
@@ -1,28 +1,53 @@
-<?php
-namespace services\utils;
-
-use Auth;
-use BannedIP;
-use DB;
-use Log;
-use utils\db\ITransactionService;
-use utils\services\IAuthService;
-use utils\services\IBannedIPService;
-use utils\services\ICacheService;
-use utils\services\ILogService;
-use utils\services\IServerConfigurationService;
+<?php namespace Services\Utils;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Support\Facades\Auth;
+use Models\BannedIP;
+use Illuminate\Support\Facades\DB;
+use Exception;
+use Utils\Db\ITransactionService;
+use Utils\Services\IAuthService;
+use Utils\Services\IBannedIPService;
+use Utils\Services\ICacheService;
+use Utils\Services\ILogService;
+use Utils\Services\IServerConfigurationService;
 
 /**
  * Class BannedIPService
- * @package utils\services
+ * @package Utils\Services
  */
 class BannedIPService implements IBannedIPService
 {
 
+    /**
+     * @var ICacheService
+     */
     private $cache_service;
+    /**
+     * @var IServerConfigurationService
+     */
     private $server_configuration_service;
+    /**
+     * @var ILogService
+     */
     private $log_service;
+    /**
+     * @var IAuthService
+     */
     private $auth_service;
+    /**
+     * @var ITransactionService
+     */
     private $tx_service;
 
     /**
@@ -54,7 +79,7 @@ class BannedIPService implements IBannedIPService
      */
     public function add($initial_hits, $exception_type)
     {
-        $res = false;
+        $res = true;
         try {
             $remote_address = Request::server('REMOTE_ADDR');
             //try to create on cache
@@ -82,40 +107,53 @@ class BannedIPService implements IBannedIPService
             $this->log_service->error($ex);
             $res = false;
         }
-
         return $res;
     }
 
+    /**
+     * @param $ip
+     * @return bool
+     */
     public function delete($ip)
     {
-        $res = false;
         $cache_service = $this->cache_service;
-        $this_var = $this;
-        $this->tx_service->transaction(function () use ($ip, &$res, &$cache_service, &$this_var) {
-
-            if ($banned_ip = $this_var->getByIP($ip)) {
+        return $this->tx_service->transaction(function () use ($ip, $cache_service) {
+            $res = false;
+            if ($banned_ip = $this->getByIP($ip)) {
                 $res = $banned_ip->delete();
                 $cache_service->delete($ip);
             }
+            return $res;
         });
-
-        return $res;
     }
 
+    /**
+     * @param int $id
+     * @return BannedIP
+     */
     public function get($id)
     {
         return BannedIP::find($id);
     }
 
+    /**
+     * @param int $ip
+     * @return BannedIP
+     */
     public function getByIP($ip)
     {
         return BannedIP::where('ip', '=', $ip)->first();
     }
 
+    /**
+     * @param int $page_nbr
+     * @param int $page_size
+     * @param array $filters
+     * @param array $fields
+     * @return mixed
+     */
     public function getByPage($page_nbr = 1, $page_size = 10, array $filters = array(), array $fields = array('*'))
     {
-        DB::getPaginator()->setCurrentPage($page_nbr);
-
-        return BannedIP::Filter($filters)->paginate($page_size, $fields);
+        return BannedIP::Filter($filters)->paginate($page_size, $fields, $pageName ='Page', $page_nbr);
     }
 }
\ No newline at end of file
diff --git a/app/services/utils/CheckPointService.php b/app/Services/Utils/CheckPointService.php
similarity index 62%
rename from app/services/utils/CheckPointService.php
rename to app/Services/Utils/CheckPointService.php
index a3e989f4..264748ee 100644
--- a/app/services/utils/CheckPointService.php
+++ b/app/Services/Utils/CheckPointService.php
@@ -1,18 +1,34 @@
-<?php
-
-namespace services\utils;
+<?php namespace Services\Utils;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
 use Exception;
-use Log;
-use Auth;
-use utils\services\ICheckPointService;
-use utils\services\ISecurityPolicy;
-use utils\IPHelper;
-use UserExceptionTrail;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Auth;
+use Utils\Services\ICheckPointService;
+use Utils\Services\ISecurityPolicy;
+use Utils\IPHelper;
+use Models\UserExceptionTrail;
 
+/**
+ * Class CheckPointService
+ * @package Services\Utils
+ */
 class CheckPointService implements ICheckPointService
 {
-
+    /**
+     * @var ISecurityPolicy[]
+     */
     private $policies;
 
     public function __construct(ISecurityPolicy $policy)
@@ -63,8 +79,13 @@ class CheckPointService implements ICheckPointService
         }
     }
 
+    /**
+     * @param ISecurityPolicy $policy
+     * @return $this
+     */
     public function addPolicy(ISecurityPolicy $policy)
     {
         array_push($this->policies, $policy);
+        return $this;
     }
 }
diff --git a/app/Services/Utils/EloquentTransactionService.php b/app/Services/Utils/EloquentTransactionService.php
new file mode 100644
index 00000000..3e0b54ce
--- /dev/null
+++ b/app/Services/Utils/EloquentTransactionService.php
@@ -0,0 +1,40 @@
+<?php namespace Services\Utils;
+
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Closure;
+use Utils\Db\ITransactionService;
+use Illuminate\Support\Facades\DB;
+use Exception;
+
+/**
+ * Class EloquentTransactionService
+ * @package Services\Utils
+ */
+class EloquentTransactionService implements ITransactionService
+{
+
+    /**
+     * Execute a Closure within a transaction.
+     *
+     * @param  Closure $callback
+     * @return mixed
+     *
+     * @throws Exception
+     */
+    public function transaction(Closure $callback)
+    {
+        return DB::transaction($callback);
+    }
+}
\ No newline at end of file
diff --git a/app/services/utils/ExternalUrlService.php b/app/Services/Utils/ExternalUrlService.php
similarity index 68%
rename from app/services/utils/ExternalUrlService.php
rename to app/Services/Utils/ExternalUrlService.php
index f7b390ea..0f4b57d0 100644
--- a/app/services/utils/ExternalUrlService.php
+++ b/app/Services/Utils/ExternalUrlService.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Services\Utils;
 /**
  * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,32 +11,37 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace services\utils;
-
 use Jenssegers\Agent\Agent;
-use services\facades\ServerConfigurationService as ConfigFacade;
-
+use Services\Facades\ServerConfigurationService as ConfigFacade;
 
 /**
  * Class ExternalUrlService
- * @package services\utils
+ * @package Services\Utils
  */
 final class ExternalUrlService
 {
+    /**
+     * @return string
+     */
     public function getCreateAccountUrl(){
         $agent = new Agent();
         $path  = $agent->isMobile() ? 'join/register/mobile/community' : 'join/register';
-        return sprintf("%s%s",ConfigFacade::getConfigValue("Assets.Url"),$path);
+        return sprintf("%s%s", ConfigFacade::getConfigValue("Assets.Url"),$path);
     }
 
+    /**
+     * @return string
+     */
     public function getVerifyAccountUrl(){
         $path  = 'members/verification/resend';
-        return sprintf("%s%s",ConfigFacade::getConfigValue("Assets.Url"),$path);
+        return sprintf("%s%s", ConfigFacade::getConfigValue("Assets.Url"),$path);
     }
 
+    /**
+     * @return string
+     */
     public function getForgotPasswordUrl(){
         $path  = 'Security/lostpassword';
-        return sprintf("%s%s",ConfigFacade::getConfigValue("Assets.Url"),$path);
+        return sprintf("%s%s", ConfigFacade::getConfigValue("Assets.Url"),$path);
     }
 }
\ No newline at end of file
diff --git a/app/services/utils/LockManagerService.php b/app/Services/Utils/LockManagerService.php
similarity index 62%
rename from app/services/utils/LockManagerService.php
rename to app/Services/Utils/LockManagerService.php
index f5351f08..69b28e40 100644
--- a/app/services/utils/LockManagerService.php
+++ b/app/Services/Utils/LockManagerService.php
@@ -1,15 +1,26 @@
-<?php
+<?php namespace Services\Utils;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-namespace services\utils;
-
-use utils\services\ICacheService;
-use utils\services\ILockManagerService;
-use utils\exceptions\UnacquiredLockException;
+use Utils\Services\ICacheService;
+use Utils\Services\ILockManagerService;
+use Utils\Exceptions\UnacquiredLockException;
 use Closure;
+use Exception;
 
 /**
  * Class LockManagerService
- * @package services\utils
+ * @package Services\Utils
  */
 final class LockManagerService implements ILockManagerService {
 
@@ -27,8 +38,9 @@ final class LockManagerService implements ILockManagerService {
     }
 
     /**
-     * @param $name
+     * @param string $name
      * @param int $lifetime
+     * @return $this
      * @throws UnacquiredLockException
      */
     public function acquireLock($name,$lifetime = 3600)
@@ -40,14 +52,17 @@ final class LockManagerService implements ILockManagerService {
             // only one time we could use this handle
             throw new UnacquiredLockException(sprintf("lock name %s",$name));
         }
+        return $this;
     }
 
     /**
      * @param string $name
+     * @return $this
      */
     public function releaseLock($name)
     {
         $this->cache_service->delete($name);
+        return $this;
     }
 
     /**
@@ -56,7 +71,7 @@ final class LockManagerService implements ILockManagerService {
      * @param int $lifetime
      * @return null
      * @throws UnacquiredLockException
-     * @throws \Exception
+     * @throws Exception
      */
     public function lock($name, Closure $callback, $lifetime = 3600)
     {
@@ -72,7 +87,7 @@ final class LockManagerService implements ILockManagerService {
         {
             throw $ex1;
         }
-        catch(\Exception $ex)
+        catch(Exception $ex)
         {
             $this->releaseLock($name);
             throw $ex;
diff --git a/app/Services/Utils/LogService.php b/app/Services/Utils/LogService.php
new file mode 100644
index 00000000..57e6f899
--- /dev/null
+++ b/app/Services/Utils/LogService.php
@@ -0,0 +1,55 @@
+<?php namespace Services\Utils;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Exception;
+use Illuminate\Support\Facades\Log;
+use Utils\Services\ILogService;
+
+/**
+ * Class LogService
+ * @package Services\Utils
+ */
+final class LogService implements ILogService
+{
+
+    public function error(Exception $exception)
+    {
+        Log::error($exception);
+    }
+
+    public function warning(Exception $exception)
+    {
+        Log::warning($exception);
+    }
+
+    public function info(Exception $exception)
+    {
+        Log::info($exception);
+    }
+
+    public function warning_msg($msg)
+    {
+        Log::warning($msg);
+    }
+
+    public function error_msg($msg)
+    {
+        Log::error($msg);
+    }
+
+    public function debug_msg($msg)
+    {
+        Log::debug($msg);
+    }
+}
\ No newline at end of file
diff --git a/app/services/utils/RedisCacheService.php b/app/Services/Utils/RedisCacheService.php
similarity index 76%
rename from app/services/utils/RedisCacheService.php
rename to app/Services/Utils/RedisCacheService.php
index 1c0630fd..599ac5e0 100644
--- a/app/services/utils/RedisCacheService.php
+++ b/app/Services/Utils/RedisCacheService.php
@@ -1,29 +1,43 @@
-<?php
-
-namespace services\utils;
-
-use utils\services\ICacheService;
+<?php namespace Services\Utils;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
+use Utils\Services\ICacheService;
+use Illuminate\Support\Facades\Redis;
 /**
  * Class RedisCacheService
  * Cache Service Implementation Based on REDIS
  * http://redis.io
- * @package services
+ * @package Services\Utils
  */
-class RedisCacheService implements ICacheService {
+final class RedisCacheService implements ICacheService {
 
     //services
     private $redis = null;
 
-    public function __construct(){
-
+    public function __construct()
+    {
+        $this->redis  = Redis::connection();
     }
 
-    public function boot(){
-        if(is_null($this->redis)){
-            $this->redis  = \RedisLV4::connection();
+    public function boot()
+    {
+        if (is_null($this->redis))
+        {
+            $this->redis = Redis::connection();
         }
     }
+
     /**
      * @param $key
      * @return mixed
diff --git a/app/services/utils/ServerConfigurationService.php b/app/Services/Utils/ServerConfigurationService.php
similarity index 88%
rename from app/services/utils/ServerConfigurationService.php
rename to app/Services/Utils/ServerConfigurationService.php
index 1d56b91a..380a6a2e 100644
--- a/app/services/utils/ServerConfigurationService.php
+++ b/app/Services/Utils/ServerConfigurationService.php
@@ -1,31 +1,46 @@
-<?php
+<?php namespace Services\Utils;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-namespace services\utils;
-
-use Config;
-use DB;
 use Exception;
-use openid\services\IServerConfigurationService as IOpenIdServerConfigurationService;
-use ServerConfiguration;
-use utils\db\ITransactionService;
-use utils\services\ICacheService;
-use utils\services\IServerConfigurationService;
+use Illuminate\Support\Facades\Config;
+use Models\ServerConfiguration;
+use OpenId\Services\IServerConfigurationService;
+use Utils\Db\ITransactionService;
+use Utils\Services\ICacheService;
+use Utils\Services\IServerConfigurationService as IOpenIdServerConfigurationService;
 
 /**
  * Class ServerConfigurationService
- * @package services
+ * @package Services\Utils
  */
 class ServerConfigurationService implements IOpenIdServerConfigurationService, IServerConfigurationService
 {
 
-    const DefaultAssetsUrl = 'https://www.openstack.org/';
-    const DefaultPrivateAssociationLifetime = 120;
-    const DefaultSessionAssociationLifetime = 21600;
-    const DefaultMaxFailedLoginAttempts = 10;
+    const DefaultAssetsUrl                          = 'https://www.openstack.org/';
+    const DefaultPrivateAssociationLifetime         = 120;
+    const DefaultSessionAssociationLifetime         = 21600;
+    const DefaultMaxFailedLoginAttempts             = 10;
     const DefaultMaxFailedLoginAttempts2ShowCaptcha = 3;
-    const DefaultNonceLifetime = 360;
+    const DefaultNonceLifetime                      = 360;
 
+    /**
+     * @var array
+     */
     private $default_config_params;
+    /**
+     * @var ITransactionService
+     */
     private $tx_service;
 
     /***
@@ -133,16 +148,12 @@ class ServerConfigurationService implements IOpenIdServerConfigurationService, I
 
     public function getUserIdentityEndpointURL($identifier)
     {
-        $url = action("UserController@getIdentity", array("identifier" => $identifier));
-
-        return $url;
+        return action("UserController@getIdentity", array("identifier" => $identifier));
     }
 
     public function getOPEndpointURL()
     {
-        $url = action("OpenIdProviderController@endpoint");
-
-        return $url;
+        return action("OpenId\OpenIdProviderController@endpoint");
     }
 
     /**
diff --git a/app/Services/Utils/UtilsProvider.php b/app/Services/Utils/UtilsProvider.php
new file mode 100644
index 00000000..b435015e
--- /dev/null
+++ b/app/Services/Utils/UtilsProvider.php
@@ -0,0 +1,83 @@
+<?php namespace Services\Utils;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Utils\Services\UtilsServiceCatalog;
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Foundation\AliasLoader;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Class UtilsProvider
+ * @package Services\Utils
+ */
+final class UtilsProvider extends ServiceProvider {
+
+    protected $defer = true;
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        Log::debug("UtilsProvider::register");
+
+        App::singleton(UtilsServiceCatalog::CacheService, 'Services\\Utils\\RedisCacheService');
+	    App::singleton(UtilsServiceCatalog::TransactionService, 'Services\\Utils\\EloquentTransactionService');
+        App::singleton(UtilsServiceCatalog::LogService, 'Services\\Utils\\LogService');
+        App::singleton(UtilsServiceCatalog::LockManagerService, 'Services\\Utils\\LockManagerService');
+        App::singleton(UtilsServiceCatalog::ServerConfigurationService, 'Services\\Utils\\ServerConfigurationService');
+        App::singleton(UtilsServiceCatalog::BannedIpService, 'Services\\Utils\\BannedIPService');
+
+        // setting facade
+        $this->app['serverconfigurationservice'] = App::share(function ($app) {
+            return new ServerConfigurationService
+            (
+                App::make(UtilsServiceCatalog::CacheService),
+                App::make(UtilsServiceCatalog::TransactionService)
+            );
+        });
+
+        // setting facade
+        $this->app['externalurlservice'] = App::share(function ($app) {
+            return new ExternalUrlService();
+        });
+
+    }
+
+    public function provides()
+    {
+        return
+            [
+                UtilsServiceCatalog::CacheService,
+                UtilsServiceCatalog::TransactionService,
+                UtilsServiceCatalog::LogService,
+                UtilsServiceCatalog::LockManagerService,
+                UtilsServiceCatalog::ServerConfigurationService,
+                UtilsServiceCatalog::BannedIpService,
+                \Services\Facades\ServerConfigurationService::class,
+                \Services\Facades\ExternalUrlService::class,
+                'serverconfigurationservice',
+                'externalurlservice',
+                'ServerConfigurationService',
+                'ExternalUrlService',
+            ];
+    }
+
+    public function when(){
+        return array('redis');
+    }
+}
\ No newline at end of file
diff --git a/app/strategies/DefaultLoginStrategy.php b/app/Strategies/DefaultLoginStrategy.php
similarity index 65%
rename from app/strategies/DefaultLoginStrategy.php
rename to app/Strategies/DefaultLoginStrategy.php
index af5f9c6e..d059f994 100644
--- a/app/strategies/DefaultLoginStrategy.php
+++ b/app/Strategies/DefaultLoginStrategy.php
@@ -1,18 +1,26 @@
-<?php
-
-namespace strategies;
-
-use Auth;
-use Redirect;
-use utils\IPHelper;
-use services\IUserActionService;
-use utils\services\IAuthService;
-use View;
-use URL;
-
+<?php namespace Strategies;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\IPHelper;
+use Services\IUserActionService;
+use Utils\Services\IAuthService;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\View;
+use Illuminate\Support\Facades\URL;
 /**
  * Class DefaultLoginStrategy
- * @package strategies
+ * @package Strategies
  */
 class DefaultLoginStrategy implements ILoginStrategy
 {
@@ -44,10 +52,9 @@ class DefaultLoginStrategy implements ILoginStrategy
     {
         $user = $this->auth_service->getCurrentUser();
         $identifier = $user->getIdentifier();
-        $this->user_action_service->addUserAction($this->auth_service->getCurrentUser(), IPHelper::getUserIp(), IUserActionService::LoginAction);
+        $this->user_action_service->addUserAction($this->auth_service->getCurrentUser()->getId(), IPHelper::getUserIp(), IUserActionService::LoginAction);
         $default_url = URL::action("UserController@getIdentity", array("identifier" => $identifier));
         return Redirect::intended($default_url);
-
     }
 
     public function  cancelLogin()
diff --git a/app/Strategies/DirectResponseStrategy.php b/app/Strategies/DirectResponseStrategy.php
new file mode 100644
index 00000000..3aa772bf
--- /dev/null
+++ b/app/Strategies/DirectResponseStrategy.php
@@ -0,0 +1,31 @@
+<?php namespace Strategies;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\IHttpResponseStrategy;
+use Illuminate\Support\Facades\Response;
+/**
+ * Class DirectResponseStrategy
+ * @package Strategies
+ */
+class DirectResponseStrategy implements IHttpResponseStrategy
+{
+
+    public function handle($response)
+    {
+        $http_response = Response::make($response->getContent(), $response->getHttpCode());
+        $http_response->header('Content-Type', $response->getContentType());
+        $http_response->header('Cache-Control','no-cache, no-store, max-age=0, must-revalidate');
+        $http_response->header('Pragma','no-cache');
+        return $http_response;
+    }
+}
\ No newline at end of file
diff --git a/app/strategies/DisplayResponseJsonStrategy.php b/app/Strategies/DisplayResponseJsonStrategy.php
similarity index 93%
rename from app/strategies/DisplayResponseJsonStrategy.php
rename to app/Strategies/DisplayResponseJsonStrategy.php
index 3b57d382..47ce7406 100644
--- a/app/strategies/DisplayResponseJsonStrategy.php
+++ b/app/Strategies/DisplayResponseJsonStrategy.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Strategies;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,19 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace strategies;
-
-use Illuminate\Support\Contracts\MessageProviderInterface;
+use Illuminate\Contracts\Support\MessageProvider;
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 use Illuminate\Support\Facades\Response;
-use Redirect;
-use utils\services\IAuthService;
-use URL;
-
+use Utils\Services\IAuthService;
+use Illuminate\Support\Facades\URL;
 /**
  * Class DisplayResponseJsonStrategy
- * @package strategies
+ * @package Strategies
  */
 class DisplayResponseJsonStrategy implements IDisplayResponseStrategy
 {
@@ -84,7 +79,7 @@ class DisplayResponseJsonStrategy implements IDisplayResponseStrategy
      */
     public function getLoginErrorResponse(array $data = array())
     {
-        if(isset($data['validator']) && $data['validator'] instanceof MessageProviderInterface )
+        if(isset($data['validator']) && $data['validator'] instanceof MessageProvider )
         {
             $validator = $data['validator'];
             unset($data['validator']);
diff --git a/app/strategies/DisplayResponseStrategyFactory.php b/app/Strategies/DisplayResponseStrategyFactory.php
similarity index 93%
rename from app/strategies/DisplayResponseStrategyFactory.php
rename to app/Strategies/DisplayResponseStrategyFactory.php
index b71ed264..ff79734e 100644
--- a/app/strategies/DisplayResponseStrategyFactory.php
+++ b/app/Strategies/DisplayResponseStrategyFactory.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Strategies;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,13 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace strategies;
-
-use oauth2\OAuth2Protocol;
+use OAuth2\OAuth2Protocol;
 /**
  * Class DisplayResponseStrategyFactory
- * @package strategies
+ * @package Strategies
  */
 final class DisplayResponseStrategyFactory
 {
diff --git a/app/strategies/DisplayResponseUserAgentStrategy.php b/app/Strategies/DisplayResponseUserAgentStrategy.php
similarity index 95%
rename from app/strategies/DisplayResponseUserAgentStrategy.php
rename to app/Strategies/DisplayResponseUserAgentStrategy.php
index 822f1765..ab2d06b2 100644
--- a/app/strategies/DisplayResponseUserAgentStrategy.php
+++ b/app/Strategies/DisplayResponseUserAgentStrategy.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Strategies;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,16 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace strategies;
-
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 use Illuminate\Support\Facades\Response;
-use Redirect;
-
+use Illuminate\Support\Facades\Redirect;
 /**
  * Class DisplayResponseUserAgentStrategy
- * @package strategies
+ * @package Strategies
  */
 class DisplayResponseUserAgentStrategy implements IDisplayResponseStrategy
 {
diff --git a/app/Strategies/IConsentStrategy.php b/app/Strategies/IConsentStrategy.php
new file mode 100644
index 00000000..67c38a96
--- /dev/null
+++ b/app/Strategies/IConsentStrategy.php
@@ -0,0 +1,17 @@
+<?php namespace Strategies;
+/**
+ * Interface IConsentStrategy
+ * @package Strategies
+ */
+interface IConsentStrategy {
+    /**
+     * @return mixed
+     */
+    public function getConsent();
+
+    /**
+     * @param string $trust_action
+     * @return mixed
+     */
+    public function postConsent($trust_action);
+} 
\ No newline at end of file
diff --git a/app/strategies/IDisplayResponseStrategy.php b/app/Strategies/IDisplayResponseStrategy.php
similarity index 95%
rename from app/strategies/IDisplayResponseStrategy.php
rename to app/Strategies/IDisplayResponseStrategy.php
index 4e0b2fa5..1a93d6ce 100644
--- a/app/strategies/IDisplayResponseStrategy.php
+++ b/app/Strategies/IDisplayResponseStrategy.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Strategies;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,13 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace strategies;
-
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 /**
  * Interface IDisplayResponseStrategy
- * @package strategies
+ * @package Strategies
  */
 interface IDisplayResponseStrategy
 {
diff --git a/app/strategies/ILoginStrategy.php b/app/Strategies/ILoginStrategy.php
similarity index 73%
rename from app/strategies/ILoginStrategy.php
rename to app/Strategies/ILoginStrategy.php
index d0c3950f..a3882dce 100644
--- a/app/strategies/ILoginStrategy.php
+++ b/app/Strategies/ILoginStrategy.php
@@ -1,16 +1,7 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: smarcet
- * Date: 11/28/13
- * Time: 3:11 PM
- */
-
-namespace strategies;
-
+<?php namespace Strategies;
 /**
  * Interface ILoginStrategy
- * @package strategies
+ * @package Strategies
  */
 interface ILoginStrategy
 {
diff --git a/app/Strategies/IndirectResponseQueryStringStrategy.php b/app/Strategies/IndirectResponseQueryStringStrategy.php
new file mode 100644
index 00000000..087e410c
--- /dev/null
+++ b/app/Strategies/IndirectResponseQueryStringStrategy.php
@@ -0,0 +1,43 @@
+<?php namespace Strategies;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\IHttpResponseStrategy;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Response;
+/**
+ * Class IndirectResponseQueryStringStrategy
+ * Redirect and http response using a 302 adding params on query string
+ * @package Strategies
+ */
+class IndirectResponseQueryStringStrategy implements IHttpResponseStrategy
+{
+
+    /**
+     * @param $response
+     * @return mixed
+     */
+    public function handle($response)
+    {
+        $query_string = $response->getContent();
+        $return_to    = $response->getReturnTo();
+
+        if (is_null($return_to) || empty($return_to)) {
+            return Response::view('errors.404', array(), 404);
+        }
+        $return_to = (strpos($return_to, "?") == false) ? $return_to . "?" . $query_string : $return_to . "&" . $query_string;
+
+        return Redirect::to($return_to)
+            ->header('Cache-Control', 'no-cache, no-store, max-age=0, must-revalidate')
+            ->header('Pragma','no-cache');
+    }
+}
\ No newline at end of file
diff --git a/app/Strategies/IndirectResponseUrlFragmentStrategy.php b/app/Strategies/IndirectResponseUrlFragmentStrategy.php
new file mode 100644
index 00000000..0c56be87
--- /dev/null
+++ b/app/Strategies/IndirectResponseUrlFragmentStrategy.php
@@ -0,0 +1,44 @@
+<?php namespace Strategies;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\IHttpResponseStrategy;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Response;
+/**
+ * Class IndirectResponseUrlFragmentStrategy
+ * Redirect and http response using a 302 adding params on url fragment
+ * @package Strategies
+ */
+class IndirectResponseUrlFragmentStrategy implements IHttpResponseStrategy
+{
+
+    /**
+     * @param $response
+     * @return mixed
+     */
+    public function handle($response)
+    {
+        $fragment  = $response->getContent();
+        $return_to = $response->getReturnTo();
+
+        if (is_null($return_to) || empty($return_to)) {
+            return Response::view('errors.404', array(), 404);;
+        }
+
+        $return_to = (strpos($return_to, "#") == false) ? $return_to . "#" . $fragment : $return_to . "&" . $fragment;
+
+        return Redirect::to($return_to)
+            ->header('Cache-Control', 'no-cache, no-store, max-age=0, must-revalidate')
+            ->header('Pragma','no-cache');
+    }
+}
\ No newline at end of file
diff --git a/app/Strategies/OAuth2AuthenticationStrategy.php b/app/Strategies/OAuth2AuthenticationStrategy.php
new file mode 100644
index 00000000..5eccd17e
--- /dev/null
+++ b/app/Strategies/OAuth2AuthenticationStrategy.php
@@ -0,0 +1,32 @@
+<?php namespace Strategies;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+**/
+use OAuth2\Requests\OAuth2AuthorizationRequest;
+use OAuth2\Strategies\IOAuth2AuthenticationStrategy;
+use Illuminate\Support\Facades\Redirect;
+/**
+ * Class OAuth2AuthenticationStrategy
+ * @package Strategies
+ */
+class OAuth2AuthenticationStrategy implements IOAuth2AuthenticationStrategy {
+
+    public function doLogin(OAuth2AuthorizationRequest $request)
+    {
+        return Redirect::action('UserController@getLogin');
+    }
+
+    public function doConsent(OAuth2AuthorizationRequest $request)
+    {
+        return Redirect::action('UserController@getConsent');
+    }
+}
\ No newline at end of file
diff --git a/app/strategies/OAuth2ConsentStrategy.php b/app/Strategies/OAuth2ConsentStrategy.php
similarity index 51%
rename from app/strategies/OAuth2ConsentStrategy.php
rename to app/Strategies/OAuth2ConsentStrategy.php
index ff4c1bd9..7473556a 100644
--- a/app/strategies/OAuth2ConsentStrategy.php
+++ b/app/Strategies/OAuth2ConsentStrategy.php
@@ -1,23 +1,27 @@
-<?php
-
-namespace strategies;
-
-use oauth2\OAuth2Protocol;
-use oauth2\OAuth2Message;
-use oauth2\services\IApiScopeService;
-use oauth2\services\IClientService;
-use oauth2\services\IMementoOAuth2SerializerService;
-use  utils\services\IAuthService;
-use oauth2\factories\OAuth2AuthorizationRequestFactory;
-use Redirect;
-use View;
-use Response;
-use URL;
-
+<?php namespace Strategies;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Support\Facades\Redirect;
+use OAuth2\Factories\OAuth2AuthorizationRequestFactory;
+use OAuth2\OAuth2Message;
+use OAuth2\Repositories\IApiScopeRepository;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Services\IMementoOAuth2SerializerService;
+use Utils\Services\IAuthService;
 
 /**
  * Class OAuth2ConsentStrategy
- * @package strategies
+ * @package Strategies
  */
 class OAuth2ConsentStrategy implements IConsentStrategy
 {
@@ -30,32 +34,33 @@ class OAuth2ConsentStrategy implements IConsentStrategy
      */
     private $memento_service;
     /**
-     * @var IApiScopeService
+     * @var IApiScopeRepository
      */
-    private $scope_service;
+    private $scope_repository;
     /**
-     * @var IClientService
+     * @var IClientRepository
      */
-    private $client_service;
+    private $client_repository;
 
     /**
+     * OAuth2ConsentStrategy constructor.
      * @param IAuthService $auth_service
      * @param IMementoOAuth2SerializerService $memento_service
-     * @param IApiScopeService $scope_service
-     * @param IClientService $client_service
+     * @param IApiScopeRepository $scope_repository
+     * @param IClientRepository $client_repository
      */
     public function __construct
     (
         IAuthService $auth_service,
         IMementoOAuth2SerializerService $memento_service,
-        IApiScopeService $scope_service,
-        IClientService $client_service
+        IApiScopeRepository $scope_repository,
+        IClientRepository $client_repository
     )
     {
-        $this->auth_service    = $auth_service;
-        $this->memento_service = $memento_service;
-        $this->scope_service   = $scope_service;
-        $this->client_service  = $client_service;
+        $this->auth_service      = $auth_service;
+        $this->memento_service   = $memento_service;
+        $this->scope_repository  = $scope_repository;
+        $this->client_repository = $client_repository;
     }
 
     public function getConsent()
@@ -69,11 +74,11 @@ class OAuth2ConsentStrategy implements IConsentStrategy
         );
 
         $client_id                = $auth_request->getClientId();
-        $client                   = $this->client_service->getClientById($client_id);
+        $client                   = $this->client_repository->getClientById($client_id);
         $scopes                   = explode(' ',$auth_request->getScope());
-        $requested_scopes         = $this->scope_service->getScopesByName($scopes);
+        $requested_scopes         = $this->scope_repository->getByName($scopes);
 
-        $data                      = array();
+        $data                     = array();
         $data['requested_scopes'] = $requested_scopes;
         $data['app_name']         = $client->getApplicationName();
         $data['redirect_to']      = $auth_request->getRedirectUri();
@@ -96,6 +101,6 @@ class OAuth2ConsentStrategy implements IConsentStrategy
     public function postConsent($trust_action)
     {
         $this->auth_service->setUserAuthorizationResponse($trust_action);
-        return Redirect::action('OAuth2ProviderController@authorize');
+        return Redirect::action('OAuth2\OAuth2ProviderController@auth');
     }
 }
\ No newline at end of file
diff --git a/app/strategies/OAuth2LoginStrategy.php b/app/Strategies/OAuth2LoginStrategy.php
similarity index 69%
rename from app/strategies/OAuth2LoginStrategy.php
rename to app/Strategies/OAuth2LoginStrategy.php
index 7b89c0b5..2f005df7 100644
--- a/app/strategies/OAuth2LoginStrategy.php
+++ b/app/Strategies/OAuth2LoginStrategy.php
@@ -1,25 +1,29 @@
-<?php
-
-namespace strategies;
-
-use Auth;
-use oauth2\factories\OAuth2AuthorizationRequestFactory;
-use oauth2\OAuth2Message;
-use oauth2\OAuth2Protocol;
-use oauth2\services\IMementoOAuth2SerializerService;
-use oauth2\services\ISecurityContextService;
-use Redirect;
-use services\IUserActionService;
-use utils\IPHelper;
-use utils\services\IAuthService;
-use View;
-use Session;
-use Response;
-use URL;
-
+<?php namespace Strategies;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Support\Facades\Auth;
+use OAuth2\Factories\OAuth2AuthorizationRequestFactory;
+use OAuth2\OAuth2Message;
+use OAuth2\Services\IMementoOAuth2SerializerService;
+use OAuth2\Services\ISecurityContextService;
+use Services\IUserActionService;
+use Utils\IPHelper;
+use Utils\Services\IAuthService;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Session;
 /**
  * Class OAuth2LoginStrategy
- * @package strategies
+ * @package Strategies
  */
 class OAuth2LoginStrategy extends DefaultLoginStrategy
 {
@@ -83,17 +87,17 @@ class OAuth2LoginStrategy extends DefaultLoginStrategy
             )
         );
 
-        $this->user_action_service->addUserAction($this->auth_service->getCurrentUser(), IPHelper::getUserIp(),
+        $this->user_action_service->addUserAction($this->auth_service->getCurrentUser()->getId(), IPHelper::getUserIp(),
             IUserActionService::LoginAction, $auth_request->getRedirectUri());
 
-        return Redirect::action("OAuth2ProviderController@authorize");
+        return Redirect::action("OAuth2\OAuth2ProviderController@auth");
     }
 
     public function cancelLogin()
     {
         $this->auth_service->setUserAuthenticationResponse(IAuthService::AuthenticationResponse_Cancel);
 
-        return Redirect::action("OAuth2ProviderController@authorize");
+        return Redirect::action("OAuth2\OAuth2ProviderController@auth");
     }
 
     /**
diff --git a/app/strategies/OpenIdAuthenticationStrategy.php b/app/Strategies/OpenIdAuthenticationStrategy.php
similarity index 51%
rename from app/strategies/OpenIdAuthenticationStrategy.php
rename to app/Strategies/OpenIdAuthenticationStrategy.php
index c8092150..5e09cb48 100644
--- a/app/strategies/OpenIdAuthenticationStrategy.php
+++ b/app/Strategies/OpenIdAuthenticationStrategy.php
@@ -1,17 +1,25 @@
-<?php
-
-namespace strategies;
-
-use Redirect;
-use Session;
+<?php namespace Strategies;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+**/
 use Illuminate\Http\RedirectResponse;
-use openid\handlers\IOpenIdAuthenticationStrategy;
-use openid\requests\contexts\RequestContext;
-use openid\requests\OpenIdAuthenticationRequest;
-
+use OpenId\Handlers\IOpenIdAuthenticationStrategy;
+use OpenId\Requests\Contexts\RequestContext;
+use OpenId\Requests\OpenIdAuthenticationRequest;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Session;
 /**
  * Class OpenIdAuthenticationStrategy
- * @package services\openid
+ * @package Strategies
  */
 final class OpenIdAuthenticationStrategy implements IOpenIdAuthenticationStrategy
 {
diff --git a/app/strategies/OpenIdConsentStrategy.php b/app/Strategies/OpenIdConsentStrategy.php
similarity index 67%
rename from app/strategies/OpenIdConsentStrategy.php
rename to app/Strategies/OpenIdConsentStrategy.php
index dfe31ca0..89fa239d 100644
--- a/app/strategies/OpenIdConsentStrategy.php
+++ b/app/Strategies/OpenIdConsentStrategy.php
@@ -1,24 +1,32 @@
-<?php
-
-namespace strategies;
-
-use Auth;
-use openid\exceptions\InvalidOpenIdMessageException;
-use openid\exceptions\InvalidRequestContextException;
-use openid\OpenIdMessage;
-use openid\OpenIdProtocol;
-use openid\services\IMementoOpenIdSerializerService;
-use openid\services\IServerConfigurationService;
-use Redirect;
-use utils\IPHelper;
-use services\IUserActionService;
-use Session;
-use utils\services\IAuthService;
-use View;
-
+<?php namespace Strategies;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Support\Facades\Auth;
+use OpenId\Exceptions\InvalidOpenIdMessageException;
+use OpenId\Exceptions\InvalidRequestContextException;
+use OpenId\OpenIdMessage;
+use OpenId\OpenIdProtocol;
+use OpenId\Services\IMementoOpenIdSerializerService;
+use OpenId\Services\IServerConfigurationService;
+use Utils\IPHelper;
+use Services\IUserActionService;
+use Utils\Services\IAuthService;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\View;
 /**
  * Class OpenIdConsentStrategy
- * @package strategies
+ * @package Strategies
  */
 final class OpenIdConsentStrategy implements IConsentStrategy
 {
@@ -27,14 +35,17 @@ final class OpenIdConsentStrategy implements IConsentStrategy
      * @var IMementoOpenIdSerializerService
      */
     private $memento_service;
+
     /**
      * @var IAuthService
      */
     private $auth_service;
+
     /**
      * @var IServerConfigurationService
      */
     private $server_configuration_service;
+
     /**
      * @var IUserActionService
      */
@@ -97,11 +108,11 @@ final class OpenIdConsentStrategy implements IConsentStrategy
             $msg =  OpenIdMessage::buildFromMemento( $this->memento_service->load());
             if (is_null($msg) || !$msg->isValid())
                 throw new InvalidOpenIdMessageException();
-            $this->user_action_service->addUserAction($this->auth_service->getCurrentUser(), IPHelper::getUserIp(), IUserActionService::ConsentAction, $msg->getParam(OpenIdProtocol::OpenIDProtocol_Realm));
+            $this->user_action_service->addUserAction($this->auth_service->getCurrentUser()->getId(), IPHelper::getUserIp(), IUserActionService::ConsentAction, $msg->getParam(OpenIdProtocol::OpenIDProtocol_Realm));
             $this->auth_service->setUserAuthorizationResponse($trust_action[0]);
             Session::remove('openid.auth.context');
             Session::save();
-            return Redirect::action('OpenIdProviderController@endpoint');
+            return Redirect::action('OpenId\OpenIdProviderController@endpoint');
         }
         return Redirect::action('UserController@getConsent');
     }
diff --git a/app/Strategies/OpenIdLoginStrategy.php b/app/Strategies/OpenIdLoginStrategy.php
new file mode 100644
index 00000000..c577724e
--- /dev/null
+++ b/app/Strategies/OpenIdLoginStrategy.php
@@ -0,0 +1,93 @@
+<?php namespace Strategies;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\OpenIdMessage;
+use OpenId\OpenIdProtocol;
+use OpenId\Requests\OpenIdAuthenticationRequest;
+use OpenId\Services\IMementoOpenIdSerializerService;
+use Services\IUserActionService;
+use Utils\IPHelper;
+use Utils\Services\IAuthService;
+use Illuminate\Support\Facades\View;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Auth;
+/**
+ * Class OpenIdLoginStrategy
+ * @package Strategies
+ */
+final class OpenIdLoginStrategy extends DefaultLoginStrategy
+{
+
+    /**
+     * @var IMementoOpenIdSerializerService
+     */
+    private $memento_service;
+
+    /**
+     * @param IMementoOpenIdSerializerService $memento_service
+     * @param IUserActionService $user_action_service
+     * @param IAuthService $auth_service
+     */
+    public function __construct(
+        IMementoOpenIdSerializerService $memento_service,
+        IUserActionService $user_action_service,
+        IAuthService $auth_service
+    ) {
+        $this->memento_service = $memento_service;
+
+        parent::__construct($user_action_service, $auth_service);
+    }
+
+    public function getLogin()
+    {
+        if (Auth::guest()) {
+            $msg          = OpenIdMessage::buildFromMemento($this->memento_service->load());
+            $auth_request = new OpenIdAuthenticationRequest($msg);
+            $params       = array('realm' => $auth_request->getRealm());
+
+            if (!$auth_request->isIdentitySelectByOP()) {
+                $params['claimed_id']      = $auth_request->getClaimedId();
+                $params['identity']        = $auth_request->getIdentity();
+                $params['identity_select'] = false;
+            } else {
+                $params['identity_select'] = true;
+            }
+
+            return View::make("login", $params);
+        }
+        return Redirect::action("UserController@getProfile");
+    }
+
+    public function  postLogin()
+    {
+        //go to authentication flow again
+        $msg = OpenIdMessage::buildFromMemento($this->memento_service->load());
+
+        $this->user_action_service->addUserAction
+        (
+            $this->auth_service->getCurrentUser()->getId(),
+            IPHelper::getUserIp(),
+            IUserActionService::LoginAction,
+            $msg->getParam(OpenIdProtocol::OpenIDProtocol_Realm)
+        );
+
+        return Redirect::action("OpenId\OpenIdProviderController@endpoint");
+    }
+
+    public function  cancelLogin()
+    {
+        $this->auth_service->setUserAuthenticationResponse(IAuthService::AuthenticationResponse_Cancel);
+
+        return Redirect::action("OpenId\OpenIdProviderController@endpoint");
+    }
+}
\ No newline at end of file
diff --git a/app/strategies/PostResponseStrategy.php b/app/Strategies/PostResponseStrategy.php
similarity index 85%
rename from app/strategies/PostResponseStrategy.php
rename to app/Strategies/PostResponseStrategy.php
index 80659899..453d383e 100644
--- a/app/strategies/PostResponseStrategy.php
+++ b/app/Strategies/PostResponseStrategy.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Strategies;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,19 +11,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace strategies;
-
-
-use utils\IHttpResponseStrategy;
-use \Response;
+use Utils\IHttpResponseStrategy;
+use Illuminate\Support\Facades\Response;
 /**
  * Class PostResponseStrategy
- * @package strategies
+ * @package Strategies
  */
 final class PostResponseStrategy implements IHttpResponseStrategy
 {
 
+    /**
+     * @param $response
+     * @return mixed
+     */
     public function handle($response)
     {
         $http_response = Response::make($response->getContent(), $response->getHttpCode());
diff --git a/app/Strategies/StrategyProvider.php b/app/Strategies/StrategyProvider.php
new file mode 100644
index 00000000..9fc7eda6
--- /dev/null
+++ b/app/Strategies/StrategyProvider.php
@@ -0,0 +1,66 @@
+<?php namespace Strategies;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\ServiceProvider;
+use OAuth2\Responses\OAuth2DirectResponse;
+use OAuth2\Responses\OAuth2IndirectResponse;
+use OAuth2\Responses\OAuth2PostResponse;
+use OpenId\Responses\OpenIdDirectResponse;
+use OpenId\Responses\OpenIdIndirectResponse;
+use OAuth2\Responses\OAuth2IndirectFragmentResponse;
+use OpenId\Services\OpenIdServiceCatalog;
+use OAuth2\Services\OAuth2ServiceCatalog;
+
+/**
+ * Class StrategyProvider
+ * @package Strategies
+ */
+final class StrategyProvider extends ServiceProvider
+{
+
+    protected $defer = true;
+
+    public function boot()
+    {
+    }
+
+    public function register()
+    {
+        //direct response strategy
+        App::singleton(OAuth2PostResponse::OAuth2PostResponse, \Strategies\PostResponseStrategy::class);
+        App::singleton(OAuth2DirectResponse::OAuth2DirectResponse, \Strategies\DirectResponseStrategy::class);
+        App::singleton(OpenIdDirectResponse::OpenIdDirectResponse, \Strategies\DirectResponseStrategy::class);
+        //indirect response strategy
+        App::singleton(OpenIdIndirectResponse::OpenIdIndirectResponse, \Strategies\IndirectResponseQueryStringStrategy::class);
+        App::singleton(OAuth2IndirectResponse::OAuth2IndirectResponse, \Strategies\IndirectResponseQueryStringStrategy::class);
+        App::singleton(OAuth2IndirectFragmentResponse::OAuth2IndirectFragmentResponse,\Strategies\IndirectResponseUrlFragmentStrategy::class);
+        // authentication strategies
+        App::singleton(OAuth2ServiceCatalog::AuthenticationStrategy, \Strategies\OAuth2AuthenticationStrategy::class);
+        App::singleton(OpenIdServiceCatalog::AuthenticationStrategy, \Strategies\OpenIdAuthenticationStrategy::class);
+    }
+
+    public function provides()
+    {
+        return [
+            OAuth2PostResponse::OAuth2PostResponse,
+            OAuth2DirectResponse::OAuth2DirectResponse,
+            OpenIdDirectResponse::OpenIdDirectResponse,
+            OpenIdIndirectResponse::OpenIdIndirectResponse,
+            OAuth2IndirectResponse::OAuth2IndirectResponse,
+            OAuth2IndirectFragmentResponse::OAuth2IndirectFragmentResponse,
+            OAuth2ServiceCatalog::AuthenticationStrategy,
+            OpenIdServiceCatalog::AuthenticationStrategy,
+        ];
+    }
+}
\ No newline at end of file
diff --git a/app/validators/CustomValidator.php b/app/Validators/CustomValidator.php
similarity index 79%
rename from app/validators/CustomValidator.php
rename to app/Validators/CustomValidator.php
index bdbabf08..d55ef77e 100644
--- a/app/validators/CustomValidator.php
+++ b/app/Validators/CustomValidator.php
@@ -1,15 +1,29 @@
-<?php
-
+<?php namespace Validators;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 use Illuminate\Validation\Validator;
+use Models\OAuth2\Client;
 use Symfony\Component\Translation\TranslatorInterface;
 use jwk\JSONWebKeyPublicKeyUseValues;
 use jwk\JSONWebKeyTypes;
-use oauth2\OAuth2Protocol;
-use oauth2\models\IClient;
-use utils\services\IAuthService;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Models\IClient;
+use Utils\Services\IAuthService;
+use Crypt_RSA;
+
 /**
  * Class CustomValidator
- * Custom validation methods
+ * @package Validators
  */
 class CustomValidator extends Validator
 {
@@ -29,7 +43,7 @@ class CustomValidator extends Validator
         $this->isImplicit('fail');
     }
 
-    public function validateBoolean($attribute, $value, $parameters)
+    public function validateBoolean($attribute, $value)
     {
         if (is_bool($value)) {
             return true;
@@ -41,14 +55,14 @@ class CustomValidator extends Validator
         return strtoupper(trim($value)) == 'TRUE' || strtoupper(trim($value)) == 'FALSE' || strtoupper(trim($value)) == '1' || strtoupper(trim($value)) == '0';
     }
 
-    public function validateText($attribute, $value, $parameters)
+    public function validateText($attribute, $value)
     {
         $value = trim($value);
 
         return preg_match("%^[a-zA-Z0-9\s\-\.\,\/\_]+$%i", $value) == 1;
     }
 
-    public function validateHttpmethod($attribute, $value, $parameters)
+    public function validateHttpmethod($attribute, $value)
     {
         $value = strtoupper(trim($value));
         //'GET', 'HEAD','POST','PUT','DELETE','TRACE','CONNECT','OPTIONS'
@@ -66,24 +80,24 @@ class CustomValidator extends Validator
         return array_key_exists($value, $allowed_http_verbs);
     }
 
-    public function validateRoute($attribute, $value, $parameters)
+    public function validateRoute($attribute, $value)
     {
         return true;
     }
 
-    public function validateScopename($attribute, $value, $parameters)
+    public function validateScopename($attribute, $value)
     {
         $value = trim($value);
 
         return preg_match("/^[a-zA-Z0-9\-\.\,\:\_\/]+$/", $value) == 1;
     }
 
-    public function validateHost($attribute, $value, $parameters)
+    public function validateHost($attribute, $value)
     {
         return filter_var(gethostbyname($value), FILTER_VALIDATE_IP) ? true : false;
     }
 
-    public function validateApplicationtype($attribute, $value, $parameters)
+    public function validateApplicationtype($attribute, $value)
     {
 
         if (!is_string($value)) {
@@ -95,18 +109,17 @@ class CustomValidator extends Validator
         return in_array($value, Client::$valid_app_types);
     }
 
-    public function validateSslurl($attribute, $value, $parameters)
+    public function validateSslurl($attribute, $value)
     {
         return preg_match(";^https:\/\/([\w@][\w.:@]+)\/?[\w\.?=%&=\-@/$,]*$;i", $value) == 1;
     }
 
-    public function validateFreeText($attribute, $value, $parameters)
+    public function validateFreeText($attribute, $value)
     {
-        return preg_match('|^[a-z\-@_.,()\'"\s\:\/]+$|i', $value) == 1;
+        return preg_match('|^[a-z0-9A-Z\-@_.,()\'"\s\:\/]+$|i', $value) == 1;
     }
 
-
-    public function validateSslorigin($attribute, $value, $parameters)
+    public function validateSslorigin($attribute, $value)
     {
         if (filter_var($value, FILTER_VALIDATE_URL)) {
             $parts = @parse_url($value);
@@ -145,7 +158,7 @@ class CustomValidator extends Validator
         return false;
     }
 
-    public function validateEmailSet($attribute, $value, $parameters)
+    public function validateEmailSet($attribute, $value)
     {
         $emails = explode(',', $value);
         $res = true;
@@ -159,7 +172,7 @@ class CustomValidator extends Validator
         return $res;
     }
 
-    public function validateUrlSet($attribute, $value, $parameters)
+    public function validateUrlSet($attribute, $value)
     {
         $urls = explode(',', $value);
         $res = true;
@@ -173,32 +186,32 @@ class CustomValidator extends Validator
         return $res;
     }
 
-    public function validateTokenEndpointAuthMethod($attribute, $value, $parameters)
+    public function validateTokenEndpointAuthMethod($attribute, $value)
     {
         return in_array($value,OAuth2Protocol::$token_endpoint_auth_methods);
     }
 
-    public function validateSigningAlg($attribute, $value, $parameters)
+    public function validateSigningAlg($attribute, $value)
     {
         return in_array($value,OAuth2Protocol::$supported_signing_algorithms);
     }
 
-    public function validateSubjectType($attribute, $value, $parameters)
+    public function validateSubjectType($attribute, $value)
     {
        return in_array($value, Client::$valid_subject_types);
     }
 
-    public function validateEncryptedAlg($attribute, $value, $parameters)
+    public function validateEncryptedAlg($attribute, $value)
     {
         return in_array($value,OAuth2Protocol::$supported_key_management_algorithms);
     }
 
-    public function validateEncryptedEnc($attribute, $value, $parameters)
+    public function validateEncryptedEnc($attribute, $value)
     {
         return in_array($value,OAuth2Protocol::$supported_content_encryption_algorithms);
     }
 
-    public function validatePublicKeyPem($attribute, $value, $parameters)
+    public function validatePublicKeyPem($attribute, $value)
     {
         $res1 = strpos($value,'-----BEGIN PUBLIC KEY-----');
         $res2 = strpos($value,'-----BEGIN RSA PUBLIC KEY-----');
@@ -214,9 +227,9 @@ class CustomValidator extends Validator
         return ($PKCS8 || $PKCS1) && $parsed;
     }
 
-    public function validatePublicKeyPemLength($attribute, $value, $parameters)
+    public function validatePublicKeyPemLength($attribute, $value)
     {
-        $rsa    = new Crypt_RSA;
+        $rsa    = new Crypt_RSA();
         $parsed = $rsa->loadKey($value);
 
         return $parsed && $rsa->getSize() > 1024;
@@ -288,7 +301,7 @@ class CustomValidator extends Validator
         $urls = explode(',', $value);
         $res = true;
         foreach ($urls as $url) {
-            $res = $app_type === IClient::ApplicationType_Native ? $this->validateUrl($attribute, $url, $parameters) : $this->validateSslurl($attribute, $url, $parameters);
+            $res = $app_type === IClient::ApplicationType_Native ? $this->validateCustomUrl($attribute, $url, $parameters): $this->validateSslurl($attribute, $url, $parameters);
             if (!$res) {
                 break;
             }
@@ -297,6 +310,14 @@ class CustomValidator extends Validator
         return $res;
     }
 
+    public function validateCustomUrl($attribute, $value, $paramenters){
+        $uri = @parse_url($value);
+        if (!isset($uri['scheme'])) {
+           return false;
+        }
+        return true;
+    }
+
     public function validateSslUrlSet($attribute, $value, $parameters)
     {
 
diff --git a/app/config/app.php b/app/config/app.php
deleted file mode 100644
index 22c67cbc..00000000
--- a/app/config/app.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-return array(
-
-	/*
-	|--------------------------------------------------------------------------
-	| Application Debug Mode
-	|--------------------------------------------------------------------------
-	|
-	| When your application is in debug mode, detailed error messages with
-	| stack traces will be shown on every error that occurs within your
-	| application. If disabled, a simple generic error page is shown.
-	|
-	*/
-
-	'debug' => false,
-
-	/*
-	|--------------------------------------------------------------------------
-	| Application URL
-	|--------------------------------------------------------------------------
-	|
-	| This URL is used by the console to properly generate URLs when using
-	| the Artisan command line tool. You should set this to the root of
-	| your application so that it is used when running Artisan tasks.
-	|
-	*/
-
-	'url' => '',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Application Timezone
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify the default timezone for your application, which
-	| will be used by the PHP date and date-time functions. We have gone
-	| ahead and set this to a sensible default for you out of the box.
-	|
-	*/
-
-	'timezone' => 'UTC',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Application Locale Configuration
-	|--------------------------------------------------------------------------
-	|
-	| The application locale determines the default locale that will be used
-	| by the translation service provider. You are free to set this value
-	| to any of the locales which will be supported by the application.
-	|
-	*/
-
-	'locale' => 'en',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Encryption Key
-	|--------------------------------------------------------------------------
-	|
-	| This key is used by the Illuminate encrypter service and should be set
-	| to a random, 32 character string, otherwise these encrypted strings
-	| will not be safe. Please do this before deploying an application!
-	|
-	*/
-
-	'key' => '',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Autoloaded Service Providers
-	|--------------------------------------------------------------------------
-	|
-	| The service providers listed here will be automatically loaded on the
-	| request to your application. Feel free to add your own services to
-	| this array to grant expanded functionality to your applications.
-	|
-	*/
-
-    'providers' => array(
-        'Illuminate\Foundation\Providers\ArtisanServiceProvider',
-        'Illuminate\Auth\AuthServiceProvider',
-        'Illuminate\Cache\CacheServiceProvider',
-        'Illuminate\Session\CommandsServiceProvider',
-        'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider',
-        'Illuminate\Routing\ControllerServiceProvider',
-        'Illuminate\Cookie\CookieServiceProvider',
-        'Illuminate\Database\DatabaseServiceProvider',
-        'Illuminate\Encryption\EncryptionServiceProvider',
-        'Illuminate\Filesystem\FilesystemServiceProvider',
-        'Illuminate\Hashing\HashServiceProvider',
-        'Illuminate\Html\HtmlServiceProvider',
-        'Illuminate\Log\LogServiceProvider',
-        'Illuminate\Mail\MailServiceProvider',
-        'Illuminate\Database\MigrationServiceProvider',
-        'Illuminate\Pagination\PaginationServiceProvider',
-        'Illuminate\Queue\QueueServiceProvider',
-        'Illuminate\Remote\RemoteServiceProvider',
-        'Illuminate\Auth\Reminders\ReminderServiceProvider',
-        'Illuminate\Database\SeedServiceProvider',
-        'Illuminate\Session\SessionServiceProvider',
-        'Illuminate\Translation\TranslationServiceProvider',
-        'Illuminate\Validation\ValidationServiceProvider',
-        'Illuminate\View\ViewServiceProvider',
-        'Illuminate\Workbench\WorkbenchServiceProvider',
-        'Illuminate\Redis\RedisServiceProvider',
-        'services\utils\UtilsProvider',
-        'repositories\RepositoriesProvider',
-        'factories\FactoriesProvider',
-        'services\oauth2\OAuth2ServiceProvider',
-        'services\openid\OpenIdProvider',
-        'auth\AuthenticationServiceProvider',
-        'services\ServicesProvider',
-        'strategies\StrategyProvider',
-        'oauth2\OAuth2ServiceProvider',
-        'openid\OpenIdServiceProvider',
-        'Greggilbert\Recaptcha\RecaptchaServiceProvider',
-        'services\oauth2\CORS\CORSProvider',
-    ),
-
-	/*
-	|--------------------------------------------------------------------------
-	| Service Provider Manifest
-	|--------------------------------------------------------------------------
-	|
-	| The service provider manifest is used by Laravel to lazy load service
-	| providers which are not needed for each request, as well to keep a
-	| list of all of the services. Here, you may set its storage spot.
-	|
-	*/
-
-	'manifest' => storage_path().'/meta',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Class Aliases
-	|--------------------------------------------------------------------------
-	|
-	| This array of class aliases will be registered when this application
-	| is started. However, feel free to register as many as you wish as
-	| the aliases are "lazy" loaded so they don't hinder performance.
-	|
-	*/
-
-	'aliases' => array(
-
-        'App'             => 'Illuminate\Support\Facades\App',
-        'Artisan'         => 'Illuminate\Support\Facades\Artisan',
-        'Auth'            => 'Illuminate\Support\Facades\Auth',
-        'Blade'           => 'Illuminate\Support\Facades\Blade',
-        'Cache'           => 'Illuminate\Support\Facades\Cache',
-        'ClassLoader'     => 'Illuminate\Support\ClassLoader',
-        'Config'          => 'Illuminate\Support\Facades\Config',
-        'Controller'      => 'Illuminate\Routing\Controller',
-        'Cookie'          => 'Illuminate\Support\Facades\Cookie',
-        'Crypt'           => 'Illuminate\Support\Facades\Crypt',
-        'DB'              => 'Illuminate\Support\Facades\DB',
-        'Eloquent'        => 'Illuminate\Database\Eloquent\Model',
-        'Event'           => 'Illuminate\Support\Facades\Event',
-        'File'            => 'Illuminate\Support\Facades\File',
-        'Form'            => 'Illuminate\Support\Facades\Form',
-        'Hash'            => 'Illuminate\Support\Facades\Hash',
-        'HTML'            => 'Illuminate\Support\Facades\HTML',
-        'Input'           => 'Illuminate\Support\Facades\Input',
-        'Lang'            => 'Illuminate\Support\Facades\Lang',
-        'Log'             => 'Illuminate\Support\Facades\Log',
-        'Mail'            => 'Illuminate\Support\Facades\Mail',
-        'Paginator'       => 'Illuminate\Support\Facades\Paginator',
-        'Password'        => 'Illuminate\Support\Facades\Password',
-        'Queue'           => 'Illuminate\Support\Facades\Queue',
-        'Redirect'        => 'Illuminate\Support\Facades\Redirect',
-        'Request'         => 'Illuminate\Support\Facades\Request',
-        'Response'        => 'Illuminate\Support\Facades\Response',
-        'Route'           => 'Illuminate\Support\Facades\Route',
-        'Schema'          => 'Illuminate\Support\Facades\Schema',
-        'Seeder'          => 'Illuminate\Database\Seeder',
-        'Session'         => 'Illuminate\Support\Facades\Session',
-        'SSH'             => 'Illuminate\Support\Facades\SSH',
-        'Str'             => 'Illuminate\Support\Str',
-        'URL'             => 'Illuminate\Support\Facades\URL',
-        'Validator'       => 'Illuminate\Support\Facades\Validator',
-        'View'            => 'Illuminate\Support\Facades\View',
-		'RedisLV4'        => 'Illuminate\Support\Facades\Redis',
-	),
-    'version' => 'XX.XX.XX',
-);
diff --git a/app/config/auth.php b/app/config/auth.php
deleted file mode 100644
index 9cf486c2..00000000
--- a/app/config/auth.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-return array(
-
-	/*
-	|--------------------------------------------------------------------------
-	| Default Authentication Driver
-	|--------------------------------------------------------------------------
-	|
-	| This option controls the authentication driver that will be utilized.
-	| This drivers manages the retrieval and authentication of the users
-	| attempting to get access to protected areas of your application.
-	|
-	| Supported: "database", "eloquent"
-	|
-	*/
-
-	'driver' => 'custom',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Authentication Model
-	|--------------------------------------------------------------------------
-	|
-	| When using the "Eloquent" authentication driver, we need to know which
-	| Eloquent model should be used to retrieve your users. Of course, it
-	| is often just the "User" model but you may use whatever you like.
-	|
-	*/
-
-	'model' => 'User',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Authentication Table
-	|--------------------------------------------------------------------------
-	|
-	| When using the "Database" authentication driver, we need to know which
-	| table should be used to retrieve your users. We have chosen a basic
-	| default value but you may easily change it to any table you like.
-	|
-	*/
-
-	'table' => 'users',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Password Reminder Settings
-	|--------------------------------------------------------------------------
-	|
-	| Here you may set the settings for password reminders, including a view
-	| that should be used as your password reminder e-mail. You will also
-	| be able to set the name of the table that holds the reset tokens.
-	|
-	| The "expire" time is the number of minutes that the reminder should be
-	| considered valid. This security feature keeps tokens short-lived so
-	| they have less time to be guessed. You may change this as needed.
-	|
-	*/
-
-	'reminder' => array(
-
-		'email' => 'emails.auth.reminder',
-
-		'table' => 'password_reminders',
-
-		'expire' => 60,
-
-	),
-
-);
\ No newline at end of file
diff --git a/app/config/cache.php b/app/config/cache.php
deleted file mode 100644
index ce898423..00000000
--- a/app/config/cache.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-return array(
-
-	/*
-	|--------------------------------------------------------------------------
-	| Default Cache Driver
-	|--------------------------------------------------------------------------
-	|
-	| This option controls the default cache "driver" that will be used when
-	| using the Caching library. Of course, you may use other drivers any
-	| time you wish. This is the default when another is not specified.
-	|
-	| Supported: "file", "database", "apc", "memcached", "redis", "array"
-	|
-	*/
-
-	'driver' => 'file',
-
-	/*
-	|--------------------------------------------------------------------------
-	| File Cache Location
-	|--------------------------------------------------------------------------
-	|
-	| When using the "file" cache driver, we need a location where the cache
-	| files may be stored. A sensible default has been specified, but you
-	| are free to change it to any other place on disk that you desire.
-	|
-	*/
-
-	'path' => storage_path().'/cache',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Database Cache Connection
-	|--------------------------------------------------------------------------
-	|
-	| When using the "database" cache driver you may specify the connection
-	| that should be used to store the cached items. When this option is
-	| null the default database connection will be utilized for cache.
-	|
-	*/
-
-	'connection' => null,
-
-	/*
-	|--------------------------------------------------------------------------
-	| Database Cache Table
-	|--------------------------------------------------------------------------
-	|
-	| When using the "database" cache driver we need to know the table that
-	| should be used to store the cached items. A default table name has
-	| been provided but you're free to change it however you deem fit.
-	|
-	*/
-
-	'table' => 'cache',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Memcached Servers
-	|--------------------------------------------------------------------------
-	|
-	| Now you may specify an array of your Memcached servers that should be
-	| used when utilizing the Memcached cache driver. All of the servers
-	| should contain a value for "host", "port", and "weight" options.
-	|
-	*/
-
-	'memcached' => array(
-
-		array('host' => '127.0.0.1', 'port' => 11211, 'weight' => 100),
-
-	),
-
-	/*
-	|--------------------------------------------------------------------------
-	| Cache Key Prefix
-	|--------------------------------------------------------------------------
-	|
-	| When utilizing a RAM based store such as APC or Memcached, there might
-	| be other applications utilizing the same cache. So, we'll specify a
-	| value to get prefixed to all our keys so we can avoid collisions.
-	|
-	*/
-
-	'prefix' => 'laravel',
-
-);
diff --git a/app/config/compile.php b/app/config/compile.php
deleted file mode 100644
index 54d7185b..00000000
--- a/app/config/compile.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return array(
-
-	/*
-	|--------------------------------------------------------------------------
-	| Additional Compiled Classes
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify additional classes to include in the compiled file
-	| generated by the `artisan optimize` command. These should be classes
-	| that are included on basically every request into the application.
-	|
-	*/
-
-
-
-);
\ No newline at end of file
diff --git a/app/config/cors.php b/app/config/cors.php
deleted file mode 100644
index deaf62d7..00000000
--- a/app/config/cors.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * CORS Configuration
- */
-return array(
-    /**
-     * http://www.w3.org/TR/cors/#access-control-allow-credentials-response-header
-     */
-    'AllowCredentials'    => 'true',
-    /**
-     * http://www.w3.org/TR/cors/#access-control-max-age-response-header
-     */
-    'UsePreflightCaching' => true,
-    'MaxAge'              => 32000,
-    /**
-     * http://www.w3.org/TR/cors/#access-control-allow-headers-response-header
-     */
-    'AllowedHeaders'      => 'origin, content-type, accept, authorization, x-requested-with',
-    /**
-     * http://www.w3.org/TR/cors/#access-control-allow-methods-response-header
-     */
-    'AllowedMethods'      => 'GET, POST, OPTIONS, PUT, DELETE',
-);
\ No newline at end of file
diff --git a/app/config/database.php b/app/config/database.php
deleted file mode 100644
index 4ec6849d..00000000
--- a/app/config/database.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-return array(
-
-	/*
-	|--------------------------------------------------------------------------
-	| PDO Fetch Style
-	|--------------------------------------------------------------------------
-	|
-	| By default, database results will be returned as instances of the PHP
-	| stdClass object; however, you may desire to retrieve records in an
-	| array format for simplicity. Here you can tweak the fetch style.
-	|
-	*/
-
-	'fetch' => PDO::FETCH_CLASS,
-
-	/*
-	|--------------------------------------------------------------------------
-	| Default Database Connection Name
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify which of the database connections below you wish
-	| to use as your default connection for all database work. Of course
-	| you may use many connections at once using the Database library.
-	|
-	*/
-
-	'default' => 'openstackid',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Database Connections
-	|--------------------------------------------------------------------------
-	|
-	| Here are each of the database connections setup for your application.
-	| Of course, examples of configuring each database platform that is
-	| supported by Laravel is shown below to make development simple.
-	|
-	|
-	| All database work in Laravel is done through the PHP PDO facilities
-	| so make sure you have the driver for your particular database of
-	| choice installed on your machine before you begin development.
-	|
-	*/
-
-	'connections' => array(
-        //primary DB
-		'openstackid' => array(
-			'driver'    => 'mysql',
-			'host'      => 'localhost',
-			'database'  => 'database',
-			'username'  => 'root',
-			'password'  => '',
-			'charset'   => 'utf8',
-			'collation' => 'utf8_unicode_ci',
-			'prefix'    => '',
-		),
-        //secondary DB (OS Membership)
-        'os_members' => array(
-            'driver'    => 'mysql',
-            'host'      => 'localhost',
-            'database'  => 'database',
-            'username'  => 'root',
-            'password'  => '',
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-        ),
-    ),
-
-	/*
-	|--------------------------------------------------------------------------
-	| Migration Repository Table
-	|--------------------------------------------------------------------------
-	|
-	| This table keeps track of all the migrations that have already run for
-	| your application. Using this information, we can determine which of
-	| the migrations on disk have not actually be run in the databases.
-	|
-	*/
-
-	'migrations' => 'migrations',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Redis Databases
-	|--------------------------------------------------------------------------
-	|
-	| Redis is an open source, fast, and advanced key-value store that also
-	| provides a richer set of commands than a typical key-value systems
-	| such as APC or Memcached. Laravel makes it easy to dig right in.
-	|
-	*/
-
-    'redis' => array(
-
-        'cluster' => false,
-
-        'default' => array(
-            'host' => '127.0.0.1',
-            'port' => 6379,
-            'database' => 0,
-        ),
-
-    ),
-);
diff --git a/app/config/log.php b/app/config/log.php
deleted file mode 100644
index 4ce8a2a3..00000000
--- a/app/config/log.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-return array(
-    /**
-     * EMAIL ERROR LOG CONFIGURATION
-     */
-    //The receiver of the mail
-    'to_email'   => '',
-    //The sender of the mail
-    'from_email'  => '',
-);
\ No newline at end of file
diff --git a/app/config/mail.php b/app/config/mail.php
deleted file mode 100644
index aafb04ab..00000000
--- a/app/config/mail.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-return array(
-
-	/*
-	|--------------------------------------------------------------------------
-	| Mail Driver
-	|--------------------------------------------------------------------------
-	|
-	| Laravel supports both SMTP and PHP's "mail" function as drivers for the
-	| sending of e-mail. You may specify which one you're using throughout
-	| your application here. By default, Laravel is setup for SMTP mail.
-	|
-	| Supported: "smtp", "mail", "sendmail"
-	|
-	*/
-
-	'driver' => 'mail',
-
-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Host Address
-	|--------------------------------------------------------------------------
-	|
-	| Here you may provide the host address of the SMTP server used by your
-	| applications. A default option is provided that is compatible with
-	| the Postmark mail service, which will provide reliable delivery.
-	|
-	*/
-
-	'host' => 'smtp.mailgun.org',
-
-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Host Port
-	|--------------------------------------------------------------------------
-	|
-	| This is the SMTP port used by your application to delivery e-mails to
-	| users of your application. Like the host we have set this value to
-	| stay compatible with the Postmark e-mail application by default.
-	|
-	*/
-
-	'port' => 587,
-
-	/*
-	|--------------------------------------------------------------------------
-	| Global "From" Address
-	|--------------------------------------------------------------------------
-	|
-	| You may wish for all e-mails sent by your application to be sent from
-	| the same address. Here, you may specify a name and address that is
-	| used globally for all e-mails that are sent by your application.
-	|
-	*/
-
-	'from' => array('address' => null, 'name' => null),
-
-	/*
-	|--------------------------------------------------------------------------
-	| E-Mail Encryption Protocol
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify the encryption protocol that should be used when
-	| the application send e-mail messages. A sensible default using the
-	| transport layer security protocol should provide great security.
-	|
-	*/
-
-	'encryption' => 'tls',
-
-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Server Username
-	|--------------------------------------------------------------------------
-	|
-	| If your SMTP server requires a username for authentication, you should
-	| set it here. This will get used to authenticate with your server on
-	| connection. You may also set the "password" value below this one.
-	|
-	*/
-
-	'username' => null,
-
-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Server Password
-	|--------------------------------------------------------------------------
-	|
-	| Here you may set the password required by your SMTP server to send out
-	| messages from your application. This will be given to the server on
-	| connection so that the application will be able to send messages.
-	|
-	*/
-
-	'password' => null,
-
-	/*
-	|--------------------------------------------------------------------------
-	| Sendmail System Path
-	|--------------------------------------------------------------------------
-	|
-	| When using the "sendmail" driver to send e-mails, we will need to know
-	| the path to where Sendmail lives on this server. A default path has
-	| been provided here, which will work well on most of your systems.
-	|
-	*/
-
-	'sendmail' => '/usr/sbin/sendmail -bs',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Mail "Pretend"
-	|--------------------------------------------------------------------------
-	|
-	| When this option is enabled, e-mail will not actually be sent over the
-	| web and will instead be written to your application's logs files so
-	| you may inspect the message. This is great for local development.
-	|
-	*/
-
-	'pretend' => false,
-
-);
\ No newline at end of file
diff --git a/app/config/packages/greggilbert/recaptcha/config.php b/app/config/packages/greggilbert/recaptcha/config.php
deleted file mode 100644
index 783f2373..00000000
--- a/app/config/packages/greggilbert/recaptcha/config.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-return array(
-
-	/*
-	|--------------------------------------------------------------------------
-	| API Keys
-	|--------------------------------------------------------------------------
-	|
-	| Set the public and private API keys as provided by reCAPTCHA.
-	|
-	*/
-	'public_key'	=> '',
-	'private_key'	=> '',
-	
-	/*
-	|--------------------------------------------------------------------------
-	| Template
-	|--------------------------------------------------------------------------
-	|
-	| Set a template to use if you don't want to use the standard one.
-	|
-	*/
-	'template'		=> '',
-	
-);
\ No newline at end of file
diff --git a/app/config/production/.gitkeep b/app/config/production/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/config/queue.php b/app/config/queue.php
deleted file mode 100644
index 6d01e569..00000000
--- a/app/config/queue.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-return array(
-
-	/*
-	|--------------------------------------------------------------------------
-	| Default Queue Driver
-	|--------------------------------------------------------------------------
-	|
-	| The Laravel queue API supports a variety of back-ends via an unified
-	| API, giving you convenient access to each back-end using the same
-	| syntax for each one. Here you may set the default queue driver.
-	|
-	| Supported: "sync", "beanstalkd", "sqs", "iron"
-	|
-	*/
-
-	'default' => 'sync',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Queue Connections
-	|--------------------------------------------------------------------------
-	|
-	| Here you may configure the connection information for each server that
-	| is used by your application. A default configuration has been added
-	| for each back-end shipped with Laravel. You are free to add more.
-	|
-	*/
-
-	'connections' => array(
-
-		'sync' => array(
-			'driver' => 'sync',
-		),
-
-		'beanstalkd' => array(
-			'driver' => 'beanstalkd',
-			'host'   => 'localhost',
-			'queue'  => 'default',
-		),
-
-		'sqs' => array(
-			'driver' => 'sqs',
-			'key'    => 'your-public-key',
-			'secret' => 'your-secret-key',
-			'queue'  => 'your-queue-url',
-			'region' => 'us-east-1',
-		),
-
-		'iron' => array(
-			'driver'  => 'iron',
-			'project' => 'your-project-id',
-			'token'   => 'your-token',
-			'queue'   => 'your-queue-name',
-		),
-
-	),
-    'failed' => array(
-        'database' => 'mysql', 'table' => 'failed_jobs',
-    ),
-
-);
diff --git a/app/config/remote.php b/app/config/remote.php
deleted file mode 100644
index c8bc303b..00000000
--- a/app/config/remote.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-return array(
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default Remote Connection Name
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify the default connection that will be used for SSH
-    | operations. This name should correspond to a connection name below
-    | in the server list. Each connection will be manually accessible.
-    |
-    */
-
-    'default' => 'production',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Remote Server Connections
-    |--------------------------------------------------------------------------
-    |
-    | These are the servers that will be accessible via the SSH task runner
-    | facilities of Laravel. This feature radically simplifies executing
-    | tasks on your servers, such as deploying out these applications.
-    |
-    */
-
-    'connections' => array(
-
-        'production' => array(
-            'host'      => '',
-            'username'  => '',
-            'password'  => '',
-            'key'       => '',
-            'keyphrase' => '',
-            'root'      => '/var/www',
-        ),
-
-    ),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Remote Server Groups
-    |--------------------------------------------------------------------------
-    |
-    | Here you may list connections under a single group name, which allows
-    | you to easily access all of the servers at once using a short name
-    | that is extremely easy to remember, such as "web" or "database".
-    |
-    */
-
-    'groups' => array(
-
-        'web' => array('production')
-
-    ),
-
-);
\ No newline at end of file
diff --git a/app/config/server.php b/app/config/server.php
deleted file mode 100644
index aa20bbf7..00000000
--- a/app/config/server.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Server Configuration
- *
- */
-return array(
-    //general default values
-    'Assets_Url' => 'https://www.openstack.org/',
-    'Support_Email' => 'noreply@openstack.org',
-    'MaxFailed_Login_Attempts' => 10,
-    'MaxFailed_LoginAttempts_2ShowCaptcha' => 3,
-    //openid default values
-    'OpenId_Private_Association_Lifetime' => 240,
-    'OpenId_Session_Association_Lifetime' => 21600,
-    'OpenId_Nonce_Lifetime' => 360,
-    /**
-     * Security Policies Configuration
-     */
-    'BlacklistSecurityPolicy_BannedIpLifeTimeSeconds' => 21600,
-    'BlacklistSecurityPolicy_MinutesWithoutExceptions' => 5,
-    'BlacklistSecurityPolicy_MaxReplayAttackExceptionAttempts' => 3,
-    'BlacklistSecurityPolicy_ReplayAttackExceptionInitialDelay' => 10,
-    'BlacklistSecurityPolicy_MaxInvalidNonceAttempts' => 10,
-    'BlacklistSecurityPolicy_InvalidNonceInitialDelay' => 10,
-    'BlacklistSecurityPolicy_MaxInvalidOpenIdMessageExceptionAttempts' => 10,
-    'BlacklistSecurityPolicy_InvalidOpenIdMessageExceptionInitialDelay' => 10,
-    'BlacklistSecurityPolicy_MaxOpenIdInvalidRealmExceptionAttempts' => 10,
-    'BlacklistSecurityPolicy_OpenIdInvalidRealmExceptionInitialDelay' => 10,
-    'BlacklistSecurityPolicy_MaxInvalidOpenIdMessageModeAttempts' => 10,
-    'BlacklistSecurityPolicy_InvalidOpenIdMessageModeInitialDelay' => 10,
-    'BlacklistSecurityPolicy_MaxInvalidOpenIdAuthenticationRequestModeAttempts' => 10,
-    'BlacklistSecurityPolicy_InvalidOpenIdAuthenticationRequestModeInitialDelay' => 10,
-    'BlacklistSecurityPolicy_MaxAuthenticationExceptionAttempts' => 10,
-    'BlacklistSecurityPolicy_AuthenticationExceptionInitialDelay' => 20,
-    'BlacklistSecurityPolicy_MaxInvalidAssociationAttempts' => 10,
-    'BlacklistSecurityPolicy_InvalidAssociationInitialDelay' => 20,
-    'BlacklistSecurityPolicy_OAuth2_MaxAuthCodeReplayAttackAttempts' => 3,
-    'BlacklistSecurityPolicy_OAuth2_AuthCodeReplayAttackInitialDelay' => 10,
-    'BlacklistSecurityPolicy_OAuth2_MaxInvalidAuthorizationCodeAttempts' => 3,
-    'BlacklistSecurityPolicy_OAuth2_InvalidAuthorizationCodeInitialDelay' => 10,
-    'BlacklistSecurityPolicy_OAuth2_MaxInvalidBearerTokenDisclosureAttempt' => 3,
-    'BlacklistSecurityPolicy_OAuth2_BearerTokenDisclosureAttemptInitialDelay' => 10,
-    //oauth2 default config values
-    'OAuth2_AuthorizationCode_Lifetime' => 240,
-    'OAuth2_AccessToken_Lifetime' => 3600,
-    // in seconds , should be equal to session.lifetime (120 minutes)
-    'OAuth2_IdToken_Lifetime' => 7200,
-    'OAuth2_RefreshToken_Lifetime' => 0,
-    'OAuth2_Enable' => true,
-    //oauth2 security policy configuration
-    'OAuth2SecurityPolicy_MinutesWithoutExceptions' => 2,
-    'OAuth2SecurityPolicy_MaxBearerTokenDisclosureAttempts' => 5,
-    'OAuth2SecurityPolicy_MaxInvalidClientExceptionAttempts' => 10,
-    'OAuth2SecurityPolicy_MaxInvalidRedeemAuthCodeAttempts' => 10,
-    'OAuth2SecurityPolicy_MaxInvalidClientCredentialsAttempts' => 5,
-    'Banning_Enable' => true,
-    'FileLog_Level'  => 'warning',
-    'EmailLog_Level' => 'error',
-);
\ No newline at end of file
diff --git a/app/config/session.php b/app/config/session.php
deleted file mode 100644
index a362693b..00000000
--- a/app/config/session.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-  
-return array(
-
-	/*
-	|--------------------------------------------------------------------------
-	| Default Session Driver
-	|--------------------------------------------------------------------------
-	|
-	| This option controls the default session "driver" that will be used on
-	| requests. By default, we will use the lightweight native driver but
-	| you may specify any of the other wonderful drivers provided here.
-	|
-	| Supported: "native", "cookie", "database", "apc",
-	|            "memcached", "redis", "array"
-	|
-	*/
-
-	'driver' => 'redis',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Session Lifetime
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify the number of minutes that you wish the session
-	| to be allowed to remain idle before it expires. If you want them
-	| to immediately expire when the browser closes, set it to zero.
-	|
-	*/
-
-	'lifetime' => 120,
-
-    'expire_on_close' => false,
-
-	/*
-	|--------------------------------------------------------------------------
-	| Session File Location
-	|--------------------------------------------------------------------------
-	|
-	| When using the native session driver, we need a location where session
-	| files may be stored. A default has been set for you but a different
-	| location may be specified. This is only needed for file sessions.
-	|
-	*/
-
-	'files' => storage_path().'/sessions',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Session Database Connection
-	|--------------------------------------------------------------------------
-	|
-	| When using the "database" session driver, you may specify the database
-	| connection that should be used to manage your sessions. This should
-	| correspond to a connection in your "database" configuration file.
-	|
-	*/
-
-	'connection' => null,
-
-	/*
-	|--------------------------------------------------------------------------
-	| Session Database Table
-	|--------------------------------------------------------------------------
-	|
-	| When using the "database" session driver, you may specify the table we
-	| should use to manage the sessions. Of course, a sensible default is
-	| provided for you; however, you are free to change this as needed.
-	|
-	*/
-
-	'table' => 'sessions',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Session Sweeping Lottery
-	|--------------------------------------------------------------------------
-	|
-	| Some session drivers must manually sweep their storage location to get
-	| rid of old sessions from storage. Here are the chances that it will
-	| happen on a given request. By default, the odds are 2 out of 100.
-	|
-	*/
-
-	'lottery' => array(2, 100),
-
-	/*
-	|--------------------------------------------------------------------------
-	| Session Cookie Name
-	|--------------------------------------------------------------------------
-	|
-	| Here you may change the name of the cookie used to identify a session
-	| instance by ID. The name specified here will get used every time a
-	| new session cookie is created by the framework for every driver.
-	|
-	*/
-
-	'cookie' => 'openstackid_session',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Session Cookie Path
-	|--------------------------------------------------------------------------
-	|
-	| The session cookie path determines the path for which the cookie will
-	| be regarded as available. Typically, this will be the root path of
-	| your application but you are free to change this when necessary.
-	|
-	*/
-
-	'path' => '/',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Session Cookie Domain
-	|--------------------------------------------------------------------------
-	|
-	| Here you may change the domain of the cookie used to identify a session
-	| in your application. This will determine which domains the cookie is
-	| available to in your application. A sensible default has been set.
-	|
-	*/
-
-	'domain' => null,
-
-
-
-);
diff --git a/app/config/staging/.gitkeep b/app/config/staging/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/config/testing/.gitkeep b/app/config/testing/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/config/testing/cache.php b/app/config/testing/cache.php
deleted file mode 100644
index f55b773a..00000000
--- a/app/config/testing/cache.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-return array(
-
-	/*
-	|--------------------------------------------------------------------------
-	| Default Cache Driver
-	|--------------------------------------------------------------------------
-	|
-	| This option controls the default cache "driver" that will be used when
-	| using the Caching library. Of course, you may use other drivers any
-	| time you wish. This is the default when another is not specified.
-	|
-	| Supported: "file", "database", "apc", "memcached", "redis", "array"
-	|
-	*/
-
-	'driver' => 'redis',
-
-);
\ No newline at end of file
diff --git a/app/config/testing/session.php b/app/config/testing/session.php
deleted file mode 100644
index d92f8515..00000000
--- a/app/config/testing/session.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-return array(
-
-	/*
-	|--------------------------------------------------------------------------
-	| Default Session Driver
-	|--------------------------------------------------------------------------
-	|
-	| This option controls the default session "driver" that will be used on
-	| requests. By default, we will use the lightweight native driver but
-	| you may specify any of the other wonderful drivers provided here.
-	|
-	| Supported: "native", "cookie", "database", "apc",
-	|            "memcached", "redis", "array"
-	|
-	*/
-
-	'driver' => 'redis',
-
-);
\ No newline at end of file
diff --git a/app/config/view.php b/app/config/view.php
deleted file mode 100644
index 34b8f387..00000000
--- a/app/config/view.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-return array(
-
-	/*
-	|--------------------------------------------------------------------------
-	| View Storage Paths
-	|--------------------------------------------------------------------------
-	|
-	| Most templating systems load templates from disk. Here you may specify
-	| an array of paths that should be checked for your views. Of course
-	| the usual Laravel view path has already been registered for you.
-	|
-	*/
-
-	'paths' => array(__DIR__.'/../views'),
-
-	/*
-	|--------------------------------------------------------------------------
-	| Pagination View
-	|--------------------------------------------------------------------------
-	|
-	| This view will be used to render the pagination link output, and can
-	| be easily customized here to show any view you like. A clean view
-	| compatible with Twitter's Bootstrap is given to you by default.
-	|
-	*/
-
-	'pagination' => 'pagination::slider-3',
-
-);
diff --git a/app/config/workbench.php b/app/config/workbench.php
deleted file mode 100644
index 56bee526..00000000
--- a/app/config/workbench.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-return array(
-
-	/*
-	|--------------------------------------------------------------------------
-	| Workbench Author Name
-	|--------------------------------------------------------------------------
-	|
-	| When you create new packages via the Artisan "workbench" command your
-	| name is needed to generate the composer.json file for your package.
-	| You may specify it now so it is used for all of your workbenches.
-	|
-	*/
-
-	'name' => '',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Workbench Author E-Mail Address
-	|--------------------------------------------------------------------------
-	|
-	| Like the option above, your e-mail address is used when generating new
-	| workbench packages. The e-mail is placed in your composer.json file
-	| automatically after the package is created by the workbench tool.
-	|
-	*/
-
-	'email' => '',
-
-);
\ No newline at end of file
diff --git a/app/controllers/.gitkeep b/app/controllers/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/controllers/BaseController.php b/app/controllers/BaseController.php
deleted file mode 100644
index b640e64e..00000000
--- a/app/controllers/BaseController.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-use Illuminate\Routing\Controller;
-
-class BaseController extends Controller {
-
-    /**
-     * Setup the layout used by the controller.
-     *
-     * @return void
-     */
-    protected function setupLayout()
-    {
-        if (!is_null($this->layout)) {
-            $this->layout = View::make($this->layout);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/controllers/HomeController.php b/app/controllers/HomeController.php
deleted file mode 100644
index 7325a6cd..00000000
--- a/app/controllers/HomeController.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Class HomeController
- */
-class HomeController extends OpenIdController
-{
-
-    private $discovery;
-
-    public function __construct(DiscoveryController $discovery)
-    {
-        $this->discovery = $discovery;
-    }
-
-    public function index()
-    {
-
-        if ($this->isDiscoveryRequest())
-            return $this->discovery->idp();
-        if (Auth::guest()) {
-            Session::flush();
-            Session::regenerate();
-            return View::make("home");
-        }
-        else
-            return Redirect::action("UserController@getProfile");
-    }
-}
\ No newline at end of file
diff --git a/app/controllers/apis/ClientApiController.php b/app/controllers/apis/ClientApiController.php
deleted file mode 100644
index 37337629..00000000
--- a/app/controllers/apis/ClientApiController.php
+++ /dev/null
@@ -1,537 +0,0 @@
-<?php
-
-use oauth2\exceptions\AbsentClientException;
-use oauth2\exceptions\AllowedClientUriAlreadyExistsException;
-use oauth2\services\IApiScopeService;
-use oauth2\services\IClientService;
-use oauth2\services\ITokenService;
-use utils\services\ILogService;
-use utils\exceptions\EntityNotFoundException;
-use oauth2\exceptions\InvalidApiScope;
-use utils\services\IAuthService;
-/**
- * Class ClientApiController
- * Client REST API
- */
-final class ClientApiController extends AbstractRESTController implements ICRUDController
-{
-
-    /**
-     * @var IClientService
-     */
-    private $client_service;
-    /**
-     * @var IApiScopeService
-     */
-    private $scope_service;
-    /**
-     * @var ITokenService
-     */
-    private $token_service;
-
-    /**
-     * @var IAuthService
-     */
-    private $auth_service;
-
-    public function __construct
-    (
-        IApiScopeService $scope_service,
-        ITokenService $token_service,
-        IClientService $client_service,
-        IAuthService $auth_service,
-        ILogService $log_service
-    ) {
-        parent::__construct($log_service);
-
-        $this->client_service = $client_service;
-        $this->scope_service  = $scope_service;
-        $this->token_service  = $token_service;
-        $this->auth_service   = $auth_service;
-
-        //set filters allowed values
-        $this->allowed_filter_fields = array('user_id');
-        $this->allowed_projection_fields = array('*');
-    }
-
-    public function get($id)
-    {
-        try {
-            $client = $this->client_service->get($id);
-            if (is_null($client))
-            {
-                return $this->error404(array('error' => 'client not found'));
-            }
-            $data = $client->toArray();
-
-            return $this->ok($data);
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-
-            return $this->error500($ex);
-        }
-    }
-
-    /**
-     * Deletes an existing client
-     * @param $id
-     * @return mixed
-     */
-    public function delete($id)
-    {
-        try {
-            $res = $this->client_service->deleteClientByIdentifier($id);
-            return $res ? $this->deleted() : $this->error404(array('error' => 'operation failed'));
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-
-            return $this->error500($ex);
-        }
-    }
-
-    /**
-     * Creates an existing client
-     * @return mixed
-     */
-    public function create()
-    {
-        try {
-            $values = Input::All();
-
-            // Build the validation constraint set.
-            $rules = array(
-                'app_name'         => 'required|freetext|max:255',
-                'app_description'  => 'required|freetext|max:512',
-                'website'          => 'url',
-                'admin_users'      => 'user_ids',
-                'application_type' => 'required|applicationtype',
-            );
-
-            // Create a new validator instance.
-            $validation = Validator::make($values, $rules);
-
-            if ($validation->fails()) {
-                $messages = $validation->messages()->toArray();
-
-                return $this->error400(array('error' => 'validation', 'messages' => $messages));
-            }
-
-            if ($this->client_service->existClientAppName($values['app_name'])) {
-                return $this->error400(array('error' => 'application Name already exists!.'));
-            }
-            $admin_users = trim($values['admin_users']);
-            $admin_users = empty($admin_users) ? array():explode(',',$admin_users);
-
-            $new_client = $this->client_service->addClient
-            (
-                $values['application_type'],
-                trim($values['app_name']),
-                trim($values['app_description']),
-                trim($values['website']),
-                $admin_users
-            );
-
-            return $this->created
-            (
-                array
-                (
-                    'id'            => $new_client->id,
-                    'client_id'     => $new_client->client_id,
-                    'client_secret' => $new_client->client_secret,
-                )
-            );
-
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-            return $this->error500($ex);
-        }
-    }
-
-    /**
-     * @return mixed
-     */
-    public function update()
-    {
-        try {
-
-            $values = Input::all();
-
-            $rules = array(
-                'id' => 'required|integer',
-                'application_type' =>'required|application_type',
-                'app_name' => 'sometimes|required|freetext|max:255',
-                'app_description' => 'sometimes|required|freetext|max:512',
-                'website' => 'url',
-                'active' => 'sometimes|required|boolean',
-                'locked' => 'sometimes|required|boolean',
-                'use_refresh_token' => 'sometimes|required|boolean',
-                'rotate_refresh_token' => 'sometimes|required|boolean',
-                'contacts' => 'email_set',
-                'logo_uri' => 'url',
-                'tos_uri' => 'url',
-                'redirect_uris' => 'custom_url_set:application_type',
-                'post_logout_redirect_uris' => 'ssl_url_set',
-                'allowed_origins' => 'ssl_url_set',
-                'logout_uri' => 'url',
-                'logout_session_required' => 'sometimes|required|boolean',
-                'logout_use_iframe' => 'sometimes|required|boolean',
-                'policy_uri' => 'url',
-                'jwks_uri' => 'url',
-                'default_max_age' => 'sometimes|required|integer',
-                'logout_use_iframe' => 'sometimes|required|boolean',
-                'require_auth_time' => 'sometimes|required|boolean',
-                'token_endpoint_auth_method' => 'sometimes|required|token_endpoint_auth_method',
-                'token_endpoint_auth_signing_alg' => 'sometimes|required|signing_alg',
-                'subject_type' => 'sometimes|required|subject_type',
-                'userinfo_signed_response_alg' => 'sometimes|required|signing_alg',
-                'userinfo_encrypted_response_alg' => 'sometimes|required|encrypted_alg',
-                'userinfo_encrypted_response_enc' => 'sometimes|required|encrypted_enc',
-                'id_token_signed_response_alg' => 'sometimes|required|signing_alg',
-                'id_token_encrypted_response_alg' => 'sometimes|required|encrypted_alg',
-                'id_token_encrypted_response_enc' => 'sometimes|required|encrypted_enc',
-                'admin_users'                     => 'user_ids',
-            );
-
-            // Creates a Validator instance and validates the data.
-            $validation = Validator::make($values, $rules);
-
-            if ($validation->fails()) {
-                $messages = $validation->messages()->toArray();
-
-                return $this->error400(array('error' => 'validation', 'messages' => $messages));
-            }
-
-            $res = $this->client_service->update(intval($values['id']), $values);
-
-            return $res ? $this->ok() : $this->error400(array('error' => 'operation failed'));
-
-        }
-        catch (AbsentClientException $ex1)
-        {
-            $this->log_service->error($ex1);
-            return $this->error404(array('error' => $ex1->getMessage()));
-        }
-        catch(ValidationException $ex2)
-        {
-            $this->log_service->error($ex2);
-            return $this->error412(array($ex2->getMessage()));
-        }
-        catch (Exception $ex) {
-            $this->log_service->error($ex);
-
-            return $this->error500($ex);
-        }
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getByPage()
-    {
-        try {
-
-            $items   = array();
-            $user    = $this->auth_service->getCurrentUser();
-            $clients = $user->getClients();
-
-            foreach ($clients as $client)
-            {
-                $data = $client->toArray();
-                $data['application_type'] = $client->getFriendlyApplicationType();
-                $data['is_own']           = $client->isOwner($this->auth_service->getCurrentUser());
-                $data['modified_by']      = $client->getEditedByNice();
-                array_push($items, $data);
-            }
-
-            return $this->ok
-            (
-                array
-                (
-                    'page'        => $items,
-                    'total_items' => count($items)
-                )
-            );
-
-        }
-        catch (Exception $ex)
-        {
-            $this->log_service->error($ex);
-            return $this->error500($ex);
-        }
-    }
-
-    public function addAllowedScope($id, $scope_id)
-    {
-        try
-        {
-            $this->client_service->addClientScope($id, $scope_id);
-            return $this->ok();
-        }
-        catch (EntityNotFoundException $ex1)
-        {
-            $this->log_service->error($ex1);
-            return $this->error404(array('error' => $ex1->getMessage()));
-        }
-        catch (InvalidApiScope $ex2)
-        {
-            $this->log_service->error($ex2);
-            return $this->error412(array('messages' => $ex2->getMessage()));
-        }
-        catch (Exception $ex)
-        {
-            $this->log_service->error($ex);
-            return $this->error500($ex);
-        }
-    }
-
-    public function removeAllowedScope($id, $scope_id)
-    {
-        try
-        {
-            $res = $this->client_service->deleteClientScope($id, $scope_id);
-            return $res ? $this->ok() : $this->error404(array('error' => 'operation failed'));
-        } catch (AbsentClientException $ex1) {
-            $this->log_service->error($ex1);
-
-            return $this->error404(array('error' => $ex1->getMessage()));
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-
-            return $this->error500($ex);
-        }
-    }
-
-    public function activate($id)
-    {
-        try {
-            $res = $this->client_service->activateClient($id, true);
-            return $res ? $this->ok() : $this->error404(array('error' => 'operation failed'));
-        } catch (AbsentClientException $ex1) {
-            $this->log_service->error($ex1);
-
-            return $this->error404(array('error' => $ex1->getMessage()));
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-
-            return $this->error500($ex);
-        }
-    }
-
-    public function deactivate($id)
-    {
-        try {
-            $res = $this->client_service->activateClient($id, false);
-
-            return $res ? $this->ok() : $this->error404(array('error' => 'operation failed'));
-        } catch (AbsentClientException $ex1) {
-            $this->log_service->error($ex1);
-
-            return $this->error404(array('error' => $ex1->getMessage()));
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-
-            return $this->error500($ex);
-        }
-    }
-
-    public function regenerateClientSecret($id)
-    {
-        try
-        {
-            $client = $this->client_service->regenerateClientSecret($id);
-
-            return !is_null($client) ?
-                $this->ok
-                (
-                    array
-                    (
-                        'new_secret'          => $client->getClientSecret(),
-                        'new_expiration_date' => $client->getClientSecretExpiration(),
-                    )
-                ) : $this->error404(array('error' => 'operation failed'));
-        }
-        catch (Exception $ex)
-        {
-            $this->log_service->error($ex);
-            return $this->error500($ex);
-        }
-    }
-
-    public function setRefreshTokenClient($id)
-    {
-        try {
-            $values = Input::All();
-
-            // Build the validation constraint set.
-            $rules = array(
-                'use_refresh_token' => 'required|boolean'
-            );
-
-            // Creates a Validator instance and validates the data.
-            $validation = Validator::make($values, $rules);
-            if ($validation->fails()) {
-                $messages = $validation->messages()->toArray();
-
-                return $this->error400(array('error' => 'validation', 'messages' => $messages));
-            }
-
-            $res = $this->client_service->setRefreshTokenUsage($id, $values['use_refresh_token']);
-
-            return $res ? $this->ok() : $this->error404(array('error' => 'operation failed'));
-
-        } catch (AbsentClientException $ex1) {
-            $this->log_service->error($ex1);
-
-            return $this->error404(array('error' => $ex1->getMessage()));
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-
-            return $this->error500($ex);
-        }
-    }
-
-    public function setRotateRefreshTokenPolicy($id)
-    {
-        try {
-            $values = Input::All();
-
-            // Build the validation constraint set.
-            $rules = array(
-                'rotate_refresh_token' => 'required|boolean'
-            );
-            // Creates a Validator instance and validates the data.
-            $validation = Validator::make($values, $rules);
-            if ($validation->fails()) {
-                $messages = $validation->messages()->toArray();
-
-                return $this->error400(array('error' => 'validation', 'messages' => $messages));
-            }
-
-            $res = $this->client_service->setRotateRefreshTokenPolicy($id, $values['rotate_refresh_token']);
-
-            return $res ? $this->ok() : $this->error404(array('error' => 'operation failed'));
-        } catch (AbsentClientException $ex1) {
-            $this->log_service->error($ex1);
-
-            return $this->error404(array('error' => $ex1->getMessage()));
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-
-            return $this->error500($ex);
-        }
-    }
-
-    public function revokeToken($id, $value, $hint)
-    {
-        try {
-            $res = false;
-            $client = $this->client_service->getClientByIdentifier($id);
-            switch ($hint) {
-                case 'access-token': {
-                    $token = $this->token_service->getAccessToken($value, true);
-                    if (is_null($token)) {
-                        return $this->error404(array('error' => sprintf('access token %s does not exists!', $value)));
-                    }
-                    Log::debug(sprintf('access token client id %s - client id %s ',$token->getClientId() , $client->client_id));
-                    if ($token->getClientId() !== $client->client_id) {
-                        return $this->error412(array(
-                            'error' => sprintf('access token %s does not belongs to client id !', $value, $id)
-                        ));
-                    }
-                    $res = $this->token_service->revokeAccessToken($value, true);
-                }
-                    break;
-                case 'refresh-token': {
-                    $token = $this->token_service->getRefreshToken($value, true);
-                    if (is_null($token)) {
-                        return $this->error404(array('error' => sprintf('refresh token %s does not exists!', $value)));
-                    }
-                    Log::debug(sprintf('refresh token client id %s - client id %s ',$token->getClientId() , $client->client_id));
-                    if ($token->getClientId() !== $client->client_id) {
-                        return $this->error412(array(
-                            'error' => sprintf('refresh token %s does not belongs to client id !', $value, $id)
-                        ));
-                    }
-                    $res = $this->token_service->revokeRefreshToken($value, true);
-                }
-                    break;
-                default:
-                    break;
-            }
-
-            return $res ? $this->ok() : $this->error404(array('error' => 'operation failed'));
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-
-            return $this->error500($ex);
-        }
-    }
-
-    public function getAccessTokens($id)
-    {
-        try {
-            $client = $this->client_service->getClientByIdentifier($id);
-            $access_tokens = $this->token_service->getAccessTokenByClient($client->client_id);
-            $res = array();
-            foreach ($access_tokens as $token) {
-                array_push($res, array(
-                    'value'    => $token->value,
-                    'scope'    => $token->scope,
-                    'lifetime' => $token->getRemainingLifetime(),
-                    'issued'    => $token->created_at->format('Y-m-d H:i:s')
-                ));
-            }
-
-            return $this->ok(array('access_tokens' => $res));
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-
-            return $this->error500($ex);
-        }
-    }
-
-    public function getRefreshTokens($id)
-    {
-        try {
-            $client = $this->client_service->getClientByIdentifier($id);
-            $refresh_tokens = $this->token_service->getRefreshTokenByClient($client->client_id);
-            $res = array();
-            foreach ($refresh_tokens as $token) {
-                array_push($res, array(
-                    'value' => $token->value,
-                    'scope' => $token->scope,
-                    'lifetime' => $token->getRemainingLifetime(),
-                    'issued' => $token->created_at->format('Y-m-d H:i:s')
-                ));
-            }
-
-            return $this->ok(array('refresh_tokens' => $res));
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-
-            return $this->error500($ex);
-        }
-    }
-
-    /**
-     * @param $id
-     * @return mixed
-     */
-    public function unlock($id)
-    {
-        try {
-            $res = $this->client_service->unlockClient($id);
-
-            return $res ? $this->ok() : $this->error404(array('error' => 'operation failed'));
-        } catch (AbsentClientException $ex1) {
-            $this->log_service->error($ex1);
-
-            return $this->error404(array('error' => $ex1->getMessage()));
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-
-            return $this->error500($ex);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/controllers/apis/protected/OAuth2ProtectedController.php b/app/controllers/apis/protected/OAuth2ProtectedController.php
deleted file mode 100644
index 8ad212ce..00000000
--- a/app/controllers/apis/protected/OAuth2ProtectedController.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-use oauth2\IResourceServerContext;
-use utils\services\ILogService;
-
-/**
- * Class OAuth2ProtectedController
- * OAuth2 Protected Base API
- */
-abstract class OAuth2ProtectedController extends JsonController
-{
-
-    /**
-     * @var IResourceServerContext
-     */
-    protected $resource_server_context;
-
-    /**
-     * @var
-     */
-    protected $repository;
-
-    public function __construct
-    (
-        IResourceServerContext $resource_server_context,
-        ILogService $log_service
-    )
-    {
-        parent::__construct($log_service);
-        $this->resource_server_context = $resource_server_context;
-    }
-}
\ No newline at end of file
diff --git a/app/controllers/openid/DiscoveryController.php b/app/controllers/openid/DiscoveryController.php
deleted file mode 100644
index a09837de..00000000
--- a/app/controllers/openid/DiscoveryController.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-use openid\IOpenIdProtocol;
-use openid\services\IServerConfigurationService;
-use openid\XRDS\XRDSDocumentBuilder;
-use utils\services\IAuthService;
-
-class DiscoveryController extends OpenIdController
-{
-
-    private $openid_protocol;
-    private $auth_service;
-    private $server_config_service;
-
-    public function __construct(IOpenIdProtocol $openid_protocol, IAuthService $auth_service, IServerConfigurationService $server_config_service)
-    {
-        $this->openid_protocol      = $openid_protocol;
-        $this->auth_service         = $auth_service;
-        $this->server_config_service = $server_config_service;
-    }
-
-    /**
-     * XRDS discovery(eXtensible Resource Descriptor Sequence)
-     * @return xrds document on response
-     */
-    public function idp()
-    {
-        $response = Response::make($this->openid_protocol->getXRDSDiscovery(IOpenIdProtocol::OpenIdXRDSModeIdp), 200);
-        $this->setDiscoveryResponseType($response);
-        return $response;
-    }
-
-    /**
-     * If the Claimed Identifier was not previously discovered by the Relying Party
-     * (the "openid.identity" in the request was "http://specs.openid.net/auth/2.0/identifier_select"
-     * or a different Identifier, or if the OP is sending an unsolicited positive assertion),
-     * the Relying Party MUST perform discovery on the Claimed Identifier in
-     * the response to make sure that the OP is authorized to make assertions about the Claimed Identifier.
-     * @param $identifier
-     * @return mixed
-     */
-    public function user($identifier)
-    {
-        $user = $this->auth_service->getUserByOpenId($identifier);
-        if (is_null($user))
-            return View::make("404");
-
-        $local_identifier = $this->server_config_service->getUserIdentityEndpointURL($identifier);
-        $response = Response::make($this->openid_protocol->getXRDSDiscovery(IOpenIdProtocol::OpenIdXRDSModeUser, $local_identifier), 200);
-        $this->setDiscoveryResponseType($response);
-        return $response;
-    }
-
-}
\ No newline at end of file
diff --git a/app/controllers/openid/OpenIdProviderController.php b/app/controllers/openid/OpenIdProviderController.php
deleted file mode 100644
index 121fe757..00000000
--- a/app/controllers/openid/OpenIdProviderController.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-use openid\exceptions\InvalidOpenIdMessageException;
-use openid\helpers\OpenIdErrorMessages;
-use openid\IOpenIdProtocol;
-use openid\services\IMementoOpenIdSerializerService;
-use openid\strategies\OpenIdResponseStrategyFactoryMethod;
-use openid\OpenIdMessage;
-use openid\responses\OpenIdResponse;
-
-/**
- * Class OpenIdProviderController
- */
-class OpenIdProviderController extends BaseController
-{
-    /**
-     * @var IOpenIdProtocol
-     */
-    private $openid_protocol;
-    /**
-     * @var IMementoOpenIdSerializerService
-     */
-    private $memento_service;
-
-    /**
-     * @param IOpenIdProtocol $openid_protocol
-     * @param IMementoOpenIdSerializerService $memento_service
-     */
-    public function __construct(IOpenIdProtocol $openid_protocol, IMementoOpenIdSerializerService $memento_service)
-    {
-        $this->openid_protocol = $openid_protocol;
-        $this->memento_service = $memento_service;
-    }
-
-    /**
-     * @return OpenIdResponse
-     * @throws Exception
-     * @throws InvalidOpenIdMessageException
-     */
-    public function endpoint()
-    {
-        $msg = new OpenIdMessage( Input::all() );
-
-        if($this->memento_service->exists()){
-            $msg = OpenIdMessage::buildFromMemento( $this->memento_service->load());
-        }
-
-        if (!$msg->isValid())
-            throw new InvalidOpenIdMessageException(OpenIdErrorMessages::InvalidOpenIdMessage);
-
-        //get response and manage it taking in consideration its type (direct or indirect)
-        $response = $this->openid_protocol->handleOpenIdMessage($msg);
-
-        if ($response instanceof OpenIdResponse) {
-            $strategy = OpenIdResponseStrategyFactoryMethod::buildStrategy($response);
-            return $strategy->handle($response);
-        }
-        return $response;
-    }
-}
\ No newline at end of file
diff --git a/app/database/migrations/.gitkeep b/app/database/migrations/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/database/migrations/2015_03_19_190534_insert_marketplace_api_endpoints_scopes.php b/app/database/migrations/2015_03_19_190534_insert_marketplace_api_endpoints_scopes.php
deleted file mode 100644
index 0318d9a4..00000000
--- a/app/database/migrations/2015_03_19_190534_insert_marketplace_api_endpoints_scopes.php
+++ /dev/null
@@ -1,263 +0,0 @@
-<?php
-
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class InsertMarketplaceApiEndpointsScopes extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-
-		$resource_server = ResourceServer::first();
-
-		if(!$resource_server) return;
-		// public clouds
-		Api::create(
-			array(
-				'name'            => 'public-clouds',
-				'logo'            =>  null,
-				'active'          =>  true,
-				'Description'     => 'Marketplace Public Clouds',
-				'resource_server_id' => $resource_server->id,
-				'logo'               => asset('/assets/img/apis/server.png')
-			)
-		);
-		// private clouds
-		Api::create(
-			array(
-				'name'            => 'private-clouds',
-				'logo'            =>  null,
-				'active'          =>  true,
-				'Description'     => 'Marketplace Private Clouds',
-				'resource_server_id' => $resource_server->id,
-				'logo'               => asset('/assets/img/apis/server.png')
-			)
-		);
-		// consultants
-		Api::create(
-			array(
-				'name'            => 'consultants',
-				'logo'            =>  null,
-				'active'          =>  true,
-				'Description'     => 'Marketplace Consultants',
-				'resource_server_id' => $resource_server->id,
-				'logo'               => asset('/assets/img/apis/server.png')
-			)
-		);
-
-		$this->seedPublicCloudScopes();
-		$this->seedPrivateCloudScopes();
-		$this->seedConsultantScopes();
-		$this->seedPublicCloudsEndpoints();
-		$this->seedPrivateCloudsEndpoints();
-		$this->seedConsultantsEndpoints();
-	}
-
-
-	private function seedPublicCloudScopes(){
-
-		$current_realm = Config::get('app.url');
-		$public_clouds    = Api::where('name','=','public-clouds')->first();
-
-		ApiScope::create(
-			array(
-				'name'               => sprintf('%s/public-clouds/read',$current_realm),
-				'short_description'  => 'Get Public Clouds',
-				'description'        => 'Grants read only access for Public Clouds',
-				'api_id'             => $public_clouds->id,
-				'system'             => false,
-			)
-		);
-	}
-
-	private function seedPrivateCloudScopes(){
-
-		$current_realm  = Config::get('app.url');
-		$private_clouds = Api::where('name','=','private-clouds')->first();
-
-		ApiScope::create(
-			array(
-				'name'               => sprintf('%s/private-clouds/read',$current_realm),
-				'short_description'  => 'Get Private Clouds',
-				'description'        => 'Grants read only access for Private Clouds',
-				'api_id'             => $private_clouds->id,
-				'system'             => false,
-			)
-		);
-	}
-
-	private function seedConsultantScopes(){
-
-		$current_realm  = Config::get('app.url');
-		$consultants = Api::where('name','=','consultants')->first();
-
-		ApiScope::create(
-			array(
-				'name'               => sprintf('%s/consultants/read',$current_realm),
-				'short_description'  => 'Get Consultants',
-				'description'        => 'Grants read only access for Consultants',
-				'api_id'             => $consultants->id,
-				'system'             => false,
-			)
-		);
-	}
-
-	private function seedPublicCloudsEndpoints(){
-		$public_clouds  = Api::where('name','=','public-clouds')->first();
-		$current_realm  = Config::get('app.url');
-		// endpoints scopes
-
-		ApiEndpoint::create(
-			array(
-				'name'            => 'get-public-clouds',
-				'active'          =>  true,
-				'api_id'          => $public_clouds->id,
-				'route'           => '/api/v1/marketplace/public-clouds',
-				'http_method'     => 'GET'
-			)
-		);
-
-		ApiEndpoint::create(
-			array(
-				'name'            => 'get-public-cloud',
-				'active'          =>  true,
-				'api_id'          => $public_clouds->id,
-				'route'           => '/api/v1/marketplace/public-clouds/{id}',
-				'http_method'     => 'GET'
-			)
-		);
-
-		ApiEndpoint::create(
-			array(
-				'name'            => 'get-public-cloud-datacenters',
-				'active'          =>  true,
-				'api_id'          => $public_clouds->id,
-				'route'           => '/api/v1/marketplace/public-clouds/{id}/data-centers',
-				'http_method'     => 'GET'
-			)
-		);
-
-		$public_cloud_read_scope           = ApiScope::where('name','=',sprintf('%s/public-clouds/read',$current_realm))->first();
-
-		$endpoint_get_public_clouds            = ApiEndpoint::where('name','=','get-public-clouds')->first();
-		$endpoint_get_public_clouds->scopes()->attach($public_cloud_read_scope->id);
-
-		$endpoint_get_public_cloud        = ApiEndpoint::where('name','=','get-public-cloud')->first();
-		$endpoint_get_public_cloud->scopes()->attach($public_cloud_read_scope->id);
-
-		$endpoint_get_public_cloud_datacenters = ApiEndpoint::where('name','=','get-public-cloud-datacenters')->first();
-		$endpoint_get_public_cloud_datacenters->scopes()->attach($public_cloud_read_scope->id);
-	}
-
-	private function seedPrivateCloudsEndpoints(){
-		$private_clouds  = Api::where('name','=','private-clouds')->first();
-		$current_realm  = Config::get('app.url');
-		// endpoints scopes
-
-		ApiEndpoint::create(
-			array(
-				'name'            => 'get-private-clouds',
-				'active'          =>  true,
-				'api_id'          => $private_clouds->id,
-				'route'           => '/api/v1/marketplace/private-clouds',
-				'http_method'     => 'GET'
-			)
-		);
-
-		ApiEndpoint::create(
-			array(
-				'name'            => 'get-private-cloud',
-				'active'          =>  true,
-				'api_id'          => $private_clouds->id,
-				'route'           => '/api/v1/marketplace/private-clouds/{id}',
-				'http_method'     => 'GET'
-			)
-		);
-
-		ApiEndpoint::create(
-			array(
-				'name'            => 'get-private-cloud-datacenters',
-				'active'          =>  true,
-				'api_id'          => $private_clouds->id,
-				'route'           => '/api/v1/marketplace/private-clouds/{id}/data-centers',
-				'http_method'     => 'GET'
-			)
-		);
-
-		$private_cloud_read_scope           = ApiScope::where('name','=',sprintf('%s/private-clouds/read',$current_realm))->first();
-
-		$endpoint_get_private_clouds            = ApiEndpoint::where('name','=','get-private-clouds')->first();
-		$endpoint_get_private_clouds->scopes()->attach($private_cloud_read_scope->id);
-
-		$endpoint_get_private_cloud        = ApiEndpoint::where('name','=','get-private-cloud')->first();
-		$endpoint_get_private_cloud->scopes()->attach($private_cloud_read_scope->id);
-
-		$endpoint_get_private_cloud_datacenters = ApiEndpoint::where('name','=','get-private-cloud-datacenters')->first();
-		$endpoint_get_private_cloud_datacenters->scopes()->attach($private_cloud_read_scope->id);
-
-	}
-
-	private function seedConsultantsEndpoints(){
-
-		$consultants  = Api::where('name','=','consultants')->first();
-		$current_realm  = Config::get('app.url');
-		// endpoints scopes
-
-		ApiEndpoint::create(
-			array(
-				'name'            => 'get-consultants',
-				'active'          =>  true,
-				'api_id'          => $consultants->id,
-				'route'           => '/api/v1/marketplace/consultants',
-				'http_method'     => 'GET'
-			)
-		);
-
-		ApiEndpoint::create(
-			array(
-				'name'            => 'get-consultant',
-				'active'          =>  true,
-				'api_id'          => $consultants->id,
-				'route'           => '/api/v1/marketplace/consultants/{id}',
-				'http_method'     => 'GET'
-			)
-		);
-
-		ApiEndpoint::create(
-			array(
-				'name'            => 'get-consultant-offices',
-				'active'          =>  true,
-				'api_id'          => $consultants->id,
-				'route'           => '/api/v1/marketplace/consultants/{id}/offices',
-				'http_method'     => 'GET'
-			)
-		);
-
-		$consultant_read_scope = ApiScope::where('name','=',sprintf('%s/consultants/read',$current_realm))->first();
-
-		$endpoint              = ApiEndpoint::where('name','=','get-consultants')->first();
-		$endpoint->scopes()->attach($consultant_read_scope->id);
-
-		$endpoint              = ApiEndpoint::where('name','=','get-consultant')->first();
-		$endpoint->scopes()->attach($consultant_read_scope->id);
-
-		$endpoint              = ApiEndpoint::where('name','=','get-consultant-offices')->first();
-		$endpoint->scopes()->attach($consultant_read_scope->id);
-	}
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		//
-	}
-
-}
diff --git a/app/database/migrations/2015_05_06_142958_delete_marketplace_api_endpoints_scopes.php b/app/database/migrations/2015_05_06_142958_delete_marketplace_api_endpoints_scopes.php
deleted file mode 100644
index 871e827c..00000000
--- a/app/database/migrations/2015_05_06_142958_delete_marketplace_api_endpoints_scopes.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class DeleteMarketplaceApiEndpointsScopes extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-        $public_clouds  = Api::where('name','=','public-clouds')->first();
-        if($public_clouds) $public_clouds->delete();
-        $private_clouds = Api::where('name','=','private-clouds')->first();
-        if($private_clouds) $private_clouds->delete();
-        $consultants    = Api::where('name','=','consultants')->first();
-        if($consultants) $consultants->delete();
-	}
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		//
-	}
-
-}
diff --git a/app/database/production.sqlite b/app/database/production.sqlite
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/database/seeds/.gitkeep b/app/database/seeds/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/filters.php b/app/filters.php
deleted file mode 100644
index 6cfa7e01..00000000
--- a/app/filters.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?php
-
-use openid\exceptions\InvalidOpenIdMessageException;
-use openid\requests\OpenIdAuthenticationRequest;
-use openid\services\OpenIdServiceCatalog;
-use utils\services\ServiceLocator;
-use utils\services\UtilsServiceCatalog;
-use oauth2\services\OAuth2ServiceCatalog;
-use oauth2\exceptions\InvalidAuthorizationRequestException;
-use oauth2\strategies\ClientAuthContextValidatorFactory;
-use services\oauth2\HttpIClientJWKSetReader;
-
-/*
-|--------------------------------------------------------------------------
-| Application & Route Filters
-|--------------------------------------------------------------------------
-|
-| Below you will find the "before" and "after" events for the application
-| which may be used to do any work before or after a request into your
-| application. Here you may also register your custom route filters.
-|
-*/
-
-//SAP (single access point)
-App::before(function($request){
-
-    ClientAuthContextValidatorFactory::setTokenEndpointUrl
-    (
-        URL::action("OAuth2ProviderController@token")
-    );
-
-    ClientAuthContextValidatorFactory::setJWKSetReader
-    (
-        App::make('oauth2\services\IClientJWKSetReader')
-    );
-
-    if(Config::get('server.Banning_Enable', true))
-    {
-        try {
-            //checkpoint security pattern entry point
-            $checkpoint_service = ServiceLocator::getInstance()->getService(UtilsServiceCatalog::CheckPointService);
-            if (!$checkpoint_service->check()) {
-                return Response::view('404', array(), 404);
-            }
-        } catch (Exception $ex) {
-            Log::error($ex);
-
-            return Response::view('404', array(), 404);
-        }
-    }
-
-    $cors = ServiceLocator::getInstance()->getService('CORSMiddleware');
-    if($response = $cors->verifyRequest($request))
-        return $response;
-});
-
-App::after(function($request, $response){
-    // https://www.owasp.org/index.php/List_of_useful_HTTP_headers
-    $response->headers->set('X-content-type-options','nosniff');
-    $response->headers->set('X-xss-protection','1; mode=block');
-    //cache
-    $response->headers->set('pragma','no-cache');
-    $response->headers->set('Expires','-1');
-    $response->headers->set('cache-control','no-store, must-revalidate, no-cache');
-    $cors = ServiceLocator::getInstance()->getService('CORSMiddleware');
-    $cors->modifyResponse($request, $response);
-});
-
-/*
-|--------------------------------------------------------------------------
-| Authentication Filters
-|--------------------------------------------------------------------------
-|
-| The following filters are used to verify that the user of the current
-| session is logged into this application. The "basic" filter easily
-| integrates HTTP Basic authentication for quick, simple checking.
-|
-*/
-
-Route::filter('auth', function () {
-    if (Auth::guest()) {
-        Session::put('url.intended', URL::full());
-        Session::save();
-        return Redirect::action('HomeController@index');
-    }
-    $redirect = Session::get('url.intended');
-    if (!empty($redirect)) {
-        Session::forget('url.intended');
-        Session::save();
-        return Redirect::to($redirect);
-    }
-});
-
-Route::filter('auth.basic', function () {
-    return Auth::basic();
-});
-
-/*
-|--------------------------------------------------------------------------
-| Guest Filter
-|--------------------------------------------------------------------------
-|
-| The "guest" filter is the counterpart of the authentication filters as
-| it simply checks that the current user is not logged in. A redirect
-| response will be issued if they are, which you may freely change.
-|
-*/
-
-Route::filter('guest', function () {
-    if (Auth::check()) return Redirect::to('/');
-});
-
-Route::filter('user.logged', function () {
-    if (!Auth::check())
-    {
-        return Response::json(array('error' => 'operation not allowed.'), 400);
-    }
-});
-
-/*
-|--------------------------------------------------------------------------
-| CSRF Protection Filter
-|--------------------------------------------------------------------------
-|
-| The CSRF filter is responsible for protecting your application against
-| cross-site request forgery attacks. If this special token in a user
-| session does not match the one given in this request, we'll bail.
-|
-*/
-
-Route::filter('csrf', function () {
-    if (Session::token() != Input::get('_token')) {
-        throw new Illuminate\Session\TokenMismatchException;
-    }
-});
-
-Route::filter('ajax', function()
-{
-    if (!Request::ajax()) App::abort(404);
-});
-
-Route::filter("ssl", function () {
-    if ((!Request::secure()) && (ServerConfigurationService::getConfigValue("SSL.Enable"))) {
-        return Redirect::secure(Request::getRequestUri());
-    }
-});
-
-Route::filter("oauth2.enabled",function(){
-    if(!ServerConfigurationService::getConfigValue("OAuth2.Enable")){
-        return Response::view('404', array(), 404);
-    }
-});
-
-Route::filter('user.owns.client.policy',function($route, $request){
-    try{
-        $authentication_service = ServiceLocator::getInstance()->getService(UtilsServiceCatalog::AuthenticationService);
-        $client_service         = ServiceLocator::getInstance()->getService(OAuth2ServiceCatalog::ClientService);
-        $client_id              = $route->getParameter('id');
-
-        if(is_null($client_id))
-            $client_id          = $route->getParameter('client_id');
-
-        if(is_null($client_id))
-            $client_id          =Input::get('client_id',null);;
-
-        $client                 = $client_service->getClientByIdentifier($client_id);
-        $user                   = $authentication_service->getCurrentUser();
-        if (is_null($client) || !$client->isOwner($user))
-            throw new Exception('invalid client id for current user');
-
-    } catch (Exception $ex) {
-        Log::error($ex);
-        return Response::json(array('error' => 'operation not allowed.'), 400);
-    }
-});
-
-Route::filter('user.can.edit.client.policy',function($route, $request){
-    try{
-        $authentication_service = ServiceLocator::getInstance()->getService(UtilsServiceCatalog::AuthenticationService);
-        $client_service         = ServiceLocator::getInstance()->getService(OAuth2ServiceCatalog::ClientService);
-        $client_id              = $route->getParameter('id');
-
-        if(is_null($client_id))
-            $client_id          = $route->getParameter('client_id');
-
-        if(is_null($client_id))
-            $client_id          = Input::get('client_id',null);;
-
-        $client                 = $client_service->getClientByIdentifier($client_id);
-        $user                   = $authentication_service->getCurrentUser();
-        if (is_null($client) || !$client->candEdit($user))
-            throw new Exception('invalid client id for current user');
-
-    } catch (Exception $ex) {
-        Log::error($ex);
-        return Response::json(array('error' => 'operation not allowed.'), 400);
-    }
-});
-
-Route::filter('is.current.user',function($route, $request){
-    try{
-        $authentication_service = ServiceLocator::getInstance()->getService(UtilsServiceCatalog::AuthenticationService);
-        $used_id                = Input::get('user_id',null);
-
-        if(is_null($used_id))
-            $used_id            = Input::get('id',null);
-
-        if(is_null($used_id))
-            $used_id =  $route->getParameter('user_id');
-
-        if(is_null($used_id))
-            $used_id =  $route->getParameter('id');
-
-        $user                   = $authentication_service->getCurrentUser();
-        if (is_null($used_id) || intval($used_id) !== intval($user->getId()))
-            throw new Exception(sprintf('user id %s does not match with current user id %s',$used_id,$user->getId()));
-
-    } catch (Exception $ex) {
-        Log::error($ex);
-        return Response::json(array('error' => 'operation not allowed.'), 400);
-    }
-});
-
-
-// filter to protect an api endpoint with oauth2
-
-Route::filter('oauth2.protected.endpoint','OAuth2BearerAccessTokenRequestValidator');
-
-//oauth2 server admin filter
-
-Route::filter('oauth2.server.admin.json',function(){
-    if (Auth::guest()) {
-        return Response::json(array('error' => 'you are not allowed to perform this operation'));
-    }
-    if(!Auth::user()->isOAuth2ServerAdmin()){
-        return Response::json(array('error' => 'you are not allowed to perform this operation'));
-    }
-});
-
-
-Route::filter('oauth2.server.admin',function(){
-    if (Auth::guest()) {
-        return Response::view('404', array(), 404);
-    }
-    if(!Auth::user()->isOAuth2ServerAdmin()){
-        return Response::view('404', array(), 404);
-    }
-});
-
-
-//openstackid server admin
-
-Route::filter('openstackid.server.admin.json',function(){
-    if (Auth::guest()) {
-        return Response::json(array('error' => 'you are not allowed to perform this operation'));
-    }
-    if(!Auth::user()->isOpenstackIdAdmin()){
-        return Response::json(array('error' => 'you are not allowed to perform this operation'));
-    }
-});
-
-
-Route::filter('openstackid.server.admin',function(){
-    if (Auth::guest()) {
-        return Response::view('404', array(), 404);
-    }
-    if(!Auth::user()->isOpenstackIdAdmin()){
-        return Response::view('404', array(), 404);
-    }
-});
\ No newline at end of file
diff --git a/app/filters/.gitkeep b/app/filters/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/lang/en/pagination.php b/app/lang/en/pagination.php
deleted file mode 100644
index eb9be3ba..00000000
--- a/app/lang/en/pagination.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php 
-
-return array(
-
-	/*
-	|--------------------------------------------------------------------------
-	| Pagination Language Lines
-	|--------------------------------------------------------------------------
-	|
-	| The following language lines are used by the paginator library to build
-	| the simple pagination links. You are free to change them to anything
-	| you want to customize your views to better match your application.
-	|
-	*/
-
-	'previous' => '&laquo; Previous',
-
-	'next'     => 'Next &raquo;',
-
-);
\ No newline at end of file
diff --git a/app/lang/en/validation.php b/app/lang/en/validation.php
deleted file mode 100644
index bc024339..00000000
--- a/app/lang/en/validation.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-return array(
-
-    /*
-    |--------------------------------------------------------------------------
-    | Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines contain the default error messages used by
-    | the validator class. Some of these rules have multiple versions such
-    | such as the size rules. Feel free to tweak each of these messages.
-    |
-    */
-
-    "accepted" => "The :attribute must be accepted.",
-    "active_url" => "The :attribute is not a valid URL.",
-    "after" => "The :attribute must be a date after :date.",
-    "alpha" => "The :attribute may only contain letters.",
-    "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.",
-    "alpha_num" => "The :attribute may only contain letters and numbers.",
-    "array" => "The :attribute must be an array.",
-    "before" => "The :attribute must be a date before :date.",
-    "between" => array(
-        "numeric" => "The :attribute must be between :min - :max.",
-        "file" => "The :attribute must be between :min - :max kilobytes.",
-        "string" => "The :attribute must be between :min - :max characters.",
-        "array" => "The :attribute must have between :min - :max items.",
-    ),
-    "confirmed" => "The :attribute confirmation does not match.",
-    "date" => "The :attribute is not a valid date.",
-    "date_format" => "The :attribute does not match the format :format.",
-    "different" => "The :attribute and :other must be different.",
-    "digits" => "The :attribute must be :digits digits.",
-    "digits_between" => "The :attribute must be between :min and :max digits.",
-    "email" => "The :attribute format is invalid.",
-    "exists" => "The selected :attribute is invalid.",
-    "image" => "The :attribute must be an image.",
-    "in" => "The selected :attribute is invalid.",
-    "integer" => "The :attribute must be an integer.",
-    "ip" => "The :attribute must be a valid IP address.",
-    "max" => array(
-        "numeric" => "The :attribute may not be greater than :max.",
-        "file" => "The :attribute may not be greater than :max kilobytes.",
-        "string" => "The :attribute may not be greater than :max characters.",
-        "array" => "The :attribute may not have more than :max items.",
-    ),
-    "mimes" => "The :attribute must be a file of type: :values.",
-    "min" => array(
-        "numeric" => "The :attribute must be at least :min.",
-        "file" => "The :attribute must be at least :min kilobytes.",
-        "string" => "The :attribute must be at least :min characters.",
-        "array" => "The :attribute must have at least :min items.",
-    ),
-    "not_in" => "The selected :attribute is invalid.",
-    "numeric" => "The :attribute must be a number.",
-    "regex" => "The :attribute format is invalid.",
-    "required" => "The :attribute field is required.",
-    "required_if" => "The :attribute field is required when :other is :value.",
-    "required_with" => "The :attribute field is required when :values is present.",
-    "required_without" => "The :attribute field is required when :values is not present.",
-    "same" => "The :attribute and :other must match.",
-    "size" => array(
-        "numeric" => "The :attribute must be :size.",
-        "file" => "The :attribute must be :size kilobytes.",
-        "string" => "The :attribute must be :size characters.",
-        "array" => "The :attribute must contain :size items.",
-    ),
-    "unique" => "The :attribute has already been taken.",
-    "url" => "The :attribute format is invalid.",
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify custom validation messages for attributes using the
-    | convention "attribute.rule" to name the lines. This makes it quick to
-    | specify a specific custom language line for a given attribute rule.
-    |
-    */
-
-    'custom' => array(),
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Attributes
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used to swap attribute place-holders
-    | with something more reader friendly such as E-Mail Address instead
-    | of "email". This simply helps us make messages a little cleaner.
-    |
-    */
-
-    'attributes' => array(),
-    //custom messages
-    'boolean' => "The :attribute must be a boolean.",
-    'text' => "The :attribute may only contain text.",
-    'httpmethod' => "The :attribute must be one of the following values 'GET', 'HEAD','POST','PUT','DELETE','TRACE','CONNECT' OR 'OPTIONS'.",
-    'route' => "The :attribute may be a valid http route.",
-    'host' => "The :attribute may be a valid host name.",
-    'scopename' => "The :attribute may be a valid scope name.",
-    'applicationtype' => "The :attribute may be a valid application type.",
-    'sslurl' => "The :attribute may be a valid URL under ssl schema.",
-    'sslorigin' => "The :attribute may be a valid HTTP origin under ssl schema.",
-    'freetext' => "The :attribute may only contain text.",
-    'public_key_pem' => "The :attribute has not a valid PCK#1/PCK#8 public key format.",
-    'private_key_pem' => "The :attribute has not a valid PCK#1/PCK#8 private key format.",
-    'public_key_usage' => "The :attribute has not a valid key usage (enc, sig).",
-    'public_key_type'=> "The :attribute has not a valid key type (RSA).",
-    'private_key_password' =>  "The :attribute is not the right password of the PEM private key.",
-    'private_key_pem_length'=> "The :attribute has not a valid private key length ( at least 2048 bits ).",
-    'public_key_pem_length'=> "The :attribute has not a valid public key length ( at least 2048 bits ).",
-    'key_alg' => "The :attribute has not a valid alg parameter for the key usage.",
-);
diff --git a/app/libs/auth/AuthHelper.php b/app/libs/Auth/AuthHelper.php
similarity index 87%
rename from app/libs/auth/AuthHelper.php
rename to app/libs/Auth/AuthHelper.php
index 632269c8..28f3a77d 100644
--- a/app/libs/auth/AuthHelper.php
+++ b/app/libs/Auth/AuthHelper.php
@@ -1,9 +1,23 @@
-<?php
-
-namespace auth;
-
+<?php namespace Auth;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 use Zend\Crypt\Hash;
-
+use Zend\Math\Rand;
+use Exception;
+/**
+ * Class PasswordEncryptorStrategy
+ * @package Auth
+ */
 abstract class PasswordEncryptorStrategy {
     /**
      * @param      $password
@@ -20,6 +34,10 @@ abstract class PasswordEncryptorStrategy {
     abstract public function compare($hash1, $hash2);
 }
 
+/**
+ * Class PasswordEncryptor_Legacy
+ * @package Auth
+ */
 final class PasswordEncryptor_Legacy extends PasswordEncryptorStrategy {
 
     private $algorithm;
@@ -58,7 +76,7 @@ final class PasswordEncryptor_Legacy extends PasswordEncryptorStrategy {
 
 /**
  * Class PasswordEncryptor_Blowfish
- * @package auth
+ * @package Auth
  */
 final class PasswordEncryptor_Blowfish extends PasswordEncryptorStrategy {
     /**
@@ -86,10 +104,7 @@ final class PasswordEncryptor_Blowfish extends PasswordEncryptorStrategy {
     }
 
     /**
-     * Gets the cost that is set for the blowfish algorithm
-     *
-     * @param int $cost
-     * @return null
+     * @return int
      */
     public static function get_cost() {
         return self::$cost;
@@ -203,8 +218,8 @@ final class PasswordEncryptor_Blowfish extends PasswordEncryptorStrategy {
      * self::$cost param is forced to be two digits with leading zeroes for ints 4-9
      */
     public function salt($password) {
-        $generator = new RandomGenerator();
-        return sprintf('%02d', self::$cost) . '$' . substr($generator->randomToken('sha1'), 0, 22);
+        $generator =  Hash::compute('sha1',Rand::getString(128, null, true));
+        return sprintf('%02d', self::$cost) . '$' . substr($generator, 0, 22);
     }
 
     public function check($hash, $password, $salt = null) {
@@ -229,6 +244,10 @@ final class PasswordEncryptor_Blowfish extends PasswordEncryptorStrategy {
     }
 }
 
+/**
+ * Class AuthHelper
+ * @package Auth
+ */
 class AuthHelper
 {
 
@@ -246,12 +265,12 @@ class AuthHelper
      * @param $salt
      * @param string $algorithm
      * @return string
-     * @throws \Exception
+     * @throws Exception
      */
     public static function encrypt_password($password, $salt, $algorithm = "sha1")
     {
         if (!isset(self::$algorithms[$algorithm]))
-            throw new \Exception(sprintf("non supported algorithm %s", $algorithm));
+            throw new Exception(sprintf("non supported algorithm %s", $algorithm));
 
         $class = self::$algorithms[$algorithm];
 
@@ -265,12 +284,12 @@ class AuthHelper
      * @param string $hash2
      * @param string $algorithm
      * @return bool
-     * @throws \Exception
+     * @throws Exception
      */
     public static function compare($hash1, $hash2, $algorithm = "sha1")
     {
         if (!isset(self::$algorithms[$algorithm]))
-            throw new \Exception(sprintf("non supported algorithm %s", $algorithm));
+            throw new Exception(sprintf("non supported algorithm %s", $algorithm));
         $class = self::$algorithms[$algorithm];
 
         $strategy = new $class($algorithm);
diff --git a/app/libs/auth/AuthService.php b/app/libs/Auth/AuthService.php
similarity index 73%
rename from app/libs/auth/AuthService.php
rename to app/libs/Auth/AuthService.php
index 813dbea2..f8278068 100644
--- a/app/libs/auth/AuthService.php
+++ b/app/libs/Auth/AuthService.php
@@ -1,26 +1,34 @@
-<?php
-
-namespace auth;
-
-use Auth;
-use Config;
-use Crypt;
-use Cookie;
+<?php namespace Auth;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Auth\Repositories\IMemberRepository;
+use Auth\Repositories\IUserRepository;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Cookie;
+use Illuminate\Support\Facades\Session;
+use OAuth2\Models\IClient;
+use OAuth2\Services\IPrincipalService;
+use OpenId\Models\IOpenIdUser;
+use OpenId\Services\IUserService;
+use Utils\Services\IAuthService;
+use Utils\Services\ICacheService;
 use jwe\compression_algorithms\CompressionAlgorithms_Registry;
 use jwe\compression_algorithms\CompressionAlgorithmsNames;
-use Member;
-use oauth2\models\IClient;
-use oauth2\services\IPrincipalService;
-use openid\model\IOpenIdUser;
-use openid\services\IUserService;
-use Session;
-use utils\Base64UrlRepresentation;
-use utils\services\IAuthService;
-use utils\services\ICacheService;
-
+use Exception;
 /**
  * Class AuthService
- * @package auth
+ * @package Auth
  */
 final class AuthService implements IAuthService
 {
@@ -28,7 +36,6 @@ final class AuthService implements IAuthService
      * @var IPrincipalService
      */
     private $principal_service;
-
     /**
      * @var IUserService
      */
@@ -38,20 +45,42 @@ final class AuthService implements IAuthService
      */
     private $cache_service;
 
+    /**
+     * @var IUserRepository
+     */
+    private $user_repository;
+
+    /**
+     * @var IMemberRepository
+     */
+    private $member_repository;
+
+    /**
+     * AuthService constructor.
+     * @param IMemberRepository $member_repository
+     * @param IUserRepository $user_repository
+     * @param IPrincipalService $principal_service
+     * @param IUserService $user_service
+     * @param ICacheService $cache_service
+     */
     public function __construct
     (
+        IMemberRepository $member_repository,
+        IUserRepository $user_repository,
         IPrincipalService $principal_service,
         IUserService $user_service,
         ICacheService $cache_service
     )
     {
+        $this->member_repository = $member_repository;
+        $this->user_repository   = $user_repository;
         $this->principal_service = $principal_service;
         $this->user_service      = $user_service;
         $this->cache_service     = $cache_service;
     }
 
     /**
-     * @return mixed
+     * @return bool
      */
     public function isUserLogged()
     {
@@ -67,9 +96,9 @@ final class AuthService implements IAuthService
     }
 
     /**
-     * @param $username
-     * @param $password
-     * @param $remember_me
+     * @param string $username
+     * @param string $password
+     * @param bool $remember_me
      * @return mixed
      */
     public function login($username, $password, $remember_me)
@@ -133,9 +162,7 @@ final class AuthService implements IAuthService
      */
     public function getUserByOpenId($openid)
     {
-        $user = User::where('identifier', '=', $openid)->first();
-
-        return $user;
+        return $this->user_repository->getByIdentifier($openid);
     }
 
     /**
@@ -144,10 +171,11 @@ final class AuthService implements IAuthService
      */
     public function getUserByUsername($username)
     {
-        $member = Member::where('Email', '=', $username)->first();
+        $member =  $this->member_repository->getByEmail($username);
+
         if (!is_null($member))
         {
-            $user = User::where('external_identifier', '=', $member->ID)->first();
+            $user = $this->user_repository->getByExternalId($member->ID);
 
             if(!$user)
             {
@@ -166,7 +194,7 @@ final class AuthService implements IAuthService
      */
     public function getUserById($id)
     {
-        return User::find($id);
+        return $this->user_repository->get($id);
     }
 
     // Authentication
@@ -202,6 +230,7 @@ final class AuthService implements IAuthService
     public function unwrapUserId($user_id)
     {
         $user = $this->getUserByExternalId($user_id);
+
         if(!is_null($user))
             return $user_id;
 
@@ -219,11 +248,9 @@ final class AuthService implements IAuthService
     {
        if($client->getSubjectType() === IClient::SubjectType_Public)
            return $user_id;
-       else
-       {
-           $wrapped_name = sprintf('%s:%s', $client->getClientId(), $user_id);
-           return $this->encrypt($wrapped_name);
-       }
+
+        $wrapped_name = sprintf('%s:%s', $client->getClientId(), $user_id);
+        return $this->encrypt($wrapped_name);
     }
 
     /**
@@ -251,10 +278,11 @@ final class AuthService implements IAuthService
      */
     public function getUserByExternalId($external_id)
     {
-        $member = Member::where('ID', '=', $external_id)->first();
+        $member = $this->member_repository->get($external_id);
+
         if (!is_null($member))
         {
-            $user = User::where('external_identifier', '=', $member->ID)->first();
+            $user = $this->user_repository->getByExternalId($member->ID);
 
             if(!$user)
             {
@@ -319,19 +347,19 @@ final class AuthService implements IAuthService
 
     /**
      * @param string $jti
-     * @throws \Exception
+     * @throws Exception
      */
     public function reloadSession($jti)
     {
         $session_id = $this->cache_service->getSingleValue($jti);
-        if(empty($session_id)) throw new \Exception('session not found!');
+        if(empty($session_id)) throw new Exception('session not found!');
         Session::setId(Crypt::decrypt($session_id));
         Session::start();
         if(!Auth::check())
         {
             $user_id      = $this->principal_service->get()->getUserId();
             $user         = $this->getUserById($user_id);
-            if(is_null($user)) throw new \Exception('user not found!');
+            if(is_null($user)) throw new Exception('user not found!');
             Auth::login($user);
         }
     }
diff --git a/app/libs/Auth/AuthenticationExtensionService.php b/app/libs/Auth/AuthenticationExtensionService.php
new file mode 100644
index 00000000..98976bc6
--- /dev/null
+++ b/app/libs/Auth/AuthenticationExtensionService.php
@@ -0,0 +1,45 @@
+<?php namespace Auth;
+/**
+* Copyright 2016 OpenStack Foundation
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+**/
+/**
+ * Class AuthenticationExtensionService
+ * @package Auth
+ */
+class AuthenticationExtensionService implements IAuthenticationExtensionService {
+
+    /**
+     * @var array
+     */
+    private $extensions;
+
+    public function __construct(){
+        $this->extensions = array();
+    }
+    /**
+     * @return array
+     */
+    public function getExtensions()
+    {
+        return $this->extensions;
+    }
+
+    /**
+     * @param IAuthenticationExtension $extension
+     * @return $this
+     */
+    public function addExtension(IAuthenticationExtension $extension)
+    {
+        array_push($this->extensions, $extension);
+        return $this;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/Auth/AuthenticationServiceProvider.php b/app/libs/Auth/AuthenticationServiceProvider.php
new file mode 100644
index 00000000..c505155e
--- /dev/null
+++ b/app/libs/Auth/AuthenticationServiceProvider.php
@@ -0,0 +1,45 @@
+<?php namespace Auth;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\ServiceProvider;
+use Utils\Services\UtilsServiceCatalog;
+/**
+ * Class AuthenticationServiceProvider
+ * @package auth
+ */
+final class AuthenticationServiceProvider extends ServiceProvider
+{
+
+    protected $defer = true;
+
+    public function boot()
+    {
+    }
+
+    public function register()
+    {
+        App::singleton(UtilsServiceCatalog::AuthenticationService, 'Auth\\AuthService');
+        App::singleton(\Auth\IAuthenticationExtensionService::class, 'Auth\\AuthenticationExtensionService');
+        App::singleton(\Auth\IUserNameGeneratorService::class, 'Auth\\UserNameGeneratorService');
+    }
+
+    public function provides()
+    {
+        return [
+            UtilsServiceCatalog::AuthenticationService,
+            \Auth\IAuthenticationExtensionService::class,
+            \Auth\IUserNameGeneratorService::class,
+        ];
+    }
+}
\ No newline at end of file
diff --git a/app/libs/auth/CustomAuthProvider.php b/app/libs/Auth/CustomAuthProvider.php
similarity index 79%
rename from app/libs/auth/CustomAuthProvider.php
rename to app/libs/Auth/CustomAuthProvider.php
index d7fa5c49..2bcdd029 100644
--- a/app/libs/auth/CustomAuthProvider.php
+++ b/app/libs/Auth/CustomAuthProvider.php
@@ -1,24 +1,37 @@
-<?php
-namespace auth;
-
-use auth\exceptions\AuthenticationException;
-use auth\exceptions\AuthenticationInvalidPasswordAttemptException;
-use auth\exceptions\AuthenticationLockedUserLoginAttempt;
-use auth\exceptions\UnverifiedEmailMemberException;
+<?php namespace Auth;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Auth\Exceptions\UnverifiedEmailMemberException;
+use Auth\Repositories\IMemberRepository;
+use Auth\Repositories\IUserRepository;
 use Exception;
-use Illuminate\Auth\UserInterface;
-use Illuminate\Auth\UserProviderInterface;
-use openid\services\IUserService;
-use utils\db\ITransactionService;
-use utils\services\ICheckPointService;
-use utils\services\ILogService;
-use Log;
+use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Contracts\Auth\UserProvider;
+use Illuminate\Support\Facades\Log;
+use OpenId\Services\IUserService;
+use Utils\Db\ITransactionService;
+use Utils\Services\ICheckPointService;
+use Utils\Services\ILogService;
+use Auth\Exceptions\AuthenticationException;
+use Auth\Exceptions\AuthenticationInvalidPasswordAttemptException;
+use Auth\Exceptions\AuthenticationLockedUserLoginAttempt;
+
 /**
  * Class CustomAuthProvider
  * Custom Authentication Provider against SS DB
- * @package auth
+ * @package Auth
  */
-class CustomAuthProvider implements UserProviderInterface
+class CustomAuthProvider implements UserProvider
 {
 
     /**
@@ -81,7 +94,7 @@ class CustomAuthProvider implements UserProviderInterface
     /**
      * Retrieve a user by their unique identifier.
      * @param  mixed $identifier
-     * @return \Illuminate\Auth\UserInterface|null
+     * @return \Illuminate\Contracts\Auth\Authenticatable|null
      */
     public function retrieveById($identifier)
     {
@@ -105,7 +118,7 @@ class CustomAuthProvider implements UserProviderInterface
     /**
      * Retrieve a user by the given credentials.
      * @param  array $credentials
-     * @return \Illuminate\Auth\UserInterface|null
+     * @return \Illuminate\Contracts\Auth\Authenticatable|null
      */
     public function retrieveByCredentials(array $credentials)
     {
@@ -177,10 +190,11 @@ class CustomAuthProvider implements UserProviderInterface
                 }
 
                 //update user fields
-                $user->last_login_date = gmdate("Y-m-d H:i:s", time());
+                $user->last_login_date      = gmdate("Y-m-d H:i:s", time());
                 $user->login_failed_attempt = 0;
-                $user->active = true;
-                $user->lock = false;
+                $user->active               = true;
+                $user->lock                 = false;
+
                 $user_repository->update($user);
                 $user->setMember($member);
 
@@ -190,8 +204,6 @@ class CustomAuthProvider implements UserProviderInterface
                 {
                     $auth_extension->process($user);
                 }
-
-
             }
             catch(UnverifiedEmailMemberException $ex1){
                 $checkpoint_service->trackException($ex1);
@@ -212,13 +224,12 @@ class CustomAuthProvider implements UserProviderInterface
 
 
     /**
-     * Validate a user against the given credentials.
-     * @param UserInterface $user
+     * @param Authenticatable $user
      * @param array $credentials
      * @return bool
-     * @throws exceptions\AuthenticationException
+     * @throws AuthenticationException
      */
-    public function validateCredentials(UserInterface $user, array $credentials)
+    public function validateCredentials(Authenticatable $user, array $credentials)
     {
         if (!isset($credentials['username']) || !isset($credentials['password'])) {
             throw new AuthenticationException("invalid crendentials");
@@ -249,7 +260,7 @@ class CustomAuthProvider implements UserProviderInterface
      * Retrieve a user by by their unique identifier and "remember me" token.
      * @param  mixed $identifier
      * @param  string $token
-     * @return \Illuminate\Auth\UserInterface|null
+     * @return \Illuminate\Contracts\Auth\Authenticatable|null
      */
     public function retrieveByToken($identifier, $token)
     {
@@ -258,11 +269,11 @@ class CustomAuthProvider implements UserProviderInterface
 
     /**
      * Update the "remember me" token for the given user in storage.
-     * @param  \Illuminate\Auth\UserInterface $user
+     * @param  Authenticatable $user
      * @param  string $token
      * @return void
      */
-    public function updateRememberToken(UserInterface $user, $token)
+    public function updateRememberToken(Authenticatable $user, $token)
     {
         $user->setAttribute($user->getRememberTokenName(), $token);
 
diff --git a/app/libs/Auth/Exceptions/AuthenticationException.php b/app/libs/Auth/Exceptions/AuthenticationException.php
new file mode 100644
index 00000000..163b9fa2
--- /dev/null
+++ b/app/libs/Auth/Exceptions/AuthenticationException.php
@@ -0,0 +1,27 @@
+<?php namespace Auth\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class AuthenticationException
+ * @package Auth\Exceptions
+ */
+class AuthenticationException extends Exception
+{
+
+    public function __construct($message = "")
+    {
+        $message = "Authentication Exception : " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/Auth/Exceptions/AuthenticationInvalidPasswordAttemptException.php b/app/libs/Auth/Exceptions/AuthenticationInvalidPasswordAttemptException.php
new file mode 100644
index 00000000..c14edbd6
--- /dev/null
+++ b/app/libs/Auth/Exceptions/AuthenticationInvalidPasswordAttemptException.php
@@ -0,0 +1,34 @@
+<?php namespace Auth\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class AuthenticationInvalidPasswordAttemptException
+ * @package Auth\Exceptions
+ */
+class AuthenticationInvalidPasswordAttemptException extends Exception
+{
+
+    private $identifier;
+
+    public function __construct($identifier,$message = "")
+    {
+        $message = "Invalid Password Attempt: " . $message;
+        $this->identifier = $identifier;
+        parent::__construct($message, 0, null);
+    }
+
+    public function getIdentifier(){
+        return $this->identifier;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/Auth/Exceptions/AuthenticationLockedUserLoginAttempt.php b/app/libs/Auth/Exceptions/AuthenticationLockedUserLoginAttempt.php
new file mode 100644
index 00000000..68dc6296
--- /dev/null
+++ b/app/libs/Auth/Exceptions/AuthenticationLockedUserLoginAttempt.php
@@ -0,0 +1,35 @@
+<?php namespace Auth\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class AuthenticationLockedUserLoginAttempt
+ * @package Auth\Exceptions
+ */
+class AuthenticationLockedUserLoginAttempt extends Exception
+{
+
+    private $identifier;
+
+    public function __construct($identifier,$message = "")
+    {
+        $message = "Locked User Login Attempt : " . $message;
+        $this->identifier = $identifier;
+        parent::__construct($message, 0, null);
+    }
+
+    public function getIdentifier(){
+        return $this->identifier;
+    }
+
+}
\ No newline at end of file
diff --git a/app/libs/auth/exceptions/UnverifiedEmailMemberException.php b/app/libs/Auth/Exceptions/UnverifiedEmailMemberException.php
similarity index 85%
rename from app/libs/auth/exceptions/UnverifiedEmailMemberException.php
rename to app/libs/Auth/Exceptions/UnverifiedEmailMemberException.php
index a26dc90a..f14e315e 100644
--- a/app/libs/auth/exceptions/UnverifiedEmailMemberException.php
+++ b/app/libs/Auth/Exceptions/UnverifiedEmailMemberException.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Auth\Exceptions;
 /**
  * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,14 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace auth\exceptions;
-
+use Exception;
 /**
  * Class UnverifiedEmailMemberException
- * @package auth\exceptions
+ * @package Auth\Exceptions
  */
-class UnverifiedEmailMemberException extends \Exception
+class UnverifiedEmailMemberException extends Exception
 {
     public function __construct($message = "")
     {
diff --git a/app/libs/Auth/IAuthenticationExtension.php b/app/libs/Auth/IAuthenticationExtension.php
new file mode 100644
index 00000000..7cc37ce7
--- /dev/null
+++ b/app/libs/Auth/IAuthenticationExtension.php
@@ -0,0 +1,25 @@
+<?php namespace Auth;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+/**
+ * Interface IAuthenticationExtension
+ * @package Auth
+ */
+interface IAuthenticationExtension {
+
+    /**
+     * @param User $user
+     * @return void
+     */
+    public function process(User $user);
+} 
\ No newline at end of file
diff --git a/app/libs/auth/IAuthenticationExtensionService.php b/app/libs/Auth/IAuthenticationExtensionService.php
similarity index 83%
rename from app/libs/auth/IAuthenticationExtensionService.php
rename to app/libs/Auth/IAuthenticationExtensionService.php
index 1c3d2884..fbf6d8e9 100644
--- a/app/libs/auth/IAuthenticationExtensionService.php
+++ b/app/libs/Auth/IAuthenticationExtensionService.php
@@ -1,10 +1,8 @@
-<?php
-
-namespace auth;
+<?php namespace Auth;
 
 /**
  * Interface IAuthenticationExtensionService
- * @package auth
+ * @package Auth
  */
 interface IAuthenticationExtensionService {
     /**
@@ -14,7 +12,7 @@ interface IAuthenticationExtensionService {
 
     /**
      * @param IAuthenticationExtension $extension
-     * @return bool
+     * @return $this
      */
     public function addExtension(IAuthenticationExtension $extension);
 } 
\ No newline at end of file
diff --git a/app/libs/auth/IUserNameGeneratorService.php b/app/libs/Auth/IUserNameGeneratorService.php
similarity index 85%
rename from app/libs/auth/IUserNameGeneratorService.php
rename to app/libs/Auth/IUserNameGeneratorService.php
index 383aa7b1..026c654a 100644
--- a/app/libs/auth/IUserNameGeneratorService.php
+++ b/app/libs/Auth/IUserNameGeneratorService.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Auth;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,20 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace auth;
-
+use Models\Member;
 /**
  * Interface IUserNameGeneratorService
- * @package auth
+ * @package Auth
  */
 interface IUserNameGeneratorService
 {
     /**
-     * @param \Member $member
+     * @param Member $member
      * @return string
      */
-    public function generate(\Member $member);
+    public function generate(Member $member);
 
     const USER_NAME_INVALID_CHAR_REPLACEMENT = '.';
 
diff --git a/app/libs/Auth/Repositories/IMemberRepository.php b/app/libs/Auth/Repositories/IMemberRepository.php
new file mode 100644
index 00000000..5b355abd
--- /dev/null
+++ b/app/libs/Auth/Repositories/IMemberRepository.php
@@ -0,0 +1,27 @@
+<?php namespace Auth\Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Models\Member;
+use Utils\Db\IBaseRepository;
+/**
+ * Interface IMemberRepository
+ * @package Auth\Repositories
+ */
+interface IMemberRepository extends IBaseRepository
+{
+    /**
+     * @param string $email
+     * @return Member
+     */
+    public function getByEmail($email);
+} 
\ No newline at end of file
diff --git a/app/libs/auth/IUserRepository.php b/app/libs/Auth/Repositories/IUserRepository.php
similarity index 57%
rename from app/libs/auth/IUserRepository.php
rename to app/libs/Auth/Repositories/IUserRepository.php
index 0f70c3b6..f60efe99 100644
--- a/app/libs/auth/IUserRepository.php
+++ b/app/libs/Auth/Repositories/IUserRepository.php
@@ -1,12 +1,21 @@
-<?php
-
-namespace auth;
-
-use utils\db\IBaseRepository;
+<?php namespace Auth\Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
+use Utils\Db\IBaseRepository;
 /**
  * Interface IUserRepository
- * @package auth
+ * @package Auth\Repositories
  */
 interface IUserRepository extends IBaseRepository
 {
diff --git a/app/libs/auth/User.php b/app/libs/Auth/User.php
similarity index 80%
rename from app/libs/auth/User.php
rename to app/libs/Auth/User.php
index 92412b1d..1652e243 100644
--- a/app/libs/auth/User.php
+++ b/app/libs/Auth/User.php
@@ -1,24 +1,34 @@
-<?php
-
-namespace auth;
-
-use Eloquent;
-use Illuminate\Auth\UserInterface;
-use Member;
-use oauth2\models\IApiScope;
-use oauth2\models\IApiScopeGroup;
-use oauth2\models\IOAuth2User;
-use openid\model\IOpenIdUser;
-use utils\exceptions\EntityNotFoundException;
-use utils\model\BaseModelEloquent;
-use utils\model\IEntity;
-
+<?php namespace Auth;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Models\Member;
+use OAuth2\Models\IApiScope;
+use OAuth2\Models\IApiScopeGroup;
+use OAuth2\Models\IOAuth2User;
+use OpenId\Models\IOpenIdUser;
+use Utils\Exceptions\EntityNotFoundException;
+use Utils\Model\BaseModelEloquent;
+use Utils\Model\IEntity;
+use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
+use Illuminate\Auth\Authenticatable;
 /**
  * Class User
- * @package auth
+ * @package Auth
  */
-class User extends BaseModelEloquent implements UserInterface, IOpenIdUser, IOAuth2User, IEntity
+class User extends BaseModelEloquent implements AuthenticatableContract, IOpenIdUser, IOAuth2User, IEntity
 {
+    use Authenticatable;
+
     protected $table = 'openid_users';
 
     /**
@@ -28,27 +38,27 @@ class User extends BaseModelEloquent implements UserInterface, IOpenIdUser, IOAu
 
     public function trusted_sites()
     {
-        return $this->hasMany("OpenIdTrustedSite", 'user_id');
+        return $this->hasMany("Models\OpenId\OpenIdTrustedSite", 'user_id');
     }
 
     public function access_tokens()
     {
-        return $this->hasMany('AccessToken', 'user_id');
+        return $this->hasMany('Models\OAuth2\AccessToken', 'user_id');
     }
 
     public function refresh_tokens()
     {
-        return $this->hasMany('RefreshToken', 'user_id');
+        return $this->hasMany('Models\OAuth2\RefreshToken', 'user_id');
     }
 
     public function consents()
     {
-        return $this->hasMany('UserConsent', 'user_id');
+        return $this->hasMany('Models\OAuth2\UserConsent', 'user_id');
     }
 
     public function clients()
     {
-        return $this->hasMany("Client", 'user_id');
+        return $this->hasMany("Models\OAuth2\Client", 'user_id');
     }
 
     public function getActions()
@@ -58,7 +68,7 @@ class User extends BaseModelEloquent implements UserInterface, IOpenIdUser, IOAu
 
     public function actions()
     {
-        return $this->hasMany("UserAction", 'user_id');
+        return $this->hasMany("Models\UserAction", 'user_id');
     }
 
     public function setMember($member)
@@ -224,7 +234,7 @@ class User extends BaseModelEloquent implements UserInterface, IOpenIdUser, IOAu
 
     public function managed_clients()
     {
-        return $this->belongsToMany('Client', 'oauth2_client_admin_users', 'user_id', 'oauth2_client_id');
+        return $this->belongsToMany('Models\OAuth2\Client', 'oauth2_client_admin_users', 'user_id', 'oauth2_client_id');
     }
 
     /**
@@ -257,7 +267,7 @@ class User extends BaseModelEloquent implements UserInterface, IOpenIdUser, IOAu
     public function isOpenstackIdAdmin()
     {
         $this->getAssociatedMember();
-        $group = $this->member->groups()->where('code', '=', IOpenIdUser::OpenstackIdServerAdminGroup)->first();
+        $group = $this->member->groups()->where('code', '=', IOpenIdUser::OpenStackIdServerAdminGroup)->first();
 
         return !is_null($group);
     }
@@ -363,7 +373,7 @@ class User extends BaseModelEloquent implements UserInterface, IOpenIdUser, IOAu
      */
     public function groups()
     {
-        return $this->belongsToMany('ApiScopeGroup','oauth2_api_scope_group_users','user_id', 'group_id');
+        return $this->belongsToMany('Models\OAuth2\ApiScopeGroup','oauth2_api_scope_group_users','user_id', 'group_id');
     }
 
     /**
diff --git a/app/libs/auth/UserNameGeneratorService.php b/app/libs/Auth/UserNameGeneratorService.php
similarity index 96%
rename from app/libs/auth/UserNameGeneratorService.php
rename to app/libs/Auth/UserNameGeneratorService.php
index bf71cdae..cdc9e0b0 100644
--- a/app/libs/auth/UserNameGeneratorService.php
+++ b/app/libs/Auth/UserNameGeneratorService.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Auth;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,12 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace auth;
-
+use Models\Member;
 /**
  * Class UserNameGeneratorService
- * @package auth
+ * @package Auth
  */
 final class UserNameGeneratorService implements IUserNameGeneratorService
 {
@@ -85,10 +83,10 @@ final class UserNameGeneratorService implements IUserNameGeneratorService
         return strtr($input, self::$convert_table);
     }
     /**
-     * @param \Member $member
+     * @param Member $member
      * @return string
      */
-    public function generate(\Member $member)
+    public function generate(Member $member)
     {
         $fname = self::normalizeChars($member->FirstName);
         $lname = self::normalizeChars($member->Surname);
@@ -99,7 +97,7 @@ final class UserNameGeneratorService implements IUserNameGeneratorService
             preg_replace('/[^\d\w_-]+/i', IUserNameGeneratorService::USER_NAME_INVALID_CHAR_REPLACEMENT, $lname)
         );
         //if all characters were replaced by a connector, then is not a latin character based user name
-        if(strlen($user_name) === substr_count($user_name,IUserNameGeneratorService::USER_NAME_CHAR_CONNECTOR))
+        if(strlen($user_name) === substr_count($user_name, IUserNameGeneratorService::USER_NAME_CHAR_CONNECTOR))
         {
             $email     = $member->Email;
             $email     = explode('@', $email);
diff --git a/app/commands/.gitkeep b/app/libs/OAuth2/.gitkeep
similarity index 100%
rename from app/commands/.gitkeep
rename to app/libs/OAuth2/.gitkeep
diff --git a/app/libs/oauth2/AddressClaim.php b/app/libs/OAuth2/AddressClaim.php
similarity index 95%
rename from app/libs/oauth2/AddressClaim.php
rename to app/libs/OAuth2/AddressClaim.php
index 7ceb16d2..0dcafda2 100644
--- a/app/libs/oauth2/AddressClaim.php
+++ b/app/libs/OAuth2/AddressClaim.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,13 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2;
-
 /**
  * Class AddressClaim
- * @package oauth2
- * http://openid.net/specs/openid-connect-core-1_0.html#AddressClaim
+ * @package OAuth2
+ * @see http://openid.net/specs/openid-connect-core-1_0.html#AddressClaim
  *
  * The Address Claim represents a physical mailing address. Implementations MAY return only a subset of the fields of an
  * address, depending upon the information available and the End-User's privacy preferences. For example, the country
diff --git a/app/libs/oauth2/BearerAccessTokenAuthorizationHeaderParser.php b/app/libs/OAuth2/BearerAccessTokenAuthorizationHeaderParser.php
similarity index 62%
rename from app/libs/oauth2/BearerAccessTokenAuthorizationHeaderParser.php
rename to app/libs/OAuth2/BearerAccessTokenAuthorizationHeaderParser.php
index d7a7edf7..10d98bc8 100644
--- a/app/libs/oauth2/BearerAccessTokenAuthorizationHeaderParser.php
+++ b/app/libs/OAuth2/BearerAccessTokenAuthorizationHeaderParser.php
@@ -1,24 +1,35 @@
-<?php
-
-namespace oauth2;
-
-use oauth2\exceptions\OAuth2MissingBearerAccessTokenException;
-
+<?php namespace OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\Exceptions\OAuth2MissingBearerAccessTokenException;
 /**
  * Class BearerAccessTokenAuthorizationHeaderParser
  * Parse
- * http://tools.ietf.org/html/rfc6750#section-2-1
- * @package oauth2
+ * @see http://tools.ietf.org/html/rfc6750#section-2-1
+ * @package OAuth2
  */
 class BearerAccessTokenAuthorizationHeaderParser
 {
-
+    /**
+     * @var BearerAccessTokenAuthorizationHeaderParser
+     */
     private static $instance = null;
 
-    private function __construct()
-    {
-    }
+    private function __construct(){}
 
+    /**
+     * @return null|BearerAccessTokenAuthorizationHeaderParser
+     */
     public static function getInstance()
     {
         if (self::$instance == null) {
@@ -30,7 +41,7 @@ class BearerAccessTokenAuthorizationHeaderParser
     /**
      * @param string $http_auth_header_value
      * @return string
-     * @throws exceptions\OAuth2MissingBearerAccessTokenException
+     * @throws OAuth2MissingBearerAccessTokenException
      */
     public function parse($http_auth_header_value)
     {
diff --git a/app/libs/oauth2/builders/IdTokenBuilder.php b/app/libs/OAuth2/Builders/IdTokenBuilder.php
similarity index 78%
rename from app/libs/oauth2/builders/IdTokenBuilder.php
rename to app/libs/OAuth2/Builders/IdTokenBuilder.php
index 7ceb259f..8eba4305 100644
--- a/app/libs/oauth2/builders/IdTokenBuilder.php
+++ b/app/libs/OAuth2/Builders/IdTokenBuilder.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Builders;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,24 +11,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\builders;
-
 use jwt\IBasicJWT;
 use jwt\impl\JWTClaimSet;
-use oauth2\models\IClient;
-use oauth2\models\JWTResponseInfo;
-
+use OAuth2\Models\IClient;
+use OAuth2\Models\JWTResponseInfo;
 /**
  * Interface IdTokenBuilder
- * @package oauth2\builders
+ * @package OAuth2\Builders
  */
 interface IdTokenBuilder
 {
     /**
-     * @param JWTClaimSet $claim_set
-     * @param JWTResponseInfo $info
-     * @param IClient $client
+     * @param  JWTClaimSet $claim_set
+     * @param  JWTResponseInfo $info
+     * @param  IClient $client
      * @return IBasicJWT
      */
     public function buildJWT(JWTClaimSet $claim_set, JWTResponseInfo $info, IClient $client);
diff --git a/app/libs/oauth2/discovery/DiscoveryDocumentBuilder.php b/app/libs/OAuth2/Discovery/DiscoveryDocumentBuilder.php
similarity index 99%
rename from app/libs/oauth2/discovery/DiscoveryDocumentBuilder.php
rename to app/libs/OAuth2/Discovery/DiscoveryDocumentBuilder.php
index 4b7a9c7d..b3bb69bf 100644
--- a/app/libs/oauth2/discovery/DiscoveryDocumentBuilder.php
+++ b/app/libs/OAuth2/Discovery/DiscoveryDocumentBuilder.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Discovery;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,11 +12,9 @@
  * limitations under the License.
  **/
 
-namespace oauth2\discovery;
-
 /**
  * Class DiscoveryDocumentBuilder
- * @package oauth2\discovery
+ * @package OAuth2\Discovery
  */
 final class DiscoveryDocumentBuilder
 {
diff --git a/app/libs/oauth2/discovery/IOpenIDProviderConfigurationService.php b/app/libs/OAuth2/Discovery/IOpenIDProviderConfigurationService.php
similarity index 95%
rename from app/libs/oauth2/discovery/IOpenIDProviderConfigurationService.php
rename to app/libs/OAuth2/Discovery/IOpenIDProviderConfigurationService.php
index 98064171..d33c1fad 100644
--- a/app/libs/oauth2/discovery/IOpenIDProviderConfigurationService.php
+++ b/app/libs/OAuth2/Discovery/IOpenIDProviderConfigurationService.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Discovery;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,11 +12,9 @@
  * limitations under the License.
  **/
 
-namespace oauth2\discovery;
-
 /**
  * Interface IOpenIDProviderConfigurationService
- * @package oauth2\discovery
+ * @package OAuth2\Discovery
  */
 interface IOpenIDProviderConfigurationService
 {
diff --git a/app/libs/oauth2/discovery/OpenIDProviderMetadata.php b/app/libs/OAuth2/Discovery/OpenIDProviderMetadata.php
similarity index 98%
rename from app/libs/oauth2/discovery/OpenIDProviderMetadata.php
rename to app/libs/OAuth2/Discovery/OpenIDProviderMetadata.php
index 7665cdad..7476cda7 100644
--- a/app/libs/oauth2/discovery/OpenIDProviderMetadata.php
+++ b/app/libs/OAuth2/Discovery/OpenIDProviderMetadata.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Discovery;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,12 +12,10 @@
  * limitations under the License.
  **/
 
-namespace oauth2\discovery;
-
 /**
  * Class OpenIDProviderMetadata
- * @package oauth2\discovery
- * http://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata
+ * @package OAuth2\Discovery
+ * @see http://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata
  */
 abstract class OpenIDProviderMetadata
 {
diff --git a/app/config/dev/.gitkeep b/app/libs/OAuth2/Endpoints/.gitkeep
similarity index 100%
rename from app/config/dev/.gitkeep
rename to app/libs/OAuth2/Endpoints/.gitkeep
diff --git a/app/libs/OAuth2/Endpoints/AuthorizationEndpoint.php b/app/libs/OAuth2/Endpoints/AuthorizationEndpoint.php
new file mode 100644
index 00000000..ac56a15d
--- /dev/null
+++ b/app/libs/OAuth2/Endpoints/AuthorizationEndpoint.php
@@ -0,0 +1,75 @@
+<?php namespace OAuth2\Endpoints;
+
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\Exceptions\AccessDeniedException;
+use OAuth2\Exceptions\InvalidClientException;
+use OAuth2\Exceptions\OAuth2GenericException;
+use OAuth2\Exceptions\ScopeNotAllowedException;
+use OAuth2\Exceptions\UnAuthorizedClientException;
+use OAuth2\Exceptions\UnsupportedResponseTypeException;
+use OAuth2\Exceptions\UriNotAllowedException;
+use OAuth2\Requests\OAuth2Request;
+use OAuth2\Exceptions\InvalidOAuth2Request;
+use OAuth2\IOAuth2Protocol;
+
+/**
+ * Class AuthorizationEndpoint
+ * Authorization Endpoint Implementation
+ * The authorization endpoint is used to interact with the resource
+ * owner and obtain an authorization grant.  The authorization server
+ * MUST first verify the identity of the resource owner.  The way in
+ * which the authorization server authenticates the resource owner
+ * (e.g., username and password login, session cookies) is beyond the
+ * scope of this specification.
+ * @see http://tools.ietf.org/html/rfc6749#section-3.1
+ * @package OAuth2\Endpoints
+ */
+class AuthorizationEndpoint implements IOAuth2Endpoint
+{
+
+    /**
+     * @var IOAuth2Protocol
+     */
+    private $protocol;
+
+    /**
+     * @param IOAuth2Protocol $protocol
+     */
+    public function __construct(IOAuth2Protocol $protocol)
+    {
+        $this->protocol = $protocol;
+    }
+
+    /**
+     * @param OAuth2Request $request
+     * @return mixed
+     * @throws InvalidOAuth2Request
+     * @throws InvalidClientException
+     * @throws UriNotAllowedException
+     * @throws ScopeNotAllowedException
+     * @throws UnsupportedResponseTypeException
+     * @throws UnAuthorizedClientException
+     * @throws AccessDeniedException
+     * @throws OAuth2GenericException
+     */
+    public function handle(OAuth2Request $request)
+    {
+        foreach($this->protocol->getAvailableGrants() as $key => $grant){
+            if($grant->canHandle($request))
+                return $grant->handle($request);
+        }
+        throw new InvalidOAuth2Request;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Endpoints/IOAuth2Endpoint.php b/app/libs/OAuth2/Endpoints/IOAuth2Endpoint.php
new file mode 100644
index 00000000..e01d2b02
--- /dev/null
+++ b/app/libs/OAuth2/Endpoints/IOAuth2Endpoint.php
@@ -0,0 +1,30 @@
+<?php namespace OAuth2\Endpoints;
+
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\Requests\OAuth2Request;
+use OAuth2\Responses\OAuth2Response;
+
+/**
+ * Interface IOAuth2Endpoint
+ * @package OAuth2\Endpoints
+ */
+interface IOAuth2Endpoint
+{
+    /**
+     * @param OAuth2Request $request
+     * @return OAuth2Response
+     */
+    public function handle(OAuth2Request $request);
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/endpoints/TokenEndpoint.php b/app/libs/OAuth2/Endpoints/TokenEndpoint.php
similarity index 57%
rename from app/libs/oauth2/endpoints/TokenEndpoint.php
rename to app/libs/OAuth2/Endpoints/TokenEndpoint.php
index e6a8138b..9bd7e842 100644
--- a/app/libs/oauth2/endpoints/TokenEndpoint.php
+++ b/app/libs/OAuth2/Endpoints/TokenEndpoint.php
@@ -1,11 +1,22 @@
-<?php
+<?php namespace OAuth2\Endpoints;
 
-namespace oauth2\endpoints;
-
-use oauth2\exceptions\InvalidGrantTypeException;
-use oauth2\IOAuth2Protocol;
-use oauth2\requests\OAuth2Request;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
+use OAuth2\Exceptions\InvalidGrantTypeException;
+use OAuth2\IOAuth2Protocol;
+use OAuth2\Requests\OAuth2Request;
+use OAuth2\Responses\OAuth2Response;
 
 /**
  * Class TokenEndpoint
@@ -14,8 +25,8 @@ use oauth2\requests\OAuth2Request;
  * presenting its authorization grant or refresh token.  The token
  * endpoint is used with every authorization grant except for the
  * implicit grant type (since an access token is issued directly).
- * http://tools.ietf.org/html/rfc6749#section-3.2
- * @package oauth2\endpoints
+ * @see http://tools.ietf.org/html/rfc6749#section-3.2
+ * @package OAuth2\Endpoints
  */
 class TokenEndpoint implements IOAuth2Endpoint
 {
@@ -35,7 +46,7 @@ class TokenEndpoint implements IOAuth2Endpoint
 
     /**
      * @param OAuth2Request $request
-     * @return mixed
+     * @return OAuth2Response
      * @throws InvalidGrantTypeException
      */
     public function handle(OAuth2Request $request)
diff --git a/app/libs/OAuth2/Endpoints/TokenIntrospectionEndpoint.php b/app/libs/OAuth2/Endpoints/TokenIntrospectionEndpoint.php
new file mode 100644
index 00000000..3820da00
--- /dev/null
+++ b/app/libs/OAuth2/Endpoints/TokenIntrospectionEndpoint.php
@@ -0,0 +1,89 @@
+<?php namespace OAuth2\Endpoints;
+
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\Exceptions\BearerTokenDisclosureAttemptException;
+use OAuth2\Exceptions\ExpiredAccessTokenException;
+use OAuth2\Exceptions\InvalidApplicationType;
+use OAuth2\Exceptions\LockedClientException;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Requests\OAuth2Request;
+use OAuth2\IOAuth2Protocol;
+use OAuth2\Responses\OAuth2Response;
+use OAuth2\Services\IClientService;
+use OAuth2\Services\ITokenService;
+use Utils\Services\IAuthService;
+use Utils\Services\ILogService;
+use OAuth2\GrantTypes\ValidateBearerTokenGrantType;
+use OAuth2\Exceptions\InvalidOAuth2Request;
+
+/**
+ * Class TokenIntrospectionEndpoint
+ * @package OAuth2\Endpoints
+ */
+class TokenIntrospectionEndpoint implements IOAuth2Endpoint
+{
+
+    /**
+     * @var IOAuth2Protocol
+     */
+    private $protocol;
+    /**
+     * @var ValidateBearerTokenGrantType
+     */
+    private $grant_type;
+
+    /**
+     * TokenIntrospectionEndpoint constructor.
+     * @param IOAuth2Protocol $protocol
+     * @param IClientService $client_service
+     * @param IClientRepository $client_repository
+     * @param ITokenService $token_service
+     * @param IAuthService $auth_service
+     * @param ILogService $log_service
+     */
+    public function __construct
+    (
+        IOAuth2Protocol $protocol,
+        IClientService $client_service,
+        IClientRepository $client_repository,
+        ITokenService $token_service,
+        IAuthService $auth_service,
+        ILogService $log_service
+    )
+    {
+        $this->protocol   = $protocol;
+        $this->grant_type = new ValidateBearerTokenGrantType($client_service, $client_repository, $token_service, $auth_service, $log_service);
+    }
+
+
+    /**
+     * @param OAuth2Request $request
+     * @return OAuth2Response
+     * @throws InvalidOAuth2Request
+     * @throws BearerTokenDisclosureAttemptException
+     * @throws ExpiredAccessTokenException
+     * @throws InvalidApplicationType
+     * @throws InvalidOAuth2Request
+     * @throws LockedClientException
+     */
+    public function handle(OAuth2Request $request)
+    {
+        if($this->grant_type->canHandle($request))
+        {
+            return $this->grant_type->completeFlow($request);
+        }
+        throw new InvalidOAuth2Request;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Endpoints/TokenRevocationEndpoint.php b/app/libs/OAuth2/Endpoints/TokenRevocationEndpoint.php
new file mode 100644
index 00000000..aa4ef5fb
--- /dev/null
+++ b/app/libs/OAuth2/Endpoints/TokenRevocationEndpoint.php
@@ -0,0 +1,84 @@
+<?php namespace OAuth2\Endpoints;
+
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\Exceptions\BearerTokenDisclosureAttemptException;
+use OAuth2\Exceptions\ExpiredAccessTokenException;
+use OAuth2\Exceptions\InvalidOAuth2Request;
+use OAuth2\Exceptions\UnAuthorizedClientException;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Requests\OAuth2Request;
+use OAuth2\IOAuth2Protocol;
+use OAuth2\Responses\OAuth2Response;
+use OAuth2\Services\IClientService;
+use OAuth2\Services\ITokenService;
+use Utils\Services\ILogService;
+use OAuth2\GrantTypes\RevokeBearerTokenGrantType;
+use Exception;
+
+/**
+ * Class TokenRevocationEndpoint
+ * @package OAuth2\Endpoints
+ */
+class TokenRevocationEndpoint implements IOAuth2Endpoint
+{
+
+    /**
+     * @var IOAuth2Protocol
+     */
+    private $protocol;
+    /**
+     * @var RevokeBearerTokenGrantType
+     */
+    private $grant_type;
+
+    /**
+     * TokenRevocationEndpoint constructor.
+     * @param IOAuth2Protocol $protocol
+     * @param IClientService $client_service
+     * @param IClientRepository $client_repository
+     * @param ITokenService $token_service
+     * @param ILogService $log_service
+     */
+    public function __construct
+    (
+        IOAuth2Protocol   $protocol,
+        IClientService    $client_service,
+        IClientRepository $client_repository,
+        ITokenService     $token_service,
+        ILogService       $log_service
+    )
+    {
+        $this->protocol   = $protocol;
+        $this->grant_type = new RevokeBearerTokenGrantType($client_service, $client_repository, $token_service, $log_service);
+    }
+
+    /**
+     * @param OAuth2Request $request
+     * @return OAuth2Response
+     * @throws InvalidOAuth2Request
+     * @throws Exception
+     * @throws BearerTokenDisclosureAttemptException
+     * @throws ExpiredAccessTokenException
+     * @throws UnAuthorizedClientException
+     */
+    public function handle(OAuth2Request $request)
+    {
+        if($this->grant_type->canHandle($request))
+        {
+            return $this->grant_type->completeFlow($request);
+        }
+        throw new InvalidOAuth2Request;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/AbsentClientException.php b/app/libs/OAuth2/Exceptions/AbsentClientException.php
new file mode 100644
index 00000000..e9f0988e
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/AbsentClientException.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class AbsentClientException
+ * @package OAuth2\Exceptions
+ */
+class AbsentClientException extends Exception
+{
+
+    public function __construct($message = "")
+    {
+        $message = "Absent Client Exception: " . $message;
+        parent::__construct($message, 0, null);
+    }
+
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/AbsentCurrentUserException.php b/app/libs/OAuth2/Exceptions/AbsentCurrentUserException.php
similarity index 88%
rename from app/libs/oauth2/exceptions/AbsentCurrentUserException.php
rename to app/libs/OAuth2/Exceptions/AbsentCurrentUserException.php
index 552087d1..ba85d2f8 100644
--- a/app/libs/oauth2/exceptions/AbsentCurrentUserException.php
+++ b/app/libs/OAuth2/Exceptions/AbsentCurrentUserException.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
 use Exception;
-
 /**
  * Class AbsentCurrentUserException
- * @package oauth2\exceptions
+ * @package OAuth2\Exceptions
  */
 class AbsentCurrentUserException extends Exception
 {
diff --git a/app/libs/OAuth2/Exceptions/AccessDeniedException.php b/app/libs/OAuth2/Exceptions/AccessDeniedException.php
new file mode 100644
index 00000000..be673bb8
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/AccessDeniedException.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class AccessDeniedException
+ * @package OAuth2\Exceptions
+ */
+final class AccessDeniedException extends OAuth2BaseException
+{
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_AccessDenied;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/AllowedClientUriAlreadyExistsException.php b/app/libs/OAuth2/Exceptions/AllowedClientUriAlreadyExistsException.php
new file mode 100644
index 00000000..811b4859
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/AllowedClientUriAlreadyExistsException.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class AllowedClientUriAlreadyExistsException
+ * @package OAuth2\Exceptions
+ */
+class AllowedClientUriAlreadyExistsException extends Exception
+{
+
+    public function __construct($message = "")
+    {
+        $message = "Allowed Client Uri Already Exists : " . $message;
+        parent::__construct($message, 0, null);
+    }
+
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/BearerTokenDisclosureAttemptException.php b/app/libs/OAuth2/Exceptions/BearerTokenDisclosureAttemptException.php
new file mode 100644
index 00000000..a1edd5be
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/BearerTokenDisclosureAttemptException.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class BearerTokenDisclosureAttemptException
+ * @package OAuth2\Exceptions
+ */
+final class BearerTokenDisclosureAttemptException extends OAuth2BaseException
+{
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return  OAuth2Protocol::OAuth2Protocol_Error_InvalidGrant;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/ConsentRequiredException.php b/app/libs/OAuth2/Exceptions/ConsentRequiredException.php
similarity index 80%
rename from app/libs/oauth2/exceptions/ConsentRequiredException.php
rename to app/libs/OAuth2/Exceptions/ConsentRequiredException.php
index efd9c2c1..758282a1 100644
--- a/app/libs/oauth2/exceptions/ConsentRequiredException.php
+++ b/app/libs/OAuth2/Exceptions/ConsentRequiredException.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,15 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
-use Exception;
-use oauth2\OAuth2Protocol;
-
+use OAuth2\OAuth2Protocol;
 /**
- * Class InteractionRequiredException
- * @package oauth2\exceptions
+ * Class ConsentRequiredException
+ * @package OAuth2\Exceptions
  */
 final class ConsentRequiredException extends OAuth2BaseException
 {
diff --git a/app/libs/oauth2/exceptions/ExpiredAccessTokenException.php b/app/libs/OAuth2/Exceptions/ExpiredAccessTokenException.php
similarity index 85%
rename from app/libs/oauth2/exceptions/ExpiredAccessTokenException.php
rename to app/libs/OAuth2/Exceptions/ExpiredAccessTokenException.php
index 839ef15c..7be3c876 100644
--- a/app/libs/oauth2/exceptions/ExpiredAccessTokenException.php
+++ b/app/libs/OAuth2/Exceptions/ExpiredAccessTokenException.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
+use OAuth2\OAuth2Protocol;
 /**
  * Class ExpiredAccessTokenException
- * @package oauth2\exceptions
+ * @package OAuth2\Exceptions
  */
 final class ExpiredAccessTokenException extends OAuth2BaseException
 {
diff --git a/app/libs/OAuth2/Exceptions/ExpiredAuthorizationCodeException.php b/app/libs/OAuth2/Exceptions/ExpiredAuthorizationCodeException.php
new file mode 100644
index 00000000..192520aa
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/ExpiredAuthorizationCodeException.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class ExpiredAuthorizationCodeException
+ * @package OAuth2\Exceptions
+ */
+final class ExpiredAuthorizationCodeException extends OAuth2BaseException
+{
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_InvalidRequest;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InteractionRequiredException.php b/app/libs/OAuth2/Exceptions/InteractionRequiredException.php
similarity index 85%
rename from app/libs/oauth2/exceptions/InteractionRequiredException.php
rename to app/libs/OAuth2/Exceptions/InteractionRequiredException.php
index b05c85e5..aacf76e9 100644
--- a/app/libs/oauth2/exceptions/InteractionRequiredException.php
+++ b/app/libs/OAuth2/Exceptions/InteractionRequiredException.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
+use OAuth2\OAuth2Protocol;
 /**
  * Class InteractionRequiredException
- * @package oauth2\exceptions
+ * @package OAuth2\Exceptions
  */
 final class InteractionRequiredException extends OAuth2BaseException
 {
diff --git a/app/libs/OAuth2/Exceptions/InvalidAccessTokenException.php b/app/libs/OAuth2/Exceptions/InvalidAccessTokenException.php
new file mode 100644
index 00000000..9c7da2f7
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/InvalidAccessTokenException.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class InvalidAccessTokenException
+ * @package OAuth2\Exceptions
+ */
+final class InvalidAccessTokenException extends OAuth2BaseException
+{
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_InvalidGrant;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/InvalidAllowedClientUriException.php b/app/libs/OAuth2/Exceptions/InvalidAllowedClientUriException.php
new file mode 100644
index 00000000..911aebd7
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/InvalidAllowedClientUriException.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+
+/**
+ * Class InvalidAllowedClientUriException
+ * @package OAuth2\Exceptions
+ */
+class InvalidAllowedClientUriException extends Exception {
+
+    public function __construct($message = "")
+    {
+        $message = "Invalid Allowed Client Uri : " . $message;
+        parent::__construct($message, 0, null);
+    }
+
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/InvalidApi.php b/app/libs/OAuth2/Exceptions/InvalidApi.php
new file mode 100644
index 00000000..7594b923
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/InvalidApi.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class InvalidApi
+ * @package OAuth2\Exceptions
+ */
+class InvalidApi extends Exception
+{
+
+    public function __construct($message = "")
+    {
+        $message = "Invalid Api : " . $message;
+        parent::__construct($message, 0, null);
+    }
+
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/InvalidApiEndpoint.php b/app/libs/OAuth2/Exceptions/InvalidApiEndpoint.php
new file mode 100644
index 00000000..94179820
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/InvalidApiEndpoint.php
@@ -0,0 +1,27 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class InvalidApiEndpoint
+ * @package OAuth2\Exceptions
+ */
+class InvalidApiEndpoint extends Exception
+{
+
+    public function __construct($message = "")
+    {
+        $message = "Invalid Api Endpoint : " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/InvalidApiScope.php b/app/libs/OAuth2/Exceptions/InvalidApiScope.php
new file mode 100644
index 00000000..b7eaf70d
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/InvalidApiScope.php
@@ -0,0 +1,27 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class InvalidApiScope
+ * @package OAuth2\Exceptions
+ */
+class InvalidApiScope extends Exception
+{
+
+    public function __construct($message = "")
+    {
+        $message = "Invalid Api Scope : " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidApiScopeGroup.php b/app/libs/OAuth2/Exceptions/InvalidApiScopeGroup.php
similarity index 77%
rename from app/libs/oauth2/exceptions/InvalidApiScopeGroup.php
rename to app/libs/OAuth2/Exceptions/InvalidApiScopeGroup.php
index 83cc57aa..65d65d90 100644
--- a/app/libs/oauth2/exceptions/InvalidApiScopeGroup.php
+++ b/app/libs/OAuth2/Exceptions/InvalidApiScopeGroup.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
+use Exception;
 /**
  * Class InvalidApiScopeGroup
- * @package oauth2\exceptions
+ * @package OAuth2\Exceptions
  */
-final class InvalidApiScopeGroup extends \Exception
+final class InvalidApiScopeGroup extends Exception
 {
 
 }
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/InvalidApplicationType.php b/app/libs/OAuth2/Exceptions/InvalidApplicationType.php
new file mode 100644
index 00000000..ca83f47a
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/InvalidApplicationType.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class InvalidApplicationType
+ * @package OAuth2\Exceptions
+ */
+final class InvalidApplicationType extends OAuth2BaseException
+{
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+       return OAuth2Protocol::OAuth2Protocol_Error_UnauthorizedClient;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidAuthenticationRequestException.php b/app/libs/OAuth2/Exceptions/InvalidAuthenticationRequestException.php
similarity index 90%
rename from app/libs/oauth2/exceptions/InvalidAuthenticationRequestException.php
rename to app/libs/OAuth2/Exceptions/InvalidAuthenticationRequestException.php
index 4ac10f1c..cc145577 100644
--- a/app/libs/oauth2/exceptions/InvalidAuthenticationRequestException.php
+++ b/app/libs/OAuth2/Exceptions/InvalidAuthenticationRequestException.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,15 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-
+use OAuth2\OAuth2Protocol;
 /**
  * Class InvalidAuthenticationRequestException
- * @package oauth2\exceptions
+ * @package OAuth2\Exceptions
  */
 final class InvalidAuthenticationRequestException extends OAuth2BaseException
 {
diff --git a/app/libs/OAuth2/Exceptions/InvalidAuthorizationCodeException.php b/app/libs/OAuth2/Exceptions/InvalidAuthorizationCodeException.php
new file mode 100644
index 00000000..02bdcd82
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/InvalidAuthorizationCodeException.php
@@ -0,0 +1,29 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class InvalidAuthorizationCodeException
+ * @package OAuth2\Exceptions
+ */
+final class InvalidAuthorizationCodeException extends OAuth2BaseException
+{
+
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_InvalidGrant;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/InvalidAuthorizationRequestException.php b/app/libs/OAuth2/Exceptions/InvalidAuthorizationRequestException.php
new file mode 100644
index 00000000..91f115ea
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/InvalidAuthorizationRequestException.php
@@ -0,0 +1,29 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+
+/**
+ * Class InvalidAuthorizationRequestException
+ * @package OAuth2\Exceptions
+ */
+class InvalidAuthorizationRequestException extends Exception
+{
+
+    public function __construct($message = "")
+    {
+        $message = "Invalid Authorization Request : " . $message;
+        parent::__construct($message, 0, null);
+    }
+
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidClientAssertionAlgorithmException.php b/app/libs/OAuth2/Exceptions/InvalidClientAssertionAlgorithmException.php
similarity index 93%
rename from app/libs/oauth2/exceptions/InvalidClientAssertionAlgorithmException.php
rename to app/libs/OAuth2/Exceptions/InvalidClientAssertionAlgorithmException.php
index ed790bcb..2dd8b871 100644
--- a/app/libs/oauth2/exceptions/InvalidClientAssertionAlgorithmException.php
+++ b/app/libs/OAuth2/Exceptions/InvalidClientAssertionAlgorithmException.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,14 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
 use Exception;
-
 /**
  * Class InvalidClientAssertionAlgorithmException
- * @package oauth2\exceptions
+ * @package OAuth2\Exceptions
  */
 final class InvalidClientAssertionAlgorithmException extends Exception
 {
diff --git a/app/libs/oauth2/exceptions/InvalidClientAssertionException.php b/app/libs/OAuth2/Exceptions/InvalidClientAssertionException.php
similarity index 93%
rename from app/libs/oauth2/exceptions/InvalidClientAssertionException.php
rename to app/libs/OAuth2/Exceptions/InvalidClientAssertionException.php
index 4f38af1c..20793a9f 100644
--- a/app/libs/oauth2/exceptions/InvalidClientAssertionException.php
+++ b/app/libs/OAuth2/Exceptions/InvalidClientAssertionException.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,14 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
 use Exception;
-
 /**
  * Class InvalidClientAssertionException
- * @package oauth2\exceptions
+ * @package OAuth2\Exceptions
  */
 final class InvalidClientAssertionException extends Exception
 {
diff --git a/app/libs/oauth2/exceptions/InvalidClientAssertionTypeException.php b/app/libs/OAuth2/Exceptions/InvalidClientAssertionTypeException.php
similarity index 93%
rename from app/libs/oauth2/exceptions/InvalidClientAssertionTypeException.php
rename to app/libs/OAuth2/Exceptions/InvalidClientAssertionTypeException.php
index fcd69f40..d9e47d7e 100644
--- a/app/libs/oauth2/exceptions/InvalidClientAssertionTypeException.php
+++ b/app/libs/OAuth2/Exceptions/InvalidClientAssertionTypeException.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,14 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
 use Exception;
-
 /**
  * Class InvalidClientAssertionTypeException
- * @package oauth2\exceptions
+ * @package OAuth2\Exceptions
  */
 final class InvalidClientAssertionTypeException extends Exception
 {
diff --git a/app/libs/oauth2/exceptions/InvalidClientAuthMethodException.php b/app/libs/OAuth2/Exceptions/InvalidClientAuthMethodException.php
similarity index 86%
rename from app/libs/oauth2/exceptions/InvalidClientAuthMethodException.php
rename to app/libs/OAuth2/Exceptions/InvalidClientAuthMethodException.php
index 1f3ac6fa..a7a92489 100644
--- a/app/libs/oauth2/exceptions/InvalidClientAuthMethodException.php
+++ b/app/libs/OAuth2/Exceptions/InvalidClientAuthMethodException.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
+use OAuth2\OAuth2Protocol;
 /**
  * Class InvalidClientAuthMethodException
- * @package oauth2\exceptions
+ * @package OAuth2\Exceptions
  */
 final class InvalidClientAuthMethodException extends OAuth2BaseException
 {
diff --git a/app/libs/oauth2/exceptions/InvalidClientAuthenticationContextException.php b/app/libs/OAuth2/Exceptions/InvalidClientAuthenticationContextException.php
similarity index 93%
rename from app/libs/oauth2/exceptions/InvalidClientAuthenticationContextException.php
rename to app/libs/OAuth2/Exceptions/InvalidClientAuthenticationContextException.php
index 82216276..d2385063 100644
--- a/app/libs/oauth2/exceptions/InvalidClientAuthenticationContextException.php
+++ b/app/libs/OAuth2/Exceptions/InvalidClientAuthenticationContextException.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,14 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
 use Exception;
-
 /**
  * Class InvalidClientAuthenticationContextException
- * @package oauth2\exceptions
+ * @package OAuth2\Exceptions
  */
 final class InvalidClientAuthenticationContextException extends Exception
 {
diff --git a/app/libs/oauth2/models/IPrincipal.php b/app/libs/OAuth2/Exceptions/InvalidClientCredentials.php
similarity index 67%
rename from app/libs/oauth2/models/IPrincipal.php
rename to app/libs/OAuth2/Exceptions/InvalidClientCredentials.php
index 00c53ceb..0146d459 100644
--- a/app/libs/oauth2/models/IPrincipal.php
+++ b/app/libs/OAuth2/Exceptions/InvalidClientCredentials.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,28 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\models;
-
+use OAuth2\OAuth2Protocol;
 /**
- * Interface IPrincipal
- * @package oauth2\models
+ * Class InvalidClientCredentials
+ * @package OAuth2\Exceptions
  */
-interface IPrincipal
+final class InvalidClientCredentials extends OAuth2BaseException
 {
     /**
-     * @return int
-     */
-    public function getAuthTime();
-
-    /**
-     * @return int
-     */
-    public function getUserId();
-
-    /**
-     * OP Browser state
      * @return string
      */
-    public function getOPBrowserState();
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_UnauthorizedClient;
+    }
 }
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/InvalidClientException.php b/app/libs/OAuth2/Exceptions/InvalidClientException.php
new file mode 100644
index 00000000..28e164a8
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/InvalidClientException.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class InvalidClientException
+ * @package OAuth2\Exceptions
+ */
+final class InvalidClientException extends OAuth2BaseException
+{
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_UnauthorizedClient;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/InvalidClientType.php b/app/libs/OAuth2/Exceptions/InvalidClientType.php
new file mode 100644
index 00000000..fa518de8
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/InvalidClientType.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class InvalidClientType
+ * @package OAuth2\Exceptions
+ */
+final class InvalidClientType extends OAuth2BaseException
+{
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_UnauthorizedClient;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/InvalidGrantTypeException.php b/app/libs/OAuth2/Exceptions/InvalidGrantTypeException.php
new file mode 100644
index 00000000..1e6cdc6c
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/InvalidGrantTypeException.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class InvalidGrantTypeException
+ * @package OAuth2\Exceptions
+ */
+final class InvalidGrantTypeException extends OAuth2BaseException
+{
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_InvalidGrant;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidLoginHint.php b/app/libs/OAuth2/Exceptions/InvalidLoginHint.php
similarity index 89%
rename from app/libs/oauth2/exceptions/InvalidLoginHint.php
rename to app/libs/OAuth2/Exceptions/InvalidLoginHint.php
index e20e9a18..8e304953 100644
--- a/app/libs/oauth2/exceptions/InvalidLoginHint.php
+++ b/app/libs/OAuth2/Exceptions/InvalidLoginHint.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,14 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-/***
+use OAuth2\OAuth2Protocol;
+/**
  * Class InvalidLoginHint
- * @package oauth2\exceptions
+ * @package OAuth2\Exceptions
  */
 final class InvalidLoginHint extends OAuth2BaseException
 {
diff --git a/app/libs/OAuth2/Exceptions/InvalidOAuth2Request.php b/app/libs/OAuth2/Exceptions/InvalidOAuth2Request.php
new file mode 100644
index 00000000..48d2f073
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/InvalidOAuth2Request.php
@@ -0,0 +1,30 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class InvalidOAuth2Request
+ * @package OAuth2\Exceptions
+ */
+final class InvalidOAuth2Request extends OAuth2BaseException
+{
+
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_InvalidRequest;
+    }
+
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/InvalidRedeemAuthCodeException.php b/app/libs/OAuth2/Exceptions/InvalidRedeemAuthCodeException.php
new file mode 100644
index 00000000..88833672
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/InvalidRedeemAuthCodeException.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class InvalidRedeemAuthCodeException
+ * @package OAuth2\Exceptions
+ */
+final class InvalidRedeemAuthCodeException extends OAuth2BaseException
+{
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_InvalidGrant;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/InvalidResourceServer.php b/app/libs/OAuth2/Exceptions/InvalidResourceServer.php
new file mode 100644
index 00000000..c39ac431
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/InvalidResourceServer.php
@@ -0,0 +1,30 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class InvalidResourceServer
+ * @package OAuth2\Exceptions
+ */
+class InvalidResourceServer extends Exception {
+
+    /**
+     * InvalidResourceServer constructor.
+     * @param string $message
+     */
+    public function __construct($message = "")
+    {
+        $message = "Invalid Resource Server : " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidTokenEndpointAuthMethodException.php b/app/libs/OAuth2/Exceptions/InvalidTokenEndpointAuthMethodException.php
similarity index 84%
rename from app/libs/oauth2/exceptions/InvalidTokenEndpointAuthMethodException.php
rename to app/libs/OAuth2/Exceptions/InvalidTokenEndpointAuthMethodException.php
index 0d84e414..d3efde3d 100644
--- a/app/libs/oauth2/exceptions/InvalidTokenEndpointAuthMethodException.php
+++ b/app/libs/OAuth2/Exceptions/InvalidTokenEndpointAuthMethodException.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,17 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
 use Exception;
-
 /**
  * Class InvalidTokenEndpointAuthMethodException
- * @package oauth2\exceptions
+ * @package OAuth2\Exceptions
  */
 final class InvalidTokenEndpointAuthMethodException extends Exception
 {
+    /**
+     * InvalidTokenEndpointAuthMethodException constructor.
+     * @param string $message
+     */
     public function __construct($message = "")
     {
         $message = "Invalid Token Endpoint Auth Method : " . $message;
diff --git a/app/libs/OAuth2/Exceptions/LockedClientException.php b/app/libs/OAuth2/Exceptions/LockedClientException.php
new file mode 100644
index 00000000..9d236e44
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/LockedClientException.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class LockedClientException
+ * @package OAuth2\Exceptions
+ */
+final class LockedClientException extends OAuth2BaseException
+{
+       /**
+     * @return string
+     */
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_UnauthorizedClient;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/LoginRequiredException.php b/app/libs/OAuth2/Exceptions/LoginRequiredException.php
similarity index 81%
rename from app/libs/oauth2/exceptions/LoginRequiredException.php
rename to app/libs/OAuth2/Exceptions/LoginRequiredException.php
index bec90d63..d8141f31 100644
--- a/app/libs/oauth2/exceptions/LoginRequiredException.php
+++ b/app/libs/OAuth2/Exceptions/LoginRequiredException.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
+use OAuth2\OAuth2Protocol;
 /**
- * Class InteractionRequiredException
- * @package oauth2\exceptions
+ * Class LoginRequiredException
+ * @package OAuth2\Exceptions
  */
 final class LoginRequiredException extends OAuth2BaseException
 {
diff --git a/app/libs/OAuth2/Exceptions/MissingClientAuthorizationInfo.php b/app/libs/OAuth2/Exceptions/MissingClientAuthorizationInfo.php
new file mode 100644
index 00000000..a39a7e38
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/MissingClientAuthorizationInfo.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class MissingClientAuthorizationInfo
+ * @package OAuth2\Exceptions
+ */
+final class MissingClientAuthorizationInfo extends OAuth2BaseException
+{
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_UnauthorizedClient;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/MissingClientIdParam.php b/app/libs/OAuth2/Exceptions/MissingClientIdParam.php
new file mode 100644
index 00000000..ec3f567a
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/MissingClientIdParam.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class MissingClientIdParam
+ * @package OAuth2\Exceptions
+ */
+final class MissingClientIdParam extends OAuth2BaseException
+{
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_UnauthorizedClient;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/OAuth2BaseException.php b/app/libs/OAuth2/Exceptions/OAuth2BaseException.php
similarity index 89%
rename from app/libs/oauth2/exceptions/OAuth2BaseException.php
rename to app/libs/OAuth2/Exceptions/OAuth2BaseException.php
index b875b50a..1dacd7fa 100644
--- a/app/libs/oauth2/exceptions/OAuth2BaseException.php
+++ b/app/libs/OAuth2/Exceptions/OAuth2BaseException.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
 use Exception;
-
 /**
  * Class OAuth2BaseException
- * @package oauth2\exceptions
+ * @package OAuth2\Exceptions
  */
 abstract class OAuth2BaseException extends Exception
 {
diff --git a/app/libs/OAuth2/Exceptions/OAuth2ClientBaseException.php b/app/libs/OAuth2/Exceptions/OAuth2ClientBaseException.php
new file mode 100644
index 00000000..3fc2468d
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/OAuth2ClientBaseException.php
@@ -0,0 +1,45 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class OAuth2ClientBaseException
+ * @package OAuth2\Exceptions
+ */
+class OAuth2ClientBaseException extends Exception
+{
+    /**
+     * @var string
+     */
+    protected $client_id;
+
+    /**
+     * OAuth2ClientBaseException constructor.
+     * @param string $client_id
+     * @param string $message
+     */
+    public function __construct($client_id, $message = "")
+    {
+        $this->client_id = $client_id;
+        $message = "OAuth2 Client Base Exception : " . $message;
+        parent::__construct($message, 0, null);
+    }
+
+    /**
+     * @return string
+     */
+    public function getClientId(){
+        return $this->client_id;
+    }
+
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/OAuth2GenericException.php b/app/libs/OAuth2/Exceptions/OAuth2GenericException.php
new file mode 100644
index 00000000..915a2cf7
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/OAuth2GenericException.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class OAuth2GenericException
+ * @package OAuth2\Exceptions
+ */
+final class OAuth2GenericException extends OAuth2BaseException
+{
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_ServerError;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/OAuth2MissingBearerAccessTokenException.php b/app/libs/OAuth2/Exceptions/OAuth2MissingBearerAccessTokenException.php
new file mode 100644
index 00000000..149837be
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/OAuth2MissingBearerAccessTokenException.php
@@ -0,0 +1,26 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class OAuth2MissingBearerAccessTokenException
+ * @package OAuth2\Exceptions
+ */
+class OAuth2MissingBearerAccessTokenException  extends Exception
+{
+    public function __construct($message = "")
+    {
+        $message = "Missing Bearer Access Token : " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/OAuth2ResourceServerException.php b/app/libs/OAuth2/Exceptions/OAuth2ResourceServerException.php
new file mode 100644
index 00000000..d4480fe6
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/OAuth2ResourceServerException.php
@@ -0,0 +1,94 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class OAuth2ResourceServerException
+ * @package OAuth2\Exceptions
+ */
+class OAuth2ResourceServerException extends Exception
+{
+
+    /**
+     * @var string
+     */
+    private $http_code;
+    /**
+     * @var int
+     */
+    private $error;
+    /**
+     * @var Exception
+     */
+    private $error_description;
+    /**
+     * @var null
+     */
+    private $scope;
+
+    /**
+     * @param string $http_code
+     * @param int $error
+     * @param string $error_description
+     * @param null|string $scope
+     */
+    public function __construct($http_code, $error,$error_description,$scope = null)
+    {
+        $this->http_code         = $http_code;
+        $this->error             = $error;
+        $this->error_description = $error_description;
+        $this->scope             = $scope;
+
+        $message = "Resource Server Exception : " . sprintf
+            (
+                'http code : %s  - error : %s - error description: %s',
+                $http_code,
+                $error,
+                $error_description
+            );
+
+        parent::__construct($message, 0, null);
+    }
+
+    /**
+     * @return int
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * @return string
+     */
+    public function getErrorDescription()
+    {
+        return $this->error_description;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getScope()
+    {
+        return $this->scope;
+    }
+
+    /**
+     * @return string
+     */
+    public function getHttpCode()
+    {
+        return $this->http_code;
+    }
+} 
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/RecipientKeyNotFoundException.php b/app/libs/OAuth2/Exceptions/RecipientKeyNotFoundException.php
similarity index 86%
rename from app/libs/oauth2/exceptions/RecipientKeyNotFoundException.php
rename to app/libs/OAuth2/Exceptions/RecipientKeyNotFoundException.php
index c87fd2bd..f8654462 100644
--- a/app/libs/oauth2/exceptions/RecipientKeyNotFoundException.php
+++ b/app/libs/OAuth2/Exceptions/RecipientKeyNotFoundException.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
+use OAuth2\OAuth2Protocol;
 /**
  * Class RecipientKeyNotFoundException
- * @package oauth2\exceptions
+ * @package OAuth2\Exceptions
  */
 final class RecipientKeyNotFoundException extends OAuth2BaseException
 {
diff --git a/app/libs/OAuth2/Exceptions/ReplayAttackAuthCodeException.php b/app/libs/OAuth2/Exceptions/ReplayAttackAuthCodeException.php
new file mode 100644
index 00000000..ba52182a
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/ReplayAttackAuthCodeException.php
@@ -0,0 +1,29 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+/**
+ * Class ReplayAttackAuthCodeException
+ * @package OAuth2\Exceptions
+ */
+final class ReplayAttackAuthCodeException extends ReplayAttackException
+{
+    /**
+     * ReplayAttackAuthCodeException constructor.
+     * @param null|string $auth_code
+     * @param null $description
+     */
+    public function __construct($auth_code, $description = null)
+    {
+        parent::__construct($auth_code, $description);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/ReplayAttackException.php b/app/libs/OAuth2/Exceptions/ReplayAttackException.php
new file mode 100644
index 00000000..d01836ec
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/ReplayAttackException.php
@@ -0,0 +1,50 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class ReplayAttackException
+ * @package OAuth2\Exceptions
+ */
+class ReplayAttackException extends OAuth2BaseException
+{
+    /**
+     * ReplayAttackException constructor.
+     * @param null|string $token
+     * @param null $description
+     */
+    public function __construct($token, $description = null)
+    {
+        $this->token = $token;
+        parent::__construct($description);
+    }
+    /**
+     * @var string
+     */
+    private $token;
+
+    /**
+     * @return string
+     */
+    public function getToken()
+    {
+        return $this->token;
+    }
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+       return OAuth2Protocol::OAuth2Protocol_Error_InvalidGrant;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/ReplayAttackRefreshTokenException.php b/app/libs/OAuth2/Exceptions/ReplayAttackRefreshTokenException.php
new file mode 100644
index 00000000..bb29cec8
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/ReplayAttackRefreshTokenException.php
@@ -0,0 +1,29 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+/**
+ * Class ReplayAttackRefreshTokenException
+ * @package OAuth2\Exceptions
+ */
+final class ReplayAttackRefreshTokenException extends ReplayAttackException
+{
+    /**
+     * ReplayAttackAuthCodeException constructor.
+     * @param null|string $refresh_token
+     * @param null $description
+     */
+    public function __construct($refresh_token, $description = null)
+    {
+        parent::__construct($refresh_token, $description);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/RevokedAccessTokenException.php b/app/libs/OAuth2/Exceptions/RevokedAccessTokenException.php
similarity index 85%
rename from app/libs/oauth2/exceptions/RevokedAccessTokenException.php
rename to app/libs/OAuth2/Exceptions/RevokedAccessTokenException.php
index 2c6233b2..e2d699d5 100644
--- a/app/libs/oauth2/exceptions/RevokedAccessTokenException.php
+++ b/app/libs/OAuth2/Exceptions/RevokedAccessTokenException.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
+use OAuth2\OAuth2Protocol;
 /**
  * Class RevokedAccessTokenException
- * @package oauth2\exceptions
+ * @package OAuth2\Exceptions
  */
 final class RevokedAccessTokenException extends OAuth2BaseException
 {
diff --git a/app/libs/oauth2/exceptions/RevokedRefreshTokenException.php b/app/libs/OAuth2/Exceptions/RevokedRefreshTokenException.php
similarity index 85%
rename from app/libs/oauth2/exceptions/RevokedRefreshTokenException.php
rename to app/libs/OAuth2/Exceptions/RevokedRefreshTokenException.php
index 85e0274d..6dab2d26 100644
--- a/app/libs/oauth2/exceptions/RevokedRefreshTokenException.php
+++ b/app/libs/OAuth2/Exceptions/RevokedRefreshTokenException.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
+use OAuth2\OAuth2Protocol;
 /**
  * Class RevokedRefreshTokenException
- * @package oauth2\exceptions
+ * @package OAuth2\Exceptions
  */
 class RevokedRefreshTokenException extends OAuth2BaseException
 {
diff --git a/app/libs/OAuth2/Exceptions/ScopeNotAllowedException.php b/app/libs/OAuth2/Exceptions/ScopeNotAllowedException.php
new file mode 100644
index 00000000..1439c6b3
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/ScopeNotAllowedException.php
@@ -0,0 +1,29 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class ScopeNotAllowedException
+ * @package OAuth2\Exceptions
+ */
+final class ScopeNotAllowedException extends OAuth2BaseException
+{
+
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_InvalidScope;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/ServerKeyNotFoundException.php b/app/libs/OAuth2/Exceptions/ServerKeyNotFoundException.php
similarity index 86%
rename from app/libs/oauth2/exceptions/ServerKeyNotFoundException.php
rename to app/libs/OAuth2/Exceptions/ServerKeyNotFoundException.php
index 5157755c..b2a8c51d 100644
--- a/app/libs/oauth2/exceptions/ServerKeyNotFoundException.php
+++ b/app/libs/OAuth2/Exceptions/ServerKeyNotFoundException.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Exceptions;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
+use OAuth2\OAuth2Protocol;
 /**
  * Class ServerKeyNotFoundException
- * @package oauth2\exceptions
+ * @package OAuth2\Exceptions
  */
 final class ServerKeyNotFoundException extends OAuth2BaseException
 {
diff --git a/app/libs/OAuth2/Exceptions/UnAuthorizedClientException.php b/app/libs/OAuth2/Exceptions/UnAuthorizedClientException.php
new file mode 100644
index 00000000..11266dc9
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/UnAuthorizedClientException.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class UnAuthorizedClientException
+ * @package OAuth2\Exceptions
+ */
+final class UnAuthorizedClientException extends OAuth2BaseException
+{
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_UnauthorizedClient;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/UnsupportedResponseTypeException.php b/app/libs/OAuth2/Exceptions/UnsupportedResponseTypeException.php
new file mode 100644
index 00000000..4c3bed41
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/UnsupportedResponseTypeException.php
@@ -0,0 +1,28 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class UnsupportedResponseTypeException
+ * @package OAuth2\Exceptions
+ */
+final class UnsupportedResponseTypeException extends OAuth2BaseException
+{
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_UnsupportedResponseType;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/UriNotAllowedException.php b/app/libs/OAuth2/Exceptions/UriNotAllowedException.php
new file mode 100644
index 00000000..d6e975c3
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/UriNotAllowedException.php
@@ -0,0 +1,32 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class UriNotAllowedException
+ * @package OAuth2\Exceptions
+ */
+class UriNotAllowedException extends OAuth2BaseException
+{
+
+    public function __construct($redirect_url = "")
+    {
+        $message = sprintf("The redirect URI in the request: %s did not match a registered redirect URI.",$redirect_url);
+        parent::__construct($message, 0, null);
+    }
+
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_RedirectUriMisMatch;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Exceptions/UseRefreshTokenException.php b/app/libs/OAuth2/Exceptions/UseRefreshTokenException.php
new file mode 100644
index 00000000..fcdf58bd
--- /dev/null
+++ b/app/libs/OAuth2/Exceptions/UseRefreshTokenException.php
@@ -0,0 +1,26 @@
+<?php namespace OAuth2\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
+/**
+ * Class UseRefreshTokenException
+ * @package OAuth2\Exceptions
+ */
+class UseRefreshTokenException extends OAuth2BaseException
+{
+
+    public function getError()
+    {
+        return OAuth2Protocol::OAuth2Protocol_Error_InvalidGrant;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/factories/IOAuth2ClientFactory.php b/app/libs/OAuth2/Factories/IOAuth2ClientFactory.php
similarity index 90%
rename from app/libs/oauth2/factories/IOAuth2ClientFactory.php
rename to app/libs/OAuth2/Factories/IOAuth2ClientFactory.php
index 6a776ba2..d1d38cb8 100644
--- a/app/libs/oauth2/factories/IOAuth2ClientFactory.php
+++ b/app/libs/OAuth2/Factories/IOAuth2ClientFactory.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Factories;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,14 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\factories;
-
-use oauth2\models\IClient;
-
+use OAuth2\Models\IClient;
 /**
  * Interface IOAuth2ClientFactory
- * @package oauth2\factories
+ * @package OAuth2\Factories
  */
 interface IOAuth2ClientFactory
 {
diff --git a/app/libs/oauth2/factories/OAuth2AccessTokenFragmentResponseFactory.php b/app/libs/OAuth2/Factories/OAuth2AccessTokenFragmentResponseFactory.php
similarity index 88%
rename from app/libs/oauth2/factories/OAuth2AccessTokenFragmentResponseFactory.php
rename to app/libs/OAuth2/Factories/OAuth2AccessTokenFragmentResponseFactory.php
index 559c7570..2a1434b0 100644
--- a/app/libs/oauth2/factories/OAuth2AccessTokenFragmentResponseFactory.php
+++ b/app/libs/OAuth2/Factories/OAuth2AccessTokenFragmentResponseFactory.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Factories;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,21 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\factories;
-
-use oauth2\exceptions\InvalidOAuth2Request;
-use oauth2\OAuth2Protocol;
-use oauth2\requests\OAuth2AuthenticationRequest;
-use oauth2\requests\OAuth2AuthorizationRequest;
-use oauth2\responses\OAuth2AccessTokenFragmentResponse;
-use oauth2\responses\OAuth2IDTokenFragmentResponse;
-use oauth2\services\ITokenService;
-use openid\model\IOpenIdUser;
-
+use OAuth2\Exceptions\InvalidOAuth2Request;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Requests\OAuth2AuthenticationRequest;
+use OAuth2\Requests\OAuth2AuthorizationRequest;
+use OAuth2\Responses\OAuth2AccessTokenFragmentResponse;
+use OAuth2\Responses\OAuth2IDTokenFragmentResponse;
+use OAuth2\Services\ITokenService;
+use OpenId\Models\IOpenIdUser;
 /**
  * Class OAuth2AccessTokenFragmentResponseFactory
- * @package oauth2\factories
+ * @package OAuth2\Factories
  */
 final class OAuth2AccessTokenFragmentResponseFactory
 {
diff --git a/app/libs/OAuth2/Factories/OAuth2AccessTokenResponseFactory.php b/app/libs/OAuth2/Factories/OAuth2AccessTokenResponseFactory.php
new file mode 100644
index 00000000..020d58a7
--- /dev/null
+++ b/app/libs/OAuth2/Factories/OAuth2AccessTokenResponseFactory.php
@@ -0,0 +1,130 @@
+<?php namespace OAuth2\Factories;
+
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\Exceptions\InvalidOAuth2Request;
+use OAuth2\Models\AuthorizationCode;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Requests\OAuth2AccessTokenRequestAuthCode;
+use OAuth2\Responses\OAuth2AccessTokenResponse;
+use OAuth2\Responses\OAuth2IdTokenResponse;
+use OAuth2\Services\ITokenService;
+
+/**
+ * Class OAuth2AccessTokenResponseFactory
+ * @package OAuth2\Factories
+ */
+final class OAuth2AccessTokenResponseFactory
+{
+
+    /**
+     * @param ITokenService $token_service
+     * @param AuthorizationCode $auth_code
+     * @param OAuth2AccessTokenRequestAuthCode $request
+     * @return null|OAuth2AccessTokenResponse|OAuth2IdTokenResponse
+     * @throws InvalidOAuth2Request
+     */
+    static public function build
+    (
+        ITokenService $token_service,
+        AuthorizationCode $auth_code,
+        OAuth2AccessTokenRequestAuthCode $request
+    )
+    {
+
+        if (self::authCodeWasIssuedForOIDC($auth_code)) {
+
+            $access_token = null;
+            $id_token = null;
+            $refresh_token = null;
+            $response_type = explode
+            (
+                OAuth2Protocol::OAuth2Protocol_ResponseType_Delimiter,
+                $auth_code->getResponseType()
+            );
+
+            $is_hybrid_flow = OAuth2Protocol::responseTypeBelongsToFlow
+            (
+                $response_type,
+                OAuth2Protocol::OAuth2Protocol_GrantType_Hybrid
+            );
+
+            if ($is_hybrid_flow) {
+
+                if (in_array(OAuth2Protocol::OAuth2Protocol_ResponseType_Token, $response_type)) {
+
+                    $access_token = $token_service->createAccessToken($auth_code, $request->getRedirectUri());
+                }
+
+                // check if should emmit id token
+
+                if (in_array(OAuth2Protocol::OAuth2Protocol_ResponseType_IdToken, $response_type)) {
+
+                    $id_token = $token_service->createIdToken
+                    (
+                        $auth_code->getNonce(),
+                        $auth_code->getClientId(),
+                        $access_token
+                    );
+                }
+
+                if (is_null($id_token) && is_null($access_token)) throw new InvalidOAuth2Request;
+            }
+            else
+            {
+                $access_token = $token_service->createAccessToken($auth_code, $request->getRedirectUri());
+
+                $id_token = $token_service->createIdToken
+                (
+                    $auth_code->getNonce(),
+                    $auth_code->getClientId(),
+                    $access_token
+                );
+            }
+
+            if (!is_null($access_token))
+                $refresh_token = $access_token->getRefreshToken();
+
+            return new OAuth2IdTokenResponse
+            (
+                is_null($access_token) ? null  : $access_token->getValue(),
+                is_null($access_token) ? null  : $access_token->getLifetime(),
+                is_null($id_token) ? null      : $id_token->toCompactSerialization(),
+                is_null($refresh_token) ? null : $refresh_token->getValue()
+            );
+        }
+        // normal oauth2.0 code flow
+
+        $access_token  = $token_service->createAccessToken($auth_code, $request->getRedirectUri());
+        $refresh_token = $access_token->getRefreshToken();
+
+        return new OAuth2AccessTokenResponse
+        (
+            $access_token->getValue(),
+            $access_token->getLifetime(),
+            is_null($refresh_token) ? null : $refresh_token->getValue()
+        );
+
+    }
+
+    /**
+     * @param AuthorizationCode $auth_code
+     * @return bool
+     */
+    static public function authCodeWasIssuedForOIDC(AuthorizationCode $auth_code)
+    {
+        return str_contains($auth_code->getScope(), OAuth2Protocol::OpenIdConnect_Scope);
+    }
+
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/factories/OAuth2AuthorizationRequestFactory.php b/app/libs/OAuth2/Factories/OAuth2AuthorizationRequestFactory.php
similarity index 77%
rename from app/libs/oauth2/factories/OAuth2AuthorizationRequestFactory.php
rename to app/libs/OAuth2/Factories/OAuth2AuthorizationRequestFactory.php
index df79e509..37f55b6b 100644
--- a/app/libs/oauth2/factories/OAuth2AuthorizationRequestFactory.php
+++ b/app/libs/OAuth2/Factories/OAuth2AuthorizationRequestFactory.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Factories;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,23 +11,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\factories;
-
-use oauth2\exceptions\InvalidAuthenticationRequestException;
-use oauth2\exceptions\InvalidAuthorizationRequestException;
-use oauth2\OAuth2Protocol;
-use oauth2\requests\OAuth2AuthenticationRequest;
-use oauth2\requests\OAuth2AuthorizationRequest;
-use oauth2\requests\OAuth2RequestMemento;
-use oauth2\OAuth2Message;
-use oauth2\services\IMementoOAuth2SerializerService;
-
+use OAuth2\Exceptions\InvalidAuthenticationRequestException;
+use OAuth2\Exceptions\InvalidAuthorizationRequestException;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Requests\OAuth2AuthenticationRequest;
+use OAuth2\Requests\OAuth2AuthorizationRequest;
+use OAuth2\OAuth2Message;
 /**
  * Class OAuth2AuthorizationRequestFactory
- * @package oauth2\factories
+ * @package OAuth2\Factories
  */
-
 final class OAuth2AuthorizationRequestFactory
 {
     /**
diff --git a/app/config/local/.gitkeep b/app/libs/OAuth2/GrantTypes/.gitkeep
similarity index 100%
rename from app/config/local/.gitkeep
rename to app/libs/OAuth2/GrantTypes/.gitkeep
diff --git a/app/libs/oauth2/grant_types/AbstractGrantType.php b/app/libs/OAuth2/GrantTypes/AbstractGrantType.php
similarity index 53%
rename from app/libs/oauth2/grant_types/AbstractGrantType.php
rename to app/libs/OAuth2/GrantTypes/AbstractGrantType.php
index e34416e1..0a925983 100644
--- a/app/libs/oauth2/grant_types/AbstractGrantType.php
+++ b/app/libs/OAuth2/GrantTypes/AbstractGrantType.php
@@ -1,22 +1,35 @@
-<?php
+<?php namespace OAuth2\GrantTypes;
 
-namespace oauth2\grant_types;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-use oauth2\exceptions\InvalidClientCredentials;
-use oauth2\exceptions\InvalidClientException;
-use oauth2\exceptions\LockedClientException;
-use oauth2\exceptions\MissingClientIdParam;
-use oauth2\models\ClientAuthenticationContext;
-use oauth2\models\IClient;
-use oauth2\requests\OAuth2Request;
-use oauth2\services\IClientService;
-use oauth2\services\ITokenService;
-use oauth2\strategies\ClientAuthContextValidatorFactory;
-use utils\services\ILogService;
+use OAuth2\Exceptions\InvalidClientCredentials;
+use OAuth2\Exceptions\InvalidClientException;
+use OAuth2\Exceptions\LockedClientException;
+use OAuth2\Exceptions\MissingClientIdParam;
+use OAuth2\Models\ClientAuthenticationContext;
+use OAuth2\Models\IClient;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Services\ITokenService;
+use OAuth2\Requests\OAuth2Request;
+use OAuth2\Responses\OAuth2Response;
+use OAuth2\Services\IClientService;
+use OAuth2\Strategies\ClientAuthContextValidatorFactory;
+use Utils\Services\ILogService;
 
 /**
  * Class AbstractGrantType
- * @package oauth2\grant_types
+ * @package OAuth2\GrantTypes
  */
 abstract class AbstractGrantType implements IGrantType
 {
@@ -44,28 +57,35 @@ abstract class AbstractGrantType implements IGrantType
      */
     protected $log_service;
 
+    /**
+     * @var IClientService
+     */
+    protected $client_repository;
 
     /**
+     * AbstractGrantType constructor.
      * @param IClientService $client_service
+     * @param IClientRepository $client_repository
      * @param ITokenService $token_service
      * @param ILogService $log_service
      */
     public function __construct
     (
-        IClientService                  $client_service,
-        ITokenService                   $token_service,
-        ILogService                     $log_service
-
+        IClientService     $client_service,
+        IClientRepository  $client_repository,
+        ITokenService      $token_service,
+        ILogService        $log_service
     )
     {
-        $this->client_service = $client_service;
-        $this->token_service = $token_service;
-        $this->log_service = $log_service;
+        $this->client_service    = $client_service;
+        $this->client_repository = $client_repository;
+        $this->token_service     = $token_service;
+        $this->log_service       = $log_service;
     }
 
     /**
      * @param OAuth2Request $request
-     * @return mixed|void
+     * @return OAuth2Response
      * @throws MissingClientIdParam
      * @throws InvalidClientCredentials
      * @throws InvalidClientException
@@ -76,9 +96,8 @@ abstract class AbstractGrantType implements IGrantType
         //get client credentials from request..
         $this->client_auth_context = $this->client_service->getCurrentClientAuthInfo();
 
-
         //retrieve client from storage..
-        $this->current_client = $this->client_service->getClientById($this->client_auth_context->getId());
+        $this->current_client      = $this->client_repository->getClientById($this->client_auth_context->getId());
 
         if (is_null($this->current_client))
             throw new InvalidClientException
diff --git a/app/libs/oauth2/grant_types/AuthorizationCodeGrantType.php b/app/libs/OAuth2/GrantTypes/AuthorizationCodeGrantType.php
similarity index 79%
rename from app/libs/oauth2/grant_types/AuthorizationCodeGrantType.php
rename to app/libs/OAuth2/GrantTypes/AuthorizationCodeGrantType.php
index 1836276b..8234f4dc 100644
--- a/app/libs/oauth2/grant_types/AuthorizationCodeGrantType.php
+++ b/app/libs/OAuth2/GrantTypes/AuthorizationCodeGrantType.php
@@ -1,50 +1,52 @@
-<?php
+<?php namespace OAuth2\GrantTypes;
 
-namespace oauth2\grant_types;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
 use Exception;
-use oauth2\exceptions\AccessDeniedException;
-use oauth2\exceptions\InvalidApplicationType;
-use oauth2\exceptions\InvalidAuthorizationCodeException;
-use oauth2\exceptions\InvalidClientException;
-use oauth2\exceptions\InvalidClientType;
-use oauth2\exceptions\InvalidLoginHint;
-use oauth2\exceptions\InvalidOAuth2Request;
-use oauth2\exceptions\InvalidRedeemAuthCodeException;
-use oauth2\exceptions\LockedClientException;
-use oauth2\exceptions\OAuth2GenericException;
-use oauth2\exceptions\ScopeNotAllowedException;
-use oauth2\exceptions\UnsupportedResponseTypeException;
-use oauth2\exceptions\UriNotAllowedException;
-use oauth2\factories\OAuth2AccessTokenResponseFactory;
-use oauth2\models\AuthorizationCode;
-use oauth2\models\IClient;
-use oauth2\OAuth2Protocol;
-use oauth2\repositories\IServerPrivateKeyRepository;
-use oauth2\requests\OAuth2AccessTokenRequestAuthCode;
-use oauth2\requests\OAuth2AuthenticationRequest;
-use oauth2\requests\OAuth2AuthorizationRequest;
-use oauth2\requests\OAuth2Request;
-use oauth2\requests\OAuth2TokenRequest;
-use oauth2\responses\OAuth2AccessTokenResponse;
-use oauth2\responses\OAuth2AuthorizationResponse;
-use oauth2\responses\OAuth2IdTokenResponse;
-use oauth2\responses\OAuth2Response;
-use oauth2\services\IApiScopeService;
-use oauth2\services\IClientJWKSetReader;
-use oauth2\services\IClientService;
-use oauth2\services\IMementoOAuth2SerializerService;
-use oauth2\services\IPrincipalService;
-use oauth2\services\ISecurityContextService;
-use oauth2\services\ITokenService;
-use oauth2\services\IUserConsentService;
-use oauth2\strategies\IOAuth2AuthenticationStrategy;
-use openid\model\IOpenIdUser;
-use utils\services\IAuthService;
-use utils\services\ILogService;
-use oauth2\exceptions\InteractionRequiredException;
-use oauth2\exceptions\LoginRequiredException;
-use oauth2\exceptions\ConsentRequiredException;
+use OAuth2\Exceptions\ExpiredAuthorizationCodeException;
+use OAuth2\Exceptions\InvalidApplicationType;
+use OAuth2\Exceptions\InvalidAuthorizationCodeException;
+use OAuth2\Exceptions\InvalidClientException;
+use OAuth2\Exceptions\InvalidClientType;
+use OAuth2\Exceptions\InvalidOAuth2Request;
+use OAuth2\Exceptions\InvalidRedeemAuthCodeException;
+use OAuth2\Exceptions\OAuth2GenericException;
+use OAuth2\Exceptions\UnAuthorizedClientException;
+use OAuth2\Exceptions\UriNotAllowedException;
+use OAuth2\Factories\OAuth2AccessTokenResponseFactory;
+use OAuth2\Models\IClient;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Services\ITokenService;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Repositories\IServerPrivateKeyRepository;
+use OAuth2\Requests\OAuth2AccessTokenRequestAuthCode;
+use OAuth2\Requests\OAuth2AuthenticationRequest;
+use OAuth2\Requests\OAuth2AuthorizationRequest;
+use OAuth2\Requests\OAuth2Request;
+use OAuth2\Requests\OAuth2TokenRequest;
+use OAuth2\Responses\OAuth2AccessTokenResponse;
+use OAuth2\Responses\OAuth2AuthorizationResponse;
+use OAuth2\Services\IApiScopeService;
+use OAuth2\Services\IClientJWKSetReader;
+use OAuth2\Services\IClientService;
+use OAuth2\Services\IMementoOAuth2SerializerService;
+use OAuth2\Services\IPrincipalService;
+use OAuth2\Services\ISecurityContextService;
+use OAuth2\Services\IUserConsentService;
+use OAuth2\Strategies\IOAuth2AuthenticationStrategy;
+use Utils\Services\IAuthService;
+use Utils\Services\ILogService;
 
 /**
  * Class AuthorizationCodeGrantType
@@ -55,15 +57,17 @@ use oauth2\exceptions\ConsentRequiredException;
  * interacting with the resource owner's user-agent (typically a web
  * browser) and capable of receiving incoming requests (via redirection)
  * from the authorization server.
- * http://tools.ietf.org/html/rfc6749#section-4.1
- * @package oauth2\grant_types
+ * @see http://tools.ietf.org/html/rfc6749#section-4.1
+ * @package OAuth2\GrantTypes
  */
 class AuthorizationCodeGrantType extends InteractiveGrantType
 {
 
     /**
+     * AuthorizationCodeGrantType constructor.
      * @param IApiScopeService $scope_service
      * @param IClientService $client_service
+     * @param IClientRepository $client_repository
      * @param ITokenService $token_service
      * @param IAuthService $auth_service
      * @param IOAuth2AuthenticationStrategy $auth_strategy
@@ -79,6 +83,7 @@ class AuthorizationCodeGrantType extends InteractiveGrantType
     (
         IApiScopeService                $scope_service,
         IClientService                  $client_service,
+        IClientRepository               $client_repository,
         ITokenService                   $token_service,
         IAuthService                    $auth_service,
         IOAuth2AuthenticationStrategy   $auth_strategy,
@@ -95,6 +100,7 @@ class AuthorizationCodeGrantType extends InteractiveGrantType
         parent::__construct
         (
             $client_service,
+            $client_repository,
             $token_service,
             $log_service,
             $security_context_service,
@@ -159,16 +165,16 @@ class AuthorizationCodeGrantType extends InteractiveGrantType
 
     /**
      * Implements last request processing for Authorization code (Access Token Request processing)
-     * http://tools.ietf.org/html/rfc6749#section-4.1.3 and
-     * http://tools.ietf.org/html/rfc6749#section-4.1.4
+     * @see http://tools.ietf.org/html/rfc6749#section-4.1.3 and
+     * @see http://tools.ietf.org/html/rfc6749#section-4.1.4
      * @param OAuth2Request $request
      * @return OAuth2AccessTokenResponse
-     * @throws \oauth2\exceptions\InvalidAuthorizationCodeException
-     * @throws \oauth2\exceptions\ExpiredAuthorizationCodeException
-     * @throws \Exception
-     * @throws \oauth2\exceptions\InvalidClientException
-     * @throws \oauth2\exceptions\UnAuthorizedClientException
-     * @throws \oauth2\exceptions\UriNotAllowedException
+     * @throws InvalidAuthorizationCodeException
+     * @throws ExpiredAuthorizationCodeException
+     * @throws Exception
+     * @throws InvalidClientException
+     * @throws UnAuthorizedClientException
+     * @throws UriNotAllowedException
      */
     public function completeFlow(OAuth2Request $request)
     {
@@ -327,7 +333,6 @@ class AuthorizationCodeGrantType extends InteractiveGrantType
     protected function buildResponse(OAuth2AuthorizationRequest $request, $has_former_consent)
     {
         $user   = $this->auth_service->getCurrentUser();
-        $client = $this->client_service->getClientById($request->getClientId());
 
         // build current audience ...
         $audience = $this->scope_service->getStrAudienceByScopeNames
diff --git a/app/libs/oauth2/grant_types/ClientCredentialsGrantType.php b/app/libs/OAuth2/GrantTypes/ClientCredentialsGrantType.php
similarity index 64%
rename from app/libs/oauth2/grant_types/ClientCredentialsGrantType.php
rename to app/libs/OAuth2/GrantTypes/ClientCredentialsGrantType.php
index 3b874f6f..266dc832 100644
--- a/app/libs/oauth2/grant_types/ClientCredentialsGrantType.php
+++ b/app/libs/OAuth2/GrantTypes/ClientCredentialsGrantType.php
@@ -1,21 +1,34 @@
-<?php
+<?php namespace OAuth2\GrantTypes;
 
-namespace oauth2\grant_types;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-use oauth2\exceptions\InvalidApplicationType;
-use oauth2\exceptions\InvalidGrantTypeException;
-use oauth2\exceptions\InvalidOAuth2Request;
-use oauth2\exceptions\ScopeNotAllowedException;
-use oauth2\models\IClient;
-use oauth2\OAuth2Protocol;
-use oauth2\requests\OAuth2AccessTokenRequestClientCredentials;
-use oauth2\requests\OAuth2Request;
-use oauth2\requests\OAuth2TokenRequest;
-use oauth2\responses\OAuth2AccessTokenResponse;
-use oauth2\services\IApiScopeService;
-use oauth2\services\IClientService;
-use oauth2\services\ITokenService;
-use utils\services\ILogService;
+use OAuth2\Exceptions\InvalidApplicationType;
+use OAuth2\Exceptions\InvalidGrantTypeException;
+use OAuth2\Exceptions\InvalidOAuth2Request;
+use OAuth2\Exceptions\ScopeNotAllowedException;
+use OAuth2\Models\IClient;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Requests\OAuth2AccessTokenRequestClientCredentials;
+use OAuth2\Requests\OAuth2Request;
+use OAuth2\Requests\OAuth2TokenRequest;
+use OAuth2\Responses\OAuth2AccessTokenResponse;
+use OAuth2\Responses\OAuth2Response;
+use OAuth2\Services\IApiScopeService;
+use OAuth2\Services\IClientService;
+use OAuth2\Services\ITokenService;
+use Utils\Services\ILogService;
 
 /**
  * Class ClientCredentialsGrantType
@@ -25,8 +38,8 @@ use utils\services\ILogService;
  * control, or those of another resource owner that have been previously
  * arranged with the authorization server (the method of which is beyond
  * the scope of this specification).
- * http://tools.ietf.org/html/rfc6749#section-4.4
- * @package oauth2\grant_types
+ * @see http://tools.ietf.org/html/rfc6749#section-4.4
+ * @package OAuth2\GrantTypes
  */
 class ClientCredentialsGrantType extends AbstractGrantType
 {
@@ -37,20 +50,23 @@ class ClientCredentialsGrantType extends AbstractGrantType
     private $scope_service;
 
     /**
+     * ClientCredentialsGrantType constructor.
      * @param IApiScopeService $scope_service
      * @param IClientService $client_service
+     * @param IClientRepository $client_repository
      * @param ITokenService $token_service
      * @param ILogService $log_service
      */
     public function __construct
     (
-        IApiScopeService $scope_service,
-        IClientService   $client_service,
-        ITokenService    $token_service,
-        ILogService      $log_service
+        IApiScopeService  $scope_service,
+        IClientService    $client_service,
+        IClientRepository $client_repository,
+        ITokenService     $token_service,
+        ILogService       $log_service
     )
     {
-        parent::__construct($client_service, $token_service, $log_service);
+        parent::__construct($client_service, $client_repository, $token_service, $log_service);
 
         $this->scope_service = $scope_service;
     }
@@ -64,11 +80,10 @@ class ClientCredentialsGrantType extends AbstractGrantType
         return $request instanceof OAuth2TokenRequest && $request->isValid() && $request->getGrantType() == $this->getType();
     }
 
-
     /**
      * get grant type response type
-     * @return mixed|void
-     * @throws \oauth2\exceptions\InvalidOAuth2Request
+     * @return array
+     * @throws InvalidOAuth2Request
      */
     public function getResponseType()
     {
@@ -77,8 +92,8 @@ class ClientCredentialsGrantType extends AbstractGrantType
 
     /**
      * @param OAuth2Request $request
-     * @return mixed|void
-     * @throws \oauth2\exceptions\InvalidOAuth2Request
+     * @return OAuth2Response
+     * @throws InvalidOAuth2Request
      */
     public function handle(OAuth2Request $request)
     {
@@ -87,11 +102,11 @@ class ClientCredentialsGrantType extends AbstractGrantType
 
     /**
      * @param OAuth2Request $request
-     * @return mixed|OAuth2AccessTokenResponse|void
-     * @throws \oauth2\exceptions\ScopeNotAllowedException
-     * @throws \oauth2\exceptions\InvalidOAuth2Request
-     * @throws \oauth2\exceptions\InvalidApplicationType
-     * @throws \oauth2\exceptions\InvalidGrantTypeException
+     * @return OAuth2Response
+     * @throws ScopeNotAllowedException
+     * @throws InvalidOAuth2Request
+     * @throws InvalidApplicationType
+     * @throws InvalidGrantTypeException
      */
     public function completeFlow(OAuth2Request $request)
     {
@@ -157,7 +172,7 @@ class ClientCredentialsGrantType extends AbstractGrantType
 
     /**
      * get grant type
-     * @return mixed
+     * @return string
      */
     public function getType()
     {
diff --git a/app/libs/oauth2/grant_types/HybridGrantType.php b/app/libs/OAuth2/GrantTypes/HybridGrantType.php
similarity index 83%
rename from app/libs/oauth2/grant_types/HybridGrantType.php
rename to app/libs/OAuth2/GrantTypes/HybridGrantType.php
index 70ed0abc..c986c575 100644
--- a/app/libs/oauth2/grant_types/HybridGrantType.php
+++ b/app/libs/OAuth2/GrantTypes/HybridGrantType.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\GrantTypes;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,40 +13,43 @@
  * limitations under the License.
  **/
 
-namespace oauth2\grant_types;
-
-use oauth2\exceptions\InvalidApplicationType;
-use oauth2\exceptions\InvalidClientType;
-use oauth2\exceptions\InvalidOAuth2Request;
-use oauth2\models\IClient;
-use oauth2\OAuth2Protocol;
-use oauth2\repositories\IServerPrivateKeyRepository;
-use oauth2\requests\OAuth2AuthenticationRequest;
-use oauth2\requests\OAuth2AuthorizationRequest;
-use oauth2\requests\OAuth2Request;
-use oauth2\responses\OAuth2HybridTokenFragmentResponse;
-use oauth2\services\IApiScopeService;
-use oauth2\services\IClientJWKSetReader;
-use oauth2\services\IClientService;
-use oauth2\services\IMementoOAuth2SerializerService;
-use oauth2\services\IPrincipalService;
-use oauth2\services\ISecurityContextService;
-use oauth2\services\ITokenService;
-use oauth2\services\IUserConsentService;
-use oauth2\strategies\IOAuth2AuthenticationStrategy;
-use utils\services\IAuthService;
-use utils\services\ILogService;
+use OAuth2\Exceptions\InvalidApplicationType;
+use OAuth2\Exceptions\InvalidClientType;
+use OAuth2\Exceptions\InvalidOAuth2Request;
+use OAuth2\Exceptions\OAuth2GenericException;
+use OAuth2\Models\IClient;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Services\ITokenService;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Repositories\IServerPrivateKeyRepository;
+use OAuth2\Requests\OAuth2AuthenticationRequest;
+use OAuth2\Requests\OAuth2AuthorizationRequest;
+use OAuth2\Requests\OAuth2Request;
+use OAuth2\Responses\OAuth2HybridTokenFragmentResponse;
+use OAuth2\Responses\OAuth2Response;
+use OAuth2\Services\IApiScopeService;
+use OAuth2\Services\IClientJWKSetReader;
+use OAuth2\Services\IClientService;
+use OAuth2\Services\IMementoOAuth2SerializerService;
+use OAuth2\Services\IPrincipalService;
+use OAuth2\Services\ISecurityContextService;
+use OAuth2\Services\IUserConsentService;
+use OAuth2\Strategies\IOAuth2AuthenticationStrategy;
+use Utils\Services\IAuthService;
+use Utils\Services\ILogService;
 
 /**
  * Class HybridGrantType
- * @package oauth2\grant_types
+ * @package OAuth2\GrantTypes
  */
 class HybridGrantType extends InteractiveGrantType
 {
 
     /**
+     * HybridGrantType constructor.
      * @param IApiScopeService $scope_service
      * @param IClientService $client_service
+     * @param IClientRepository $client_repository
      * @param ITokenService $token_service
      * @param IAuthService $auth_service
      * @param IOAuth2AuthenticationStrategy $auth_strategy
@@ -61,6 +65,7 @@ class HybridGrantType extends InteractiveGrantType
     (
         IApiScopeService                $scope_service,
         IClientService                  $client_service,
+        IClientRepository               $client_repository,
         ITokenService                   $token_service,
         IAuthService                    $auth_service,
         IOAuth2AuthenticationStrategy   $auth_strategy,
@@ -76,6 +81,7 @@ class HybridGrantType extends InteractiveGrantType
         parent::__construct
         (
             $client_service,
+            $client_repository,
             $token_service,
             $log_service,
             $security_context_service,
@@ -110,7 +116,7 @@ class HybridGrantType extends InteractiveGrantType
 
     /**
      * get grant type
-     * @return mixed
+     * @return string
      */
     public function getType()
     {
@@ -126,9 +132,10 @@ class HybridGrantType extends InteractiveGrantType
         return OAuth2Protocol::getValidResponseTypes(OAuth2Protocol::OAuth2Protocol_GrantType_Hybrid);
     }
 
-    /** builds specific Token request
+    /**
      * @param OAuth2Request $request
-     * @return mixed
+     * @return OAuth2Response
+     * @throws InvalidOAuth2Request
      */
     public function buildTokenRequest(OAuth2Request $request)
     {
@@ -137,8 +144,10 @@ class HybridGrantType extends InteractiveGrantType
 
     /**
      * @param OAuth2AuthorizationRequest $request
-     * @param  bool $has_former_consent
+     * @param bool $has_former_consent
      * @return OAuth2Response
+     * @throws InvalidOAuth2Request
+     * @throws OAuth2GenericException
      */
     protected function buildResponse(OAuth2AuthorizationRequest $request, $has_former_consent)
     {
diff --git a/app/libs/oauth2/grant_types/IGrantType.php b/app/libs/OAuth2/GrantTypes/IGrantType.php
similarity index 53%
rename from app/libs/oauth2/grant_types/IGrantType.php
rename to app/libs/OAuth2/GrantTypes/IGrantType.php
index e9dbea09..5e990d0b 100644
--- a/app/libs/oauth2/grant_types/IGrantType.php
+++ b/app/libs/OAuth2/GrantTypes/IGrantType.php
@@ -1,13 +1,25 @@
-<?php
+<?php namespace OAuth2\GrantTypes;
 
-namespace oauth2\grant_types;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-use oauth2\requests\OAuth2Request;
+use OAuth2\Requests\OAuth2Request;
+use OAuth2\Responses\OAuth2Response;
 
 /**
  * Interface IGrantType
  * Defines a common interface for new OAuth2 Grant Types
- * @package oauth2\grant_types
+ * @package OAuth2\GrantTypes
  */
 interface IGrantType
 {
@@ -20,19 +32,19 @@ interface IGrantType
 
     /** defines entry point for first request processing
      * @param OAuth2Request $request
-     * @return mixed
+     * @return OAuth2Response
      */
     public function handle(OAuth2Request $request);
 
     /** defines entry point for final request processing
      * @param OAuth2Request $request
-     * @return mixed
+     * @return OAuth2Response
      */
     public function completeFlow(OAuth2Request $request);
 
     /**
      * get grant type
-     * @return mixed
+     * @return string
      */
     public function getType();
 
@@ -44,7 +56,7 @@ interface IGrantType
 
     /** builds specific Token request
      * @param OAuth2Request $request
-     * @return mixed
+     * @return OAuth2Response
      */
     public function buildTokenRequest(OAuth2Request $request);
 }
\ No newline at end of file
diff --git a/app/libs/oauth2/grant_types/ImplicitGrantType.php b/app/libs/OAuth2/GrantTypes/ImplicitGrantType.php
similarity index 76%
rename from app/libs/oauth2/grant_types/ImplicitGrantType.php
rename to app/libs/OAuth2/GrantTypes/ImplicitGrantType.php
index 12c0ca05..b21eec24 100644
--- a/app/libs/oauth2/grant_types/ImplicitGrantType.php
+++ b/app/libs/OAuth2/GrantTypes/ImplicitGrantType.php
@@ -1,32 +1,44 @@
-<?php
+<?php namespace OAuth2\GrantTypes;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-namespace oauth2\grant_types;
-
-use oauth2\exceptions\InvalidApplicationType;
-use oauth2\exceptions\InvalidClientType;
-use oauth2\exceptions\InvalidOAuth2Request;
-use oauth2\factories\OAuth2AccessTokenFragmentResponseFactory;
-use oauth2\models\IClient;
-use oauth2\OAuth2Protocol;
-use oauth2\repositories\IServerPrivateKeyRepository;
-use oauth2\requests\OAuth2AuthorizationRequest;
-use oauth2\requests\OAuth2Request;
-use oauth2\responses\OAuth2AccessTokenFragmentResponse;
-use oauth2\services\IApiScopeService;
-use oauth2\services\IClientJWKSetReader;
-use oauth2\services\IClientService;
-use oauth2\services\IMementoOAuth2SerializerService;
-use oauth2\services\IPrincipalService;
-use oauth2\services\ISecurityContextService;
-use oauth2\services\ITokenService;
-use oauth2\services\IUserConsentService;
-use oauth2\strategies\IOAuth2AuthenticationStrategy;
-use utils\services\IAuthService;
-use utils\services\ILogService;
+use OAuth2\Exceptions\InvalidApplicationType;
+use OAuth2\Exceptions\InvalidClientType;
+use OAuth2\Exceptions\InvalidOAuth2Request;
+use OAuth2\Factories\OAuth2AccessTokenFragmentResponseFactory;
+use OAuth2\Models\IClient;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Repositories\IServerPrivateKeyRepository;
+use OAuth2\Requests\OAuth2AuthorizationRequest;
+use OAuth2\Requests\OAuth2Request;
+use OAuth2\Responses\OAuth2AccessTokenFragmentResponse;
+use OAuth2\Responses\OAuth2Response;
+use OAuth2\Services\IApiScopeService;
+use OAuth2\Services\IClientJWKSetReader;
+use OAuth2\Services\IClientService;
+use OAuth2\Services\IMementoOAuth2SerializerService;
+use OAuth2\Services\IPrincipalService;
+use OAuth2\Services\ISecurityContextService;
+use OAuth2\Services\ITokenService;
+use OAuth2\Services\IUserConsentService;
+use OAuth2\Strategies\IOAuth2AuthenticationStrategy;
+use Utils\Services\IAuthService;
+use Utils\Services\ILogService;
 
 /**
  * Class ImplicitGrantType
- * http://tools.ietf.org/html/rfc6749#section-4.2
+ * @see http://tools.ietf.org/html/rfc6749#section-4.2
  * The implicit grant type is used to obtain access tokens (it does not
  * support the issuance of refresh tokens) and is optimized for public
  * clients known to operate a particular redirection URI.  These clients
@@ -45,14 +57,16 @@ use utils\services\ILogService;
  * the redirection URI.  Because the access token is encoded into the
  * redirection URI, it may be exposed to the resource owner and other
  * applications residing on the same device.
- * @package oauth2\grant_types
+ * @package OAuth2\GrantTypes
  */
 class ImplicitGrantType extends InteractiveGrantType
 {
 
-    /***
+    /**
+     * ImplicitGrantType constructor.
      * @param IApiScopeService $scope_service
      * @param IClientService $client_service
+     * @param IClientRepository $client_repository
      * @param ITokenService $token_service
      * @param IAuthService $auth_service
      * @param IOAuth2AuthenticationStrategy $auth_strategy
@@ -68,6 +82,7 @@ class ImplicitGrantType extends InteractiveGrantType
     (
         IApiScopeService                $scope_service,
         IClientService                  $client_service,
+        IClientRepository               $client_repository,
         ITokenService                   $token_service,
         IAuthService                    $auth_service,
         IOAuth2AuthenticationStrategy   $auth_strategy,
@@ -83,6 +98,7 @@ class ImplicitGrantType extends InteractiveGrantType
         parent::__construct
         (
             $client_service,
+            $client_repository,
             $token_service,
             $log_service,
             $security_context_service,
@@ -130,7 +146,11 @@ class ImplicitGrantType extends InteractiveGrantType
         return OAuth2Protocol::getValidResponseTypes(OAuth2Protocol::OAuth2Protocol_GrantType_Implicit);
     }
 
-
+    /**
+     * @param OAuth2Request $request
+     * @return OAuth2Response
+     * @throws InvalidOAuth2Request
+     */
     public function completeFlow(OAuth2Request $request)
     {
         throw new InvalidOAuth2Request('not implemented!');
@@ -138,7 +158,7 @@ class ImplicitGrantType extends InteractiveGrantType
 
     /**
      * get grant type
-     * @return mixed
+     * @return string
      */
     public function getType()
     {
@@ -147,8 +167,8 @@ class ImplicitGrantType extends InteractiveGrantType
 
     /**
      * @param OAuth2Request $request
-     * @return mixed|void
-     * @throws \oauth2\exceptions\InvalidOAuth2Request
+     * @return OAuth2Response
+     * @throws InvalidOAuth2Request
      */
     public function buildTokenRequest(OAuth2Request $request)
     {
diff --git a/app/libs/oauth2/grant_types/InteractiveGrantType.php b/app/libs/OAuth2/GrantTypes/InteractiveGrantType.php
similarity index 88%
rename from app/libs/oauth2/grant_types/InteractiveGrantType.php
rename to app/libs/OAuth2/GrantTypes/InteractiveGrantType.php
index bea90f2a..217a39b9 100644
--- a/app/libs/oauth2/grant_types/InteractiveGrantType.php
+++ b/app/libs/OAuth2/GrantTypes/InteractiveGrantType.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\GrantTypes;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,50 +13,53 @@
  * limitations under the License.
  **/
 
-namespace oauth2\grant_types;
-
+use Exception;
 use jwe\IJWE;
-use jwk\impl\RSAJWKFactory;
-use jwk\impl\RSAJWKPEMPrivateKeySpecification;
+use jwk\exceptions\InvalidJWKAlgorithm;
 use jws\IJWS;
-use oauth2\exceptions\ConsentRequiredException;
-use oauth2\exceptions\InteractionRequiredException;
-use oauth2\exceptions\InvalidClientException;
-use oauth2\exceptions\InvalidLoginHint;
-use oauth2\exceptions\InvalidOAuth2Request;
-use oauth2\exceptions\LockedClientException;
-use oauth2\exceptions\LoginRequiredException;
-use oauth2\exceptions\OAuth2GenericException;
-use oauth2\exceptions\RecipientKeyNotFoundException;
-use oauth2\exceptions\ScopeNotAllowedException;
-use oauth2\exceptions\UriNotAllowedException;
-use oauth2\heuristics\ClientSigningKeyFinder;
-use oauth2\heuristics\ServerEncryptionKeyFinder;
-use oauth2\heuristics\ServerSigningKeyFinder;
-use oauth2\models\IClient;
-use oauth2\OAuth2Protocol;
-use oauth2\repositories\IServerPrivateKeyRepository;
-use oauth2\requests\OAuth2AuthenticationRequest;
-use oauth2\requests\OAuth2AuthorizationRequest;
-use oauth2\requests\OAuth2Request;
-use oauth2\services\IApiScopeService;
-use oauth2\services\IClientJWKSetReader;
-use oauth2\services\IClientService;
-use oauth2\services\IMementoOAuth2SerializerService;
-use oauth2\services\IPrincipalService;
-use oauth2\services\ISecurityContextService;
-use oauth2\services\ITokenService;
-use oauth2\services\IUserConsentService;
-use oauth2\strategies\IOAuth2AuthenticationStrategy;
-use oauth2\exceptions\AccessDeniedException;
+use OAuth2\Exceptions\AccessDeniedException;
+use OAuth2\Exceptions\ConsentRequiredException;
+use OAuth2\Exceptions\InteractionRequiredException;
+use OAuth2\Exceptions\InvalidApplicationType;
+use OAuth2\Exceptions\InvalidClientException;
+use OAuth2\Exceptions\InvalidClientType;
+use OAuth2\Exceptions\InvalidLoginHint;
+use OAuth2\Exceptions\InvalidOAuth2Request;
+use OAuth2\Exceptions\LockedClientException;
+use OAuth2\Exceptions\LoginRequiredException;
+use OAuth2\Exceptions\OAuth2GenericException;
+use OAuth2\Exceptions\RecipientKeyNotFoundException;
+use OAuth2\Exceptions\ScopeNotAllowedException;
+use OAuth2\Exceptions\ServerKeyNotFoundException;
+use OAuth2\Exceptions\UriNotAllowedException;
+use OAuth2\Heuristics\ClientSigningKeyFinder;
+use OAuth2\Heuristics\ServerEncryptionKeyFinder;
+use OAuth2\Heuristics\ServerSigningKeyFinder;
+use OAuth2\Models\IClient;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Services\ITokenService;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Repositories\IServerPrivateKeyRepository;
+use OAuth2\Requests\OAuth2AuthenticationRequest;
+use OAuth2\Requests\OAuth2AuthorizationRequest;
+use OAuth2\Requests\OAuth2Request;
+use OAuth2\Responses\OAuth2Response;
+use OAuth2\Services\IApiScopeService;
+use OAuth2\Services\IClientJWKSetReader;
+use OAuth2\Services\IClientService;
+use OAuth2\Services\IMementoOAuth2SerializerService;
+use OAuth2\Services\IPrincipalService;
+use OAuth2\Services\ISecurityContextService;
+use OAuth2\Services\IUserConsentService;
+use OAuth2\Strategies\IOAuth2AuthenticationStrategy;
+use utils\exceptions\InvalidCompactSerializationException;
 use utils\factories\BasicJWTFactory;
-use utils\services\IAuthService;
-use utils\services\ILogService;
-use Log;
+use Utils\Services\IAuthService;
+use Utils\Services\ILogService;
 
 /**
  * Class InteractiveGrantType
- * @package oauth2\grant_types
+ * @package OAuth2\GrantTypes
  */
 abstract class InteractiveGrantType extends AbstractGrantType
 {
@@ -106,7 +110,9 @@ abstract class InteractiveGrantType extends AbstractGrantType
     private $jwk_set_reader_service;
 
     /**
+     * InteractiveGrantType constructor.
      * @param IClientService $client_service
+     * @param IClientRepository $client_repository
      * @param ITokenService $token_service
      * @param ILogService $log_service
      * @param ISecurityContextService $security_context_service
@@ -122,6 +128,7 @@ abstract class InteractiveGrantType extends AbstractGrantType
     public function __construct
     (
         IClientService                  $client_service,
+        IClientRepository               $client_repository,
         ITokenService                   $token_service,
         ILogService                     $log_service,
         ISecurityContextService         $security_context_service,
@@ -135,7 +142,7 @@ abstract class InteractiveGrantType extends AbstractGrantType
         IClientJWKSetReader             $jwk_set_reader_service
     )
     {
-        parent::__construct($client_service, $token_service, $log_service);
+        parent::__construct($client_service, $client_repository, $token_service, $log_service);
 
         $this->security_context_service      = $security_context_service;
         $this->principal_service             = $principal_service;
@@ -148,6 +155,11 @@ abstract class InteractiveGrantType extends AbstractGrantType
         $this->jwk_set_reader_service        = $jwk_set_reader_service;
     }
 
+    /**
+     * @param OAuth2Request $request
+     * @return OAuth2Response
+     * @throws Exception
+     */
     public function handle(OAuth2Request $request)
     {
         try
@@ -159,7 +171,7 @@ abstract class InteractiveGrantType extends AbstractGrantType
             }
 
             $client_id = $request->getClientId();
-            $client    = $this->client_service->getClientById($client_id);
+            $client    = $this->client_repository->getClientById($client_id);
 
             if (is_null($client)) {
                 throw new InvalidClientException
@@ -288,7 +300,7 @@ abstract class InteractiveGrantType extends AbstractGrantType
             $this->log_service->debug_msg(sprintf("Doing consent ... authorization_response %s should_prompt_consent %s",$authorization_response, $should_prompt_consent));
             return $this->auth_strategy->doConsent($request);
         }
-        catch(\Exception $ex)
+        catch(Exception $ex)
         {
             $this->log_service->warning($ex);
             // clear save data ...
@@ -354,10 +366,10 @@ abstract class InteractiveGrantType extends AbstractGrantType
      * @throws InteractionRequiredException
      * @throws InvalidClientException
      * @throws InvalidLoginHint
-     * @throws \jwk\exceptions\InvalidJWKAlgorithm
-     * @throws \oauth2\exceptions\InvalidClientType
-     * @throws \oauth2\exceptions\ServerKeyNotFoundException
-     * @throws \utils\exceptions\InvalidCompactSerializationException
+     * @throws InvalidJWKAlgorithm
+     * @throws InvalidClientType
+     * @throws ServerKeyNotFoundException
+     * @throws InvalidCompactSerializationException
      */
     protected function processUserHint(OAuth2AuthenticationRequest $request)
     {
@@ -383,7 +395,7 @@ abstract class InteractiveGrantType extends AbstractGrantType
         else if(!empty($token_hint))
         {
             $client_id = $request->getClientId();
-            $client    = $this->client_service->getClientById($client_id);
+            $client    = $this->client_repository->getClientById($client_id);
 
             if (is_null($client))
             {
@@ -402,17 +414,6 @@ abstract class InteractiveGrantType extends AbstractGrantType
             if($jwt instanceof IJWE)
             {
                 // decrypt using server key
-
-                $recipient_key = RSAJWKFactory::build
-                (
-                    new RSAJWKPEMPrivateKeySpecification
-                    (
-                        TestSeeder::$client_private_key_1,
-                        RSAJWKPEMPrivateKeySpecification::WithoutPassword,
-                        $jwt->getJOSEHeader()->getAlgorithm()->getString()
-                    )
-                );
-
                 $heuristic              = new ServerEncryptionKeyFinder($this->server_private_key_repository);
                 $server_enc_private_key = $heuristic->find
                 (
@@ -556,6 +557,7 @@ abstract class InteractiveGrantType extends AbstractGrantType
      * @param OAuth2AuthorizationRequest $request
      * @param IClient $client
      * @return bool
+     * @throws InteractionRequiredException
      */
     protected function shouldForceReLogin(OAuth2AuthorizationRequest $request, IClient $client)
     {
diff --git a/app/libs/oauth2/grant_types/RefreshBearerTokenGrantType.php b/app/libs/OAuth2/GrantTypes/RefreshBearerTokenGrantType.php
similarity index 73%
rename from app/libs/oauth2/grant_types/RefreshBearerTokenGrantType.php
rename to app/libs/OAuth2/GrantTypes/RefreshBearerTokenGrantType.php
index 8535b6ba..a688d39d 100644
--- a/app/libs/oauth2/grant_types/RefreshBearerTokenGrantType.php
+++ b/app/libs/OAuth2/GrantTypes/RefreshBearerTokenGrantType.php
@@ -1,43 +1,58 @@
-<?php
-
-namespace oauth2\grant_types;
+<?php namespace OAuth2\GrantTypes;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
 use Exception;
-use oauth2\exceptions\InvalidApplicationType;
-use oauth2\exceptions\InvalidGrantTypeException;
-use oauth2\exceptions\InvalidOAuth2Request;
-use oauth2\exceptions\UseRefreshTokenException;
-use oauth2\models\IClient;
-use oauth2\OAuth2Protocol;
-use oauth2\requests\OAuth2RefreshAccessTokenRequest;
-use oauth2\requests\OAuth2Request;
-use oauth2\requests\OAuth2TokenRequest;
-use oauth2\responses\OAuth2AccessTokenResponse;
-use oauth2\services\IClientService;
-use oauth2\services\ITokenService;
-use utils\services\ILogService;
+use OAuth2\Exceptions\InvalidApplicationType;
+use OAuth2\Exceptions\InvalidGrantTypeException;
+use OAuth2\Exceptions\InvalidOAuth2Request;
+use OAuth2\Exceptions\UseRefreshTokenException;
+use OAuth2\Models\IClient;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Services\ITokenService;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Requests\OAuth2RefreshAccessTokenRequest;
+use OAuth2\Requests\OAuth2Request;
+use OAuth2\Requests\OAuth2TokenRequest;
+use OAuth2\Responses\OAuth2AccessTokenResponse;
+use OAuth2\Responses\OAuth2Response;
+use OAuth2\Services\IClientService;
+use Utils\Services\ILogService;
 
 /**
  * Class RefreshBearerTokenGrantType
- * http://tools.ietf.org/html/rfc6749#section-6
- * @package oauth2\grant_types
+ * @see http://tools.ietf.org/html/rfc6749#section-6
+ * @package OAuth2\GrantTypes
  */
 final class RefreshBearerTokenGrantType extends AbstractGrantType
 {
 
     /**
+     * RefreshBearerTokenGrantType constructor.
      * @param IClientService $client_service
+     * @param IClientRepository $client_repository
      * @param ITokenService $token_service
      * @param ILogService $log_service
      */
     public function __construct
     (
         IClientService $client_service,
+        IClientRepository $client_repository,
         ITokenService $token_service,
         ILogService $log_service
     )
     {
-        parent::__construct($client_service, $token_service, $log_service);
+        parent::__construct($client_service, $client_repository, $token_service, $log_service);
     }
 
     /**
@@ -52,7 +67,7 @@ final class RefreshBearerTokenGrantType extends AbstractGrantType
     /** Not implemented , there is no first process phase on this grant type
      * @param OAuth2Request $request
      * @return mixed|void
-     * @throws \Exception
+     * @throws Exception
      */
     public function handle(OAuth2Request $request)
     {
@@ -70,11 +85,11 @@ final class RefreshBearerTokenGrantType extends AbstractGrantType
      *     client, and
      * o  validate the refresh token.
      * @param OAuth2Request $request
-     * @return mixed|OAuth2AccessTokenResponse|void
-     * @throws \oauth2\exceptions\UseRefreshTokenException
-     * @throws \oauth2\exceptions\InvalidOAuth2Request
-     * @throws \oauth2\exceptions\InvalidApplicationType
-     * @throws \oauth2\exceptions\InvalidGrantTypeException
+     * @return OAuth2Response
+     * @throws UseRefreshTokenException
+     * @throws InvalidOAuth2Request
+     * @throws InvalidApplicationType
+     * @throws InvalidGrantTypeException
      */
     public function completeFlow(OAuth2Request $request)
     {
@@ -104,7 +119,7 @@ final class RefreshBearerTokenGrantType extends AbstractGrantType
             );
         }
 
-        if (!$this->current_client->use_refresh_token)
+        if (!$this->current_client->useRefreshToken())
         {
             throw new UseRefreshTokenException
             (
@@ -132,14 +147,14 @@ final class RefreshBearerTokenGrantType extends AbstractGrantType
             );
         }
 
-        if ($refresh_token->getClientId() !== $this->current_client->client_id)
+        if ($refresh_token->getClientId() !== $this->current_client->getClientId())
         {
             throw new InvalidGrantTypeException
             (
                 sprintf
                 (
                     "refresh token %s does not belongs to client %s",
-                    $refresh_token_value, $this->current_client->client_id
+                    $refresh_token_value, $this->current_client->getClientId()
                 )
             );
         }
@@ -156,7 +171,7 @@ final class RefreshBearerTokenGrantType extends AbstractGrantType
          * legitimate client, one of them will present an invalidated refresh
          * token, which will inform the authorization server of the breach.
          */
-        if ($this->current_client->rotate_refresh_token)
+        if ($this->current_client->useRotateRefreshTokenPolicy())
         {
             $this->token_service->invalidateRefreshToken($refresh_token_value);
             $new_refresh_token = $this->token_service->createRefreshToken($access_token);
@@ -182,6 +197,7 @@ final class RefreshBearerTokenGrantType extends AbstractGrantType
     }
 
     /**
+     * @return array
      * @throws InvalidOAuth2Request
      */
     public function getResponseType()
@@ -191,7 +207,7 @@ final class RefreshBearerTokenGrantType extends AbstractGrantType
 
     /**
      * @param OAuth2Request $request
-     * @return null|OAuth2RefreshAccessTokenRequest
+     * @return null|OAuth2Response
      */
     public function buildTokenRequest(OAuth2Request $request)
     {
diff --git a/app/libs/oauth2/grant_types/RevokeBearerTokenGrantType.php b/app/libs/OAuth2/GrantTypes/RevokeBearerTokenGrantType.php
similarity index 80%
rename from app/libs/oauth2/grant_types/RevokeBearerTokenGrantType.php
rename to app/libs/OAuth2/GrantTypes/RevokeBearerTokenGrantType.php
index 5e24c8dd..932812b0 100644
--- a/app/libs/oauth2/grant_types/RevokeBearerTokenGrantType.php
+++ b/app/libs/OAuth2/GrantTypes/RevokeBearerTokenGrantType.php
@@ -1,24 +1,40 @@
-<?php
-
-namespace oauth2\grant_types;
+<?php namespace OAuth2\GrantTypes;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
 use Exception;
-use oauth2\exceptions\BearerTokenDisclosureAttemptException;
-use oauth2\exceptions\ExpiredAccessTokenException;
-use oauth2\exceptions\InvalidGrantTypeException;
-use oauth2\exceptions\InvalidOAuth2Request;
-use oauth2\exceptions\UnAuthorizedClientException;
-use oauth2\OAuth2Protocol;
-use oauth2\requests\OAuth2Request;
-use oauth2\requests\OAuth2TokenRevocationRequest;
-use oauth2\responses\OAuth2TokenRevocationResponse;
-use oauth2\services\IClientService;
-use oauth2\services\ITokenService;
-use utils\services\ILogService;
+use OAuth2\Exceptions\BearerTokenDisclosureAttemptException;
+use OAuth2\Exceptions\ExpiredAccessTokenException;
+use OAuth2\Exceptions\InvalidClientCredentials;
+use OAuth2\Exceptions\InvalidClientException;
+use OAuth2\Exceptions\InvalidGrantTypeException;
+use OAuth2\Exceptions\InvalidOAuth2Request;
+use OAuth2\Exceptions\LockedClientException;
+use OAuth2\Exceptions\MissingClientIdParam;
+use OAuth2\Exceptions\UnAuthorizedClientException;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Services\ITokenService;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Requests\OAuth2Request;
+use OAuth2\Requests\OAuth2TokenRevocationRequest;
+use OAuth2\Responses\OAuth2Response;
+use OAuth2\Responses\OAuth2TokenRevocationResponse;
+use OAuth2\Services\IClientService;
+use Utils\Services\ILogService;
 
 /**
  * Class RevokeTokenGrantType
- * http://tools.ietf.org/html/rfc7009
+ * @see http://tools.ietf.org/html/rfc7009
  * The OAuth 2.0 core specification [RFC6749] defines several ways for a
  * client to obtain refresh and access tokens.  This specification
  * supplements the core specification with a mechanism to revoke both
@@ -48,9 +64,9 @@ class RevokeBearerTokenGrantType extends AbstractGrantType
 
     const OAuth2Protocol_GrantType_Extension_RevokeToken = 'urn:tools.ietf.org:oauth2:grant_type:revoke_bearer';
 
-    public function __construct(IClientService $client_service, ITokenService $token_service, ILogService $log_service)
+    public function __construct(IClientService $client_service, IClientRepository $client_repository, ITokenService $token_service, ILogService $log_service)
     {
-        parent::__construct($client_service, $token_service, $log_service);
+        parent::__construct($client_service, $client_repository, $token_service, $log_service);
     }
 
     /** Given an OAuth2Request, returns true if it can handle it, false otherwise
@@ -59,13 +75,13 @@ class RevokeBearerTokenGrantType extends AbstractGrantType
      */
     public function canHandle(OAuth2Request $request)
     {
-        return $request instanceof Auth2TokenRevocationRequest && $request->isValid();
+        return $request instanceof OAuth2TokenRevocationRequest && $request->isValid();
     }
 
     /** defines entry point for first request processing
      * @param OAuth2Request $request
-     * @throws \oauth2\exceptions\InvalidOAuth2Request
-     * @return mixed
+     * @throws InvalidOAuth2Request
+     * @return OAuth2Response
      */
     public function handle(OAuth2Request $request)
     {
@@ -74,16 +90,16 @@ class RevokeBearerTokenGrantType extends AbstractGrantType
 
     /**
      * @param OAuth2Request $request
-     * @return OAuth2TokenRevocationResponse
+     * @return OAuth2Response
      * @throws BearerTokenDisclosureAttemptException
      * @throws Exception
      * @throws ExpiredAccessTokenException
      * @throws InvalidOAuth2Request
      * @throws UnAuthorizedClientException
-     * @throws \oauth2\exceptions\InvalidClientCredentials
-     * @throws \oauth2\exceptions\InvalidClientException
-     * @throws \oauth2\exceptions\LockedClientException
-     * @throws \oauth2\exceptions\MissingClientIdParam
+     * @throws InvalidClientCredentials
+     * @throws InvalidClientException
+     * @throws LockedClientException
+     * @throws MissingClientIdParam
      */
     public function completeFlow(OAuth2Request $request)
     {
@@ -233,12 +249,11 @@ class RevokeBearerTokenGrantType extends AbstractGrantType
                 $ex->getMessage()
             );
         }
-
     }
 
     /**
      * get grant type
-     * @return mixed
+     * @return string
      */
     public function getType()
     {
@@ -246,8 +261,8 @@ class RevokeBearerTokenGrantType extends AbstractGrantType
     }
 
     /** get grant type response type
-     * @return mixed
-     * @throws \oauth2\exceptions\InvalidOAuth2Request
+     * @return array
+     * @throws InvalidOAuth2Request
      */
     public function getResponseType()
     {
@@ -256,8 +271,8 @@ class RevokeBearerTokenGrantType extends AbstractGrantType
 
     /**
      * @param OAuth2Request $request
-     * @return mixed|void
-     * @throws \oauth2\exceptions\InvalidOAuth2Request
+     * @return OAuth2Response
+     * @throws InvalidOAuth2Request
      */
     public function buildTokenRequest(OAuth2Request $request)
     {
diff --git a/app/libs/OAuth2/GrantTypes/Strategies/IValidateBearerTokenStrategy.php b/app/libs/OAuth2/GrantTypes/Strategies/IValidateBearerTokenStrategy.php
new file mode 100644
index 00000000..42ff67bd
--- /dev/null
+++ b/app/libs/OAuth2/GrantTypes/Strategies/IValidateBearerTokenStrategy.php
@@ -0,0 +1,26 @@
+<?php namespace OAuth2\GrantTypes\Strategies;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\Models\AccessToken;
+use OAuth2\Models\IClient;
+
+interface IValidateBearerTokenStrategy
+{
+    /**
+     * @param AccessToken $access_token
+     * @param IClient $client
+     * @return void
+     */
+    public function validate(AccessToken $access_token, IClient $client);
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/GrantTypes/Strategies/ValidateBearerTokenResourceServerStrategy.php b/app/libs/OAuth2/GrantTypes/Strategies/ValidateBearerTokenResourceServerStrategy.php
new file mode 100644
index 00000000..7e96a3fa
--- /dev/null
+++ b/app/libs/OAuth2/GrantTypes/Strategies/ValidateBearerTokenResourceServerStrategy.php
@@ -0,0 +1,97 @@
+<?php namespace OAuth2\GrantTypes\Strategies;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\Models\AccessToken;
+use OAuth2\Exceptions\BearerTokenDisclosureAttemptException;
+use OAuth2\Exceptions\InvalidApplicationType;
+use OAuth2\Exceptions\LockedClientException;
+use OAuth2\Models\IClient;
+use OAuth2\Services\ITokenService;
+use Utils\IPHelper;
+
+/**
+ * Class ValidateBearerTokenResourceServerStrategy
+ * @package OAuth2\GrantTypes\Strategies
+ */
+final class ValidateBearerTokenResourceServerStrategy implements IValidateBearerTokenStrategy
+{
+    /**
+     * @var ITokenService
+     */
+    private $token_service;
+
+    /**
+     * ValidateBearerTokenResourceServerStrategy constructor.
+     * @param ITokenService $token_service
+     */
+    public function __construct(ITokenService $token_service)
+    {
+        $this->token_service = $token_service;
+    }
+
+    /**
+     * @param AccessToken $access_token
+     * @param IClient $client
+     * @throws BearerTokenDisclosureAttemptException
+     * @throws InvalidApplicationType
+     * @throws LockedClientException
+     */
+    public function validate(AccessToken $access_token, IClient $client)
+    {
+        // current client is a resource server, validate client type (must be confidential)
+        if ($client->getClientType() !== IClient::ClientType_Confidential)
+        {
+            throw new InvalidApplicationType
+            (
+                'resource server client is not of confidential type!'
+            );
+        }
+        //validate resource server IP address
+        $current_ip       = IPHelper::getUserIp();
+        $resource_server  = $client->getResourceServer();
+        //check if resource server is active
+        if (!$resource_server->isActive())
+        {
+            throw new LockedClientException
+            (
+                'resource server is disabled!'
+            );
+        }
+        //check resource server ip address
+        if (!$resource_server->isOwn($current_ip))
+        {
+            throw new BearerTokenDisclosureAttemptException
+            (
+                sprintf
+                (
+                    'resource server ip (%s) differs from current request ip %s',
+                    $resource_server->getIPAddresses(),
+                    $current_ip
+                )
+            );
+        }
+        // check if current ip belongs to a registered resource server audience
+        if (!$this->token_service->checkAccessTokenAudience($access_token, $current_ip))
+        {
+            throw new BearerTokenDisclosureAttemptException
+            (
+                sprintf
+                (
+                    'access token current audience does not match with current request ip %s',
+                    $current_ip
+                )
+            );
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/GrantTypes/Strategies/ValidateBearerTokenStrategy.php b/app/libs/OAuth2/GrantTypes/Strategies/ValidateBearerTokenStrategy.php
new file mode 100644
index 00000000..c72460de
--- /dev/null
+++ b/app/libs/OAuth2/GrantTypes/Strategies/ValidateBearerTokenStrategy.php
@@ -0,0 +1,58 @@
+<?php namespace OAuth2\GrantTypes\Strategies;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\Models\AccessToken;
+use OAuth2\Exceptions\BearerTokenDisclosureAttemptException;
+use OAuth2\Models\ClientAuthenticationContext;
+use OAuth2\Models\IClient;
+
+/**
+ * Class ValidateBearerTokenStrategy
+ * @package OAuth2\GrantTypes\Strategies
+ */
+final class ValidateBearerTokenStrategy implements IValidateBearerTokenStrategy
+{
+
+    /**
+     * @var ClientAuthenticationContext
+     */
+    private $client_auth_context;
+
+    public function __construct(ClientAuthenticationContext $client_auth_context)
+    {
+        $this->client_auth_context = $client_auth_context;
+    }
+
+    /**
+     * @param AccessToken $access_token
+     * @param IClient $client
+     * @throws BearerTokenDisclosureAttemptException
+     */
+    public function validate(AccessToken $access_token, IClient $client)
+    {
+        // if current client is not a resource server, then we could only access to our own tokens
+        if ($access_token->getClientId() !== $this->client_auth_context->getId())
+        {
+            throw new BearerTokenDisclosureAttemptException
+            (
+                sprintf
+                (
+                    'access token %s does not belongs to client id %s',
+                    $access_token->getValue(),
+                    $this->client_auth_context->getId()
+                )
+            );
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/GrantTypes/Strategies/ValidateBearerTokenStrategyFactory.php b/app/libs/OAuth2/GrantTypes/Strategies/ValidateBearerTokenStrategyFactory.php
new file mode 100644
index 00000000..13646ebe
--- /dev/null
+++ b/app/libs/OAuth2/GrantTypes/Strategies/ValidateBearerTokenStrategyFactory.php
@@ -0,0 +1,37 @@
+<?php namespace OAuth2\GrantTypes\Strategies;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\Models\ClientAuthenticationContext;
+use OAuth2\Models\IClient;
+use OAuth2\Services\ITokenService;
+
+/**
+ * Class ValidateBearerTokenStrategyFactory
+ * @package OAuth2\GrantTypes\Strategies
+ */
+final class ValidateBearerTokenStrategyFactory
+{
+
+
+    /**
+     * @param ClientAuthenticationContext $client_auth_context
+     * @param ITokenService $token_service
+     * @param IClient $client
+     * @return ValidateBearerTokenResourceServerStrategy|ValidateBearerTokenStrategy
+     */
+    public static function build(ClientAuthenticationContext $client_auth_context, ITokenService $token_service, IClient $client){
+        if($client->isResourceServerClient())
+            return new ValidateBearerTokenResourceServerStrategy($token_service);
+        return new ValidateBearerTokenStrategy($client_auth_context);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/grant_types/ValidateBearerTokenGrantType.php b/app/libs/OAuth2/GrantTypes/ValidateBearerTokenGrantType.php
similarity index 56%
rename from app/libs/oauth2/grant_types/ValidateBearerTokenGrantType.php
rename to app/libs/OAuth2/GrantTypes/ValidateBearerTokenGrantType.php
index 89ca2e42..fb6f6d4a 100644
--- a/app/libs/oauth2/grant_types/ValidateBearerTokenGrantType.php
+++ b/app/libs/OAuth2/GrantTypes/ValidateBearerTokenGrantType.php
@@ -1,23 +1,38 @@
-<?php
+<?php namespace OAuth2\GrantTypes;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-namespace oauth2\grant_types;
-
-use oauth2\exceptions\BearerTokenDisclosureAttemptException;
-use oauth2\exceptions\ExpiredAccessTokenException;
-use oauth2\exceptions\InvalidAccessTokenException;
-use oauth2\exceptions\InvalidApplicationType;
-use oauth2\exceptions\InvalidGrantTypeException;
-use oauth2\exceptions\InvalidOAuth2Request;
-use oauth2\exceptions\LockedClientException;
-use oauth2\models\IClient;
-use oauth2\requests\OAuth2AccessTokenValidationRequest;
-use oauth2\requests\OAuth2Request;
-use oauth2\responses\OAuth2AccessTokenValidationResponse;
-use oauth2\services\IClientService;
-use oauth2\services\ITokenService;
-use utils\IPHelper;
-use utils\services\IAuthService;
-use utils\services\ILogService;
+use OAuth2\Exceptions\BearerTokenDisclosureAttemptException;
+use OAuth2\Exceptions\ExpiredAccessTokenException;
+use OAuth2\Exceptions\InvalidAccessTokenException;
+use OAuth2\Exceptions\InvalidApplicationType;
+use OAuth2\Exceptions\InvalidClientCredentials;
+use OAuth2\Exceptions\InvalidClientException;
+use OAuth2\Exceptions\InvalidGrantTypeException;
+use OAuth2\Exceptions\InvalidOAuth2Request;
+use OAuth2\Exceptions\LockedClientException;
+use OAuth2\GrantTypes\Strategies\ValidateBearerTokenStrategyFactory;
+use OAuth2\Models\IClient;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Requests\OAuth2AccessTokenValidationRequest;
+use OAuth2\Requests\OAuth2Request;
+use OAuth2\Responses\OAuth2AccessTokenValidationResponse;
+use OAuth2\Responses\OAuth2Response;
+use OAuth2\Services\IClientService;
+use OAuth2\Services\ITokenService;
+use Utils\IPHelper;
+use Utils\Services\IAuthService;
+use Utils\Services\ILogService;
 
 /**
  * Class ValidateBearerTokenGrantType
@@ -45,9 +60,10 @@ use utils\services\ILogService;
  * in OAuth 2 Core Specification [RFC6749] or a separate OAuth 2.0
  * Access Token.  The methods of managing and validating these
  * authentication credentials are out of scope of this specification.
- * http://tools.ietf.org/html/draft-richer-oauth-introspection-04
+ * @see http://tools.ietf.org/html/draft-richer-oauth-introspection-04
  * @package oauth2\grant_types
  */
+
 class ValidateBearerTokenGrantType extends AbstractGrantType
 {
 
@@ -57,21 +73,25 @@ class ValidateBearerTokenGrantType extends AbstractGrantType
      * @var IAuthService
      */
     private $auth_service;
+
     /**
+     * ValidateBearerTokenGrantType constructor.
      * @param IClientService $client_service
+     * @param IClientRepository $client_repository
      * @param ITokenService $token_service
      * @param IAuthService $auth_service
      * @param ILogService $log_service
      */
     public function __construct
     (
-        IClientService $client_service,
-        ITokenService $token_service,
-        IAuthService  $auth_service,
-        ILogService   $log_service
+        IClientService    $client_service,
+        IClientRepository $client_repository,
+        ITokenService     $token_service,
+        IAuthService      $auth_service,
+        ILogService       $log_service
     )
     {
-        parent::__construct($client_service, $token_service, $log_service);
+        parent::__construct($client_service, $client_repository, $token_service, $log_service);
         $this->auth_service = $auth_service;
     }
 
@@ -94,8 +114,8 @@ class ValidateBearerTokenGrantType extends AbstractGrantType
 
     /**
      * @param OAuth2Request $request
-     * @return mixed|void
-     * @throws \oauth2\exceptions\InvalidOAuth2Request
+     * @return OAuth2Response
+     * @throws InvalidOAuth2Request
      */
     public function handle(OAuth2Request $request)
     {
@@ -104,14 +124,14 @@ class ValidateBearerTokenGrantType extends AbstractGrantType
 
     /**
      * @param OAuth2Request $request
-     * @return OAuth2AccessTokenValidationResponse
+     * @return OAuth2Response
      * @throws BearerTokenDisclosureAttemptException
      * @throws ExpiredAccessTokenException
      * @throws InvalidApplicationType
      * @throws InvalidOAuth2Request
      * @throws LockedClientException
-     * @throws \oauth2\exceptions\InvalidClientCredentials
-     * @throws \oauth2\exceptions\InvalidClientException
+     * @throws InvalidClientCredentials
+     * @throws InvalidClientException
      */
     public function completeFlow(OAuth2Request $request)
     {
@@ -140,72 +160,26 @@ class ValidateBearerTokenGrantType extends AbstractGrantType
                 );
             }
 
-            if (!$this->current_client->isResourceServerClient())
-            {
-                // if current client is not a resource server, then we could only access to our own tokens
-                if ($access_token->getClientId() !== $this->client_auth_context->getId())
-                {
-                    throw new BearerTokenDisclosureAttemptException
-                    (
-                        sprintf
-                        (
-                            'access token %s does not belongs to client id %s',
-                            $token_value,
-                            $this->client_auth_context->getId()
-                        )
-                    );
-                }
-            }
-            else
-            {
-                // current client is a resource server, validate client type (must be confidential)
-                if ($this->current_client->getClientType() !== IClient::ClientType_Confidential)
-                {
-                    throw new InvalidApplicationType
-                    (
-                        'resource server client is not of confidential type!'
-                    );
-                }
-                //validate resource server IP address
-                $current_ip = IPHelper::getUserIp();
-                $resource_server = $this->current_client->getResourceServer();
-                //check if resource server is active
-                if (!$resource_server->active)
-                {
-                    throw new LockedClientException
-                    (
-                        'resource server is disabled!'
-                    );
-                }
-                //check resource server ip address
-                if (!$resource_server->isOwn($current_ip))
-                {
-                    throw new BearerTokenDisclosureAttemptException
-                    (
-                        sprintf
-                        (
-                            'resource server ip (%s) differs from current request ip %s',
-                            $resource_server->getIPAddresses(),
-                            $current_ip
-                        )
-                    );
-                }
-                // check if current ip belongs to a registered resource server audience
-                if (!$this->token_service->checkAccessTokenAudience($access_token, $current_ip))
-                {
-                    throw new BearerTokenDisclosureAttemptException
-                    (
-                        sprintf
-                        (
-                            'access token current audience does not match with current request ip %s',
-                            $current_ip
-                        )
-                    );
-                }
-            }
-            $this->log_service->debug_msg(sprintf("access token client id %s", $access_token->getClientId()));
+            $this->log_service->debug_msg
+            (
+                sprintf
+                (
+                    "ValidateBearerTokenGrantType::completeFlow : access token %s  - client id %s",
+                    $access_token->getValue(),
+                    $access_token->getClientId()
+                )
+            );
 
-            $issued_client = $this->client_service->getClientById($access_token->getClientId());
+            $strategy = ValidateBearerTokenStrategyFactory::build
+            (
+                $this->client_auth_context,
+                $this->token_service,
+                $this->current_client
+            );
+
+            $strategy->validate($access_token, $this->current_client);
+
+            $issued_client = $this->client_repository->getClientById($access_token->getClientId());
 
             if (is_null($issued_client))
             {
@@ -221,7 +195,7 @@ class ValidateBearerTokenGrantType extends AbstractGrantType
             }
 
             $user_id = $access_token->getUserId();
-            $user    = is_null($user_id) ? null: $this->auth_service->getUserById($user_id);
+            $user    = !is_null($user_id) && $user_id > 0 ? $this->auth_service->getUserById($user_id) : null;
 
             return new OAuth2AccessTokenValidationResponse
             (
@@ -254,6 +228,7 @@ class ValidateBearerTokenGrantType extends AbstractGrantType
     }
 
     /**
+     * @return array
      * @throws InvalidOAuth2Request
      */
     public function getResponseType()
@@ -263,6 +238,7 @@ class ValidateBearerTokenGrantType extends AbstractGrantType
 
     /**
      * @param OAuth2Request $request
+     * @return OAuth2Response
      * @throws InvalidOAuth2Request
      */
     public function buildTokenRequest(OAuth2Request $request)
diff --git a/app/libs/oauth2/heuristics/ClientEncryptionKeyFinder.php b/app/libs/OAuth2/Heuristics/ClientEncryptionKeyFinder.php
similarity index 90%
rename from app/libs/oauth2/heuristics/ClientEncryptionKeyFinder.php
rename to app/libs/OAuth2/Heuristics/ClientEncryptionKeyFinder.php
index cc9f547a..5eccc091 100644
--- a/app/libs/oauth2/heuristics/ClientEncryptionKeyFinder.php
+++ b/app/libs/OAuth2/Heuristics/ClientEncryptionKeyFinder.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\Heuristics;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,20 +13,20 @@
  * limitations under the License.
  **/
 
-namespace oauth2\heuristics;
-
 use jwa\cryptographic_algorithms\ICryptoAlgorithm;
 use jwa\cryptographic_algorithms\key_management\modes\DirectEncryption;
 use jwk\IJWK;
+use jwk\impl\OctetSequenceJWKFactory;
+use jwk\impl\OctetSequenceJWKSpecification;
 use jwk\JSONWebKeyPublicKeyUseValues;
-use oauth2\exceptions\InvalidClientType;
-use oauth2\exceptions\RecipientKeyNotFoundException;
-use oauth2\models\IClient;
-use oauth2\services\IClientJWKSetReader;
+use OAuth2\Exceptions\InvalidClientType;
+use OAuth2\Exceptions\RecipientKeyNotFoundException;
+use OAuth2\Models\IClient;
+use OAuth2\Services\IClientJWKSetReader;
 
 /**
  * Class ClientEncryptionKeyFinder
- * @package oauth2\heuristics
+ * @package OAuth2\Heuristics
  */
 final class ClientEncryptionKeyFinder implements IKeyFinder
 {
@@ -45,8 +46,9 @@ final class ClientEncryptionKeyFinder implements IKeyFinder
     /**
      * @param IClient $client
      * @param ICryptoAlgorithm $alg
-     * @param  string|null $kid_hint
+     * @param null $kid_hint
      * @return IJWK
+     * @throws InvalidClientType
      * @throws RecipientKeyNotFoundException
      */
     public function find(IClient $client, ICryptoAlgorithm $alg, $kid_hint = null)
diff --git a/app/libs/oauth2/heuristics/ClientSigningKeyFinder.php b/app/libs/OAuth2/Heuristics/ClientSigningKeyFinder.php
similarity index 88%
rename from app/libs/oauth2/heuristics/ClientSigningKeyFinder.php
rename to app/libs/OAuth2/Heuristics/ClientSigningKeyFinder.php
index 8f5cfd98..857e6fa1 100644
--- a/app/libs/oauth2/heuristics/ClientSigningKeyFinder.php
+++ b/app/libs/OAuth2/Heuristics/ClientSigningKeyFinder.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Heuristics;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,23 +12,22 @@
  * limitations under the License.
  **/
 
-namespace oauth2\heuristics;
-
 use jwa\cryptographic_algorithms\ICryptoAlgorithm;
-use jwa\cryptographic_algorithms\key_management\modes\DirectEncryption;
 use jwa\cryptographic_algorithms\macs\MAC_Algorithm;
+use jwk\exceptions\InvalidJWKAlgorithm;
+use jwk\exceptions\JWKInvalidSpecException;
 use jwk\IJWK;
 use jwk\impl\OctetSequenceJWKFactory;
 use jwk\impl\OctetSequenceJWKSpecification;
 use jwk\JSONWebKeyPublicKeyUseValues;
-use oauth2\exceptions\InvalidClientType;
-use oauth2\exceptions\RecipientKeyNotFoundException;
-use oauth2\models\IClient;
-use oauth2\services\IClientJWKSetReader;
+use OAuth2\Exceptions\InvalidClientType;
+use OAuth2\Exceptions\RecipientKeyNotFoundException;
+use OAuth2\Models\IClient;
+use OAuth2\Services\IClientJWKSetReader;
 
 /**
  * Class ClientSigningKeyFinder
- * @package oauth2\heuristics
+ * @package OAuth2\Heuristics
  */
 final class ClientSigningKeyFinder implements IKeyFinder
 {
@@ -48,9 +47,12 @@ final class ClientSigningKeyFinder implements IKeyFinder
     /**
      * @param IClient $client
      * @param ICryptoAlgorithm $alg
-     * @param  string|null $kid_hint
+     * @param null $kid_hint
      * @return IJWK
+     * @throws InvalidClientType
      * @throws RecipientKeyNotFoundException
+     * @throws InvalidJWKAlgorithm
+     * @throws JWKInvalidSpecException
      */
     public function find(IClient $client, ICryptoAlgorithm $alg, $kid_hint = null)
     {
diff --git a/app/libs/oauth2/heuristics/IKeyFinder.php b/app/libs/OAuth2/Heuristics/IKeyFinder.php
similarity index 68%
rename from app/libs/oauth2/heuristics/IKeyFinder.php
rename to app/libs/OAuth2/Heuristics/IKeyFinder.php
index 9560b06b..23adb119 100644
--- a/app/libs/oauth2/heuristics/IKeyFinder.php
+++ b/app/libs/OAuth2/Heuristics/IKeyFinder.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\Heuristics;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,15 +13,17 @@
  * limitations under the License.
  **/
 
-namespace oauth2\heuristics;
-
 use jwa\cryptographic_algorithms\ICryptoAlgorithm;
+use jwk\exceptions\InvalidJWKAlgorithm;
+use jwk\exceptions\JWKInvalidSpecException;
 use jwk\IJWK;
-use oauth2\models\IClient;
+use OAuth2\Exceptions\InvalidClientType;
+use OAuth2\Exceptions\RecipientKeyNotFoundException;
+use OAuth2\Models\IClient;
 
 /**
  * Interface IKeyFinder
- * @package oauth2\heuristics
+ * @package OAuth2\Heuristics
  */
 interface IKeyFinder
 {
@@ -29,6 +32,10 @@ interface IKeyFinder
      * @param  ICryptoAlgorithm $alg
      * @param  string|null $kid_hint
      * @return IJWK
+     * @throws InvalidClientType
+     * @throws RecipientKeyNotFoundException
+     * @throws InvalidJWKAlgorithm
+     * @throws JWKInvalidSpecException
      */
     public function find(IClient $client, ICryptoAlgorithm $alg, $kid_hint = null);
 }
\ No newline at end of file
diff --git a/app/libs/oauth2/heuristics/ServerEncryptionKeyFinder.php b/app/libs/OAuth2/Heuristics/ServerEncryptionKeyFinder.php
similarity index 93%
rename from app/libs/oauth2/heuristics/ServerEncryptionKeyFinder.php
rename to app/libs/OAuth2/Heuristics/ServerEncryptionKeyFinder.php
index 99ac92fb..de8eae0a 100644
--- a/app/libs/oauth2/heuristics/ServerEncryptionKeyFinder.php
+++ b/app/libs/OAuth2/Heuristics/ServerEncryptionKeyFinder.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Heuristics;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +12,6 @@
  * limitations under the License.
  **/
 
-namespace oauth2\heuristics;
-
 use jwa\cryptographic_algorithms\ICryptoAlgorithm;
 use jwa\cryptographic_algorithms\key_management\modes\DirectEncryption;
 use jwk\exceptions\InvalidJWKAlgorithm;
@@ -23,14 +21,14 @@ use jwk\impl\OctetSequenceJWKFactory;
 use jwk\impl\OctetSequenceJWKSpecification;
 use jwk\JSONWebKeyPublicKeyUseValues;
 use jwk\JSONWebKeyTypes;
-use oauth2\exceptions\InvalidClientType;
-use oauth2\exceptions\ServerKeyNotFoundException;
-use oauth2\models\IClient;
-use oauth2\repositories\IServerPrivateKeyRepository;
+use OAuth2\Exceptions\InvalidClientType;
+use OAuth2\Exceptions\ServerKeyNotFoundException;
+use OAuth2\Models\IClient;
+use OAuth2\Repositories\IServerPrivateKeyRepository;
 
 /**
  * Class ServerEncryptionKeyFinder
- * @package oauth2\heuristics
+ * @package OAuth2\Heuristics
  */
 final class ServerEncryptionKeyFinder implements IKeyFinder
 {
diff --git a/app/libs/oauth2/heuristics/ServerSigningKeyFinder.php b/app/libs/OAuth2/Heuristics/ServerSigningKeyFinder.php
similarity index 93%
rename from app/libs/oauth2/heuristics/ServerSigningKeyFinder.php
rename to app/libs/OAuth2/Heuristics/ServerSigningKeyFinder.php
index b5408d4d..113e54e9 100644
--- a/app/libs/oauth2/heuristics/ServerSigningKeyFinder.php
+++ b/app/libs/OAuth2/Heuristics/ServerSigningKeyFinder.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Heuristics;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +12,6 @@
  * limitations under the License.
  **/
 
-namespace oauth2\heuristics;
-
 use jwa\cryptographic_algorithms\ICryptoAlgorithm;
 use jwa\cryptographic_algorithms\macs\MAC_Algorithm;
 use jwk\exceptions\InvalidJWKAlgorithm;
@@ -23,14 +21,14 @@ use jwk\impl\OctetSequenceJWKFactory;
 use jwk\impl\OctetSequenceJWKSpecification;
 use jwk\JSONWebKeyPublicKeyUseValues;
 use jwk\JSONWebKeyTypes;
-use oauth2\exceptions\InvalidClientType;
-use oauth2\exceptions\ServerKeyNotFoundException;
-use oauth2\models\IClient;
-use oauth2\repositories\IServerPrivateKeyRepository;
+use OAuth2\Exceptions\InvalidClientType;
+use OAuth2\Exceptions\ServerKeyNotFoundException;
+use OAuth2\Models\IClient;
+use OAuth2\Repositories\IServerPrivateKeyRepository ;
 
 /**
  * Class ServerSigningKeyFinder
- * @package oauth2\heuristics
+ * @package OAuth2\Heuristics
  */
 final class ServerSigningKeyFinder implements IKeyFinder
 {
diff --git a/app/libs/oauth2/IOAuth2Protocol.php b/app/libs/OAuth2/IOAuth2Protocol.php
similarity index 52%
rename from app/libs/oauth2/IOAuth2Protocol.php
rename to app/libs/OAuth2/IOAuth2Protocol.php
index e50078a4..6d3668d2 100644
--- a/app/libs/oauth2/IOAuth2Protocol.php
+++ b/app/libs/OAuth2/IOAuth2Protocol.php
@@ -1,17 +1,25 @@
-<?php
-
-namespace oauth2;
-
-use oauth2\requests\OAuth2Request;
-
+<?php namespace OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\Requests\OAuth2Request;
 /**
  * Interface IOAuth2Protocol
- * @package oauth2
+ * @package OAuth2
  */
 interface IOAuth2Protocol {
     /**
      * Authorize endpoint
-     * http://tools.ietf.org/html/rfc6749#section-3.1
+     * @see http://tools.ietf.org/html/rfc6749#section-3.1
      * @param OAuth2Request $request
      * @return mixed
      */
@@ -19,7 +27,7 @@ interface IOAuth2Protocol {
 
     /**
      * Token Endpoint
-     * http://tools.ietf.org/html/rfc6749#section-3.2
+     * @see http://tools.ietf.org/html/rfc6749#section-3.2
      * @param OAuth2Request $request
      * @return mixed
      */
@@ -27,7 +35,7 @@ interface IOAuth2Protocol {
 
     /**
      * Revoke Token Endpoint
-     * http://tools.ietf.org/html/rfc7009
+     * @see http://tools.ietf.org/html/rfc7009
      * @param OAuth2Request $request
      * @return mixed
      */
@@ -35,7 +43,7 @@ interface IOAuth2Protocol {
 
     /**
      * Introspection Token Endpoint
-     * http://tools.ietf.org/html/draft-richer-oauth-introspection-04
+     * @see http://tools.ietf.org/html/draft-richer-oauth-introspection-04
      * @param OAuth2Request $request
      * @return mixed
      */
@@ -53,14 +61,14 @@ interface IOAuth2Protocol {
     public function getJWKSDocument();
 
     /**
-     * http://openid.net/specs/openid-connect-discovery-1_0.html
+     * @see http://openid.net/specs/openid-connect-discovery-1_0.html
      * @return string
      */
     public function getDiscoveryDocument();
 
 
     /**
-     * http://openid.net/specs/openid-connect-session-1_0.html#RPLogout
+     * @see http://openid.net/specs/openid-connect-session-1_0.html#RPLogout
      */
     public function endSession(OAuth2Request $request = null);
 
diff --git a/app/libs/oauth2/IResourceServerContext.php b/app/libs/OAuth2/IResourceServerContext.php
similarity index 80%
rename from app/libs/oauth2/IResourceServerContext.php
rename to app/libs/OAuth2/IResourceServerContext.php
index 17097e5f..7b613c28 100644
--- a/app/libs/oauth2/IResourceServerContext.php
+++ b/app/libs/OAuth2/IResourceServerContext.php
@@ -1,11 +1,8 @@
-<?php
-
-namespace oauth2;
-
+<?php namespace OAuth2;
 /**
  * Interface IResourceServerContext
  * Current Request OAUTH2 security context
- * @package oauth2
+ * @package OAuth2
  */
 interface IResourceServerContext {
 
@@ -39,5 +36,9 @@ interface IResourceServerContext {
      */
     public function getCurrentUserId();
 
-    public function setAuthorizationContext($auth_context);
+    /**
+     * @param array$auth_context
+     * @return $this
+     */
+    public function setAuthorizationContext(array $auth_context);
 } 
\ No newline at end of file
diff --git a/app/config/packages/.gitkeep b/app/libs/OAuth2/Models/.gitkeep
similarity index 100%
rename from app/config/packages/.gitkeep
rename to app/libs/OAuth2/Models/.gitkeep
diff --git a/app/libs/oauth2/models/AccessToken.php b/app/libs/OAuth2/Models/AccessToken.php
similarity index 71%
rename from app/libs/oauth2/models/AccessToken.php
rename to app/libs/OAuth2/Models/AccessToken.php
index e2b4106c..fcc4d002 100644
--- a/app/libs/oauth2/models/AccessToken.php
+++ b/app/libs/OAuth2/Models/AccessToken.php
@@ -1,28 +1,47 @@
-<?php
-
-namespace oauth2\models;
-
-use Zend\Math\Rand;
-use oauth2\OAuth2Protocol;
+<?php namespace OAuth2\Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 /**
  * Class AccessToken
- * http://tools.ietf.org/html/rfc6749#section-1.4
- * @package oauth2\models
+ * @see http://tools.ietf.org/html/rfc6749#section-1.4
+ * @package OAuth2\Models
  */
 class AccessToken extends Token {
 
+    /**
+     * @var AuthorizationCode
+     */
     private $auth_code;
 
+    /**
+     * @var RefreshToken
+     */
     private $refresh_token;
 
     const Length = 128;
 
-    public function __construct(){
+    public function __construct()
+    {
         parent::__construct(self::Length);
     }
 
+    /**
+     * @param AuthorizationCode $auth_code
+     * @param int $lifetime
+     * @return AccessToken
+     */
     public static function create(AuthorizationCode $auth_code,  $lifetime = 3600){
-        $instance = new self();
+        $instance               = new self();
         $instance->user_id      = $auth_code->getUserId();
         $instance->scope        = $auth_code->getScope();
         // client id (oauth2) not client identifier
@@ -76,16 +95,27 @@ class AccessToken extends Token {
         return $instance;
     }
 
+    /**
+     * @return AuthorizationCode
+     */
     public function getAuthCode(){
         return $this->auth_code;
     }
 
+    /**
+     * @return RefreshToken
+     */
     public function getRefreshToken(){
         return $this->refresh_token;
     }
 
+    /**
+     * @param RefreshToken $refresh_token
+     * @return $this
+     */
     public function setRefreshToken(RefreshToken $refresh_token){
-        $this->refresh_token = $refresh_token;;
+        $this->refresh_token = $refresh_token;
+        return $this;
     }
 
 
diff --git a/app/libs/oauth2/models/AuthorizationCode.php b/app/libs/OAuth2/Models/AuthorizationCode.php
similarity index 91%
rename from app/libs/oauth2/models/AuthorizationCode.php
rename to app/libs/OAuth2/Models/AuthorizationCode.php
index 0abf3567..0e53a91e 100644
--- a/app/libs/oauth2/models/AuthorizationCode.php
+++ b/app/libs/OAuth2/Models/AuthorizationCode.php
@@ -1,21 +1,43 @@
-<?php
-
-namespace oauth2\models;
-
-use utils\IPHelper;
-use Zend\Math\Rand;
-use oauth2\OAuth2Protocol;
+<?php namespace OAuth2\Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\IPHelper;
+use OAuth2\OAuth2Protocol;
 /**
  * Class AuthorizationCode
  * http://tools.ietf.org/html/rfc6749#section-1.3.1
- * @package oauth2\models
+ * @package OAuth2\Models
  */
 class AuthorizationCode extends Token
 {
-
+    /**
+     * @var string
+     */
     private $redirect_uri;
+
+    /**
+     * @var string
+     */
     private $access_type;
+
+    /**
+     * @var string
+     */
     private $approval_prompt;
+
+    /**
+     * @var bool
+     */
     private $has_previous_user_consent;
     /**
      * @var string
diff --git a/app/libs/oauth2/models/ClientAssertionAuthenticationContext.php b/app/libs/OAuth2/Models/ClientAssertionAuthenticationContext.php
similarity index 86%
rename from app/libs/oauth2/models/ClientAssertionAuthenticationContext.php
rename to app/libs/OAuth2/Models/ClientAssertionAuthenticationContext.php
index 76f38c46..0db2be39 100644
--- a/app/libs/oauth2/models/ClientAssertionAuthenticationContext.php
+++ b/app/libs/OAuth2/Models/ClientAssertionAuthenticationContext.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Models;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,24 +11,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\models;
-
+use OAuth2\Exceptions\InvalidClientAssertionAlgorithmException;
+use OAuth2\Exceptions\InvalidClientAssertionException;
+use OAuth2\Exceptions\InvalidClientAssertionTypeException;
+use OAuth2\Exceptions\InvalidTokenEndpointAuthMethodException;
+use OAuth2\OAuth2Protocol;
+//jose4php lib
 use jwa\cryptographic_algorithms\DigitalSignatures_MACs_Registry;
 use jwa\cryptographic_algorithms\macs\MAC_Algorithm;
 use jws\IJWS;
-use jwt\IBasicJWT;
-use oauth2\exceptions\InvalidClientAssertionAlgorithmException;
-use oauth2\exceptions\InvalidClientAssertionException;
-use oauth2\exceptions\InvalidClientAssertionTypeException;
-use oauth2\exceptions\InvalidTokenEndpointAuthMethodException;
-use oauth2\OAuth2Protocol;
 use utils\factories\BasicJWTFactory;
-use utils\exceptions\InvalidCompactSerializationException;
-
+use Utils\Exceptions\InvalidCompactSerializationException;
 /**
  * Class ClientAssertionAuthenticationContext
- * @package oauth2\models
+ * @package OAuth2\Models
  * https://tools.ietf.org/html/rfc7523#section-2.2
  */
 final class ClientAssertionAuthenticationContext extends ClientAuthenticationContext
diff --git a/app/libs/oauth2/models/ClientAuthenticationContext.php b/app/libs/OAuth2/Models/ClientAuthenticationContext.php
similarity index 92%
rename from app/libs/oauth2/models/ClientAuthenticationContext.php
rename to app/libs/OAuth2/Models/ClientAuthenticationContext.php
index 25215db2..3df0ad41 100644
--- a/app/libs/oauth2/models/ClientAuthenticationContext.php
+++ b/app/libs/OAuth2/Models/ClientAuthenticationContext.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Models;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,15 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\models;
-
-use oauth2\exceptions\InvalidTokenEndpointAuthMethodException;
-use oauth2\OAuth2Protocol;
-
+use OAuth2\Exceptions\InvalidTokenEndpointAuthMethodException;
+use OAuth2\OAuth2Protocol;
 /**
  * Class ClientAuthenticationContext
- * @package oauth2\models
+ * @package OAuth2\Models
  */
 abstract class ClientAuthenticationContext
 {
diff --git a/app/libs/oauth2/models/ClientCredentialsAuthenticationContext.php b/app/libs/OAuth2/Models/ClientCredentialsAuthenticationContext.php
similarity index 88%
rename from app/libs/oauth2/models/ClientCredentialsAuthenticationContext.php
rename to app/libs/OAuth2/Models/ClientCredentialsAuthenticationContext.php
index 14c56d5b..16f4279e 100644
--- a/app/libs/oauth2/models/ClientCredentialsAuthenticationContext.php
+++ b/app/libs/OAuth2/Models/ClientCredentialsAuthenticationContext.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Models;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,15 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\models;
-
-use oauth2\exceptions\InvalidTokenEndpointAuthMethodException;
-use oauth2\OAuth2Protocol;
-
+use OAuth2\Exceptions\InvalidTokenEndpointAuthMethodException;
+use OAuth2\OAuth2Protocol;
 /**
  * Class ClientCredentialsAuthenticationContext
- * @package oauth2\models
+ * @package OAuth2\Models
  */
 final class ClientCredentialsAuthenticationContext extends ClientAuthenticationContext
 {
diff --git a/app/libs/OAuth2/Models/IApi.php b/app/libs/OAuth2/Models/IApi.php
new file mode 100644
index 00000000..c5c7edf6
--- /dev/null
+++ b/app/libs/OAuth2/Models/IApi.php
@@ -0,0 +1,60 @@
+<?php namespace OAuth2\Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+interface IApi {
+    /**
+     * @return IResourceServer
+     */
+    public function getResourceServer();
+
+    /**
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * @return string
+     */
+    public function getLogo();
+
+    /**
+     * @return string
+     */
+    public function getDescription();
+
+    public function getScope();
+
+    /**
+     * @return bool
+     */
+    public function isActive();
+
+    /**
+     * @param string $name
+     * @return $this`
+     */
+    public function setName($name);
+
+    /**
+     * @param string $description
+     * @return $this
+     */
+    public function setDescription($description);
+
+    /**
+     * @param bool $active
+     * @return $this
+     */
+    public function setStatus($active);
+
+} 
\ No newline at end of file
diff --git a/app/libs/OAuth2/Models/IApiEndpoint.php b/app/libs/OAuth2/Models/IApiEndpoint.php
new file mode 100644
index 00000000..543a88ad
--- /dev/null
+++ b/app/libs/OAuth2/Models/IApiEndpoint.php
@@ -0,0 +1,84 @@
+<?php namespace OAuth2\Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+/**
+ * Interface IApiEndpoint
+ * @package OAuth2\Models
+ */
+interface IApiEndpoint {
+
+    /**
+     * @return string
+     */
+    public function getRoute();
+
+    /**
+     * @return string
+     */
+    public function getHttpMethod();
+
+    /**
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * @param string $route
+     * @return $this
+     */
+    public function setRoute($route);
+
+    /**
+     * @param string $http_method
+     * @return $this
+     */
+    public function setHttpMethod($http_method);
+
+    /**
+     * @param string $name
+     * @return $this
+     */
+    public function setName($name);
+
+    /**
+     * @return mixed
+     */
+    public function getScope();
+
+    /**
+     * @return bool
+     */
+    public function isActive();
+
+    /**
+     * @param bool $active
+     * @return $this
+     */
+    public function setStatus($active);
+
+    /**
+     * @return bool
+     */
+    public function supportCORS();
+
+    /**
+     * @return IApi
+     */
+    public function getApi();
+
+    /**
+     * @return bool
+     */
+    public function supportCredentials();
+
+} 
\ No newline at end of file
diff --git a/app/libs/oauth2/models/IApiScope.php b/app/libs/OAuth2/Models/IApiScope.php
similarity index 76%
rename from app/libs/oauth2/models/IApiScope.php
rename to app/libs/OAuth2/Models/IApiScope.php
index a7997256..c4dd06e0 100644
--- a/app/libs/oauth2/models/IApiScope.php
+++ b/app/libs/OAuth2/Models/IApiScope.php
@@ -1,11 +1,8 @@
-<?php
-
-namespace oauth2\models;
-
+<?php namespace OAuth2\Models;
 /**
  * Interface IApiScope
- * http://tools.ietf.org/html/rfc6749#section-3.3
- * @package oauth2\models
+ * @see http://tools.ietf.org/html/rfc6749#section-3.3
+ * @package OAuth2\Models
  */
 interface IApiScope extends IScope {
 
diff --git a/app/libs/oauth2/models/IApiScopeGroup.php b/app/libs/OAuth2/Models/IApiScopeGroup.php
similarity index 87%
rename from app/libs/oauth2/models/IApiScopeGroup.php
rename to app/libs/OAuth2/Models/IApiScopeGroup.php
index 3f7037ab..cef9f5de 100644
--- a/app/libs/oauth2/models/IApiScopeGroup.php
+++ b/app/libs/OAuth2/Models/IApiScopeGroup.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Models;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,16 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\models;
-
-
-
+use Utils\Model\IEntity;
 /**
  * Interface IApiScopeGroup
- * @package oauth2\models
+ * @package OAuth2\Models
  */
-interface IApiScopeGroup
+interface IApiScopeGroup extends IEntity
 {
     /**
      * @param IApiScope $scope
diff --git a/app/libs/oauth2/models/IAssymetricKey.php b/app/libs/OAuth2/Models/IAsymmetricKey.php
similarity index 85%
rename from app/libs/oauth2/models/IAssymetricKey.php
rename to app/libs/OAuth2/Models/IAsymmetricKey.php
index 6ae27c6f..caed96ee 100644
--- a/app/libs/oauth2/models/IAssymetricKey.php
+++ b/app/libs/OAuth2/Models/IAsymmetricKey.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Models;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,18 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\models;
-
 use jwa\cryptographic_algorithms\ICryptoAlgorithm;
 use jwk\IJWK;
-use utils\model\IEntity;
-
+use Utils\Model\IEntity;
+use DateTime;
 /**
- * Interface IAssymetricKey
- * @package oauth2\models
+ * Interface IAsymmetricKey
+ * @package OAuth2\Models
  */
-interface IAssymetricKey extends IEntity
+interface IAsymmetricKey extends IEntity
 {
     /**
      * @return string
@@ -45,13 +42,13 @@ interface IAssymetricKey extends IEntity
     public function isActive();
 
     /**
-     * checks validatiry range with now
+     * checks validity range with now
      * @return bool
      */
     public function isExpired();
 
     /**
-     * @return \DateTime
+     * @return DateTime
      */
     public function getLastUse();
 
diff --git a/app/libs/oauth2/models/IClient.php b/app/libs/OAuth2/Models/IClient.php
similarity index 83%
rename from app/libs/oauth2/models/IClient.php
rename to app/libs/OAuth2/Models/IClient.php
index 834540df..90edbd8d 100644
--- a/app/libs/oauth2/models/IClient.php
+++ b/app/libs/OAuth2/Models/IClient.php
@@ -1,12 +1,22 @@
-<?php
-
-namespace oauth2\models;
-
+<?php namespace OAuth2\Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Model\IEntity;
 /**
  * Interface IClient
- * @package oauth2\models
+ * @package OAuth2\Models
  */
-interface IClient
+interface IClient extends IEntity
 {
 
     const ClientType_Public         = 'PUBLIC';
@@ -18,7 +28,7 @@ interface IClient
     const ApplicationType_Native    = 'NATIVE';
 
     /**
-     *  http://openid.net/specs/openid-connect-core-1_0.html#SubjectIDTypes
+     *  @see http://openid.net/specs/openid-connect-core-1_0.html#SubjectIDTypes
      */
     const SubjectType_Public   = 'public';
     const SubjectType_Pairwise = 'pairwise';
@@ -291,4 +301,18 @@ interface IClient
      */
     public function setEditedBy($editing_user);
 
+    /**
+     * @return bool
+     */
+    public function useRefreshToken();
+
+    /**
+     * @return bool
+     */
+    public function useRotateRefreshTokenPolicy();
+
+    /**
+     * @return array
+     */
+    public function getValidAccessTokens();
 }
\ No newline at end of file
diff --git a/app/libs/OAuth2/Models/IClientPublicKey.php b/app/libs/OAuth2/Models/IClientPublicKey.php
new file mode 100644
index 00000000..43eefe2c
--- /dev/null
+++ b/app/libs/OAuth2/Models/IClientPublicKey.php
@@ -0,0 +1,40 @@
+<?php namespace OAuth2\Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use DateTime;
+/**
+ * Interface IClientPublicKey
+ * @package OAuth2\Models
+ */
+interface IClientPublicKey extends IAsymmetricKey
+{
+
+    /**
+     * @return IClient
+     */
+    public function getOwner();
+
+    /**
+     * @param string $kid
+     * @param string $type
+     * @param string $use
+     * @param string $pem
+     * @param string $alg
+     * @param bool $active
+     * @param DateTime $valid_from
+     * @param DateTime $valid_to
+     * @return IClientPublicKey
+     */
+    static public function buildFromPEM($kid, $type, $use, $pem, $alg, $active, DateTime $valid_from, DateTime $valid_to);
+
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/models/IOAuth2User.php b/app/libs/OAuth2/Models/IOAuth2User.php
similarity index 93%
rename from app/libs/oauth2/models/IOAuth2User.php
rename to app/libs/OAuth2/Models/IOAuth2User.php
index 47022436..279bad99 100644
--- a/app/libs/oauth2/models/IOAuth2User.php
+++ b/app/libs/OAuth2/Models/IOAuth2User.php
@@ -1,10 +1,7 @@
-<?php
-
-namespace oauth2\models;
-
+<?php namespace OAuth2\Models;
 /**
  * Interface IOAuth2User
- * @package oauth2\models
+ * @package OAuth2\Models
  */
 interface IOAuth2User {
 
@@ -29,7 +26,6 @@ interface IOAuth2User {
      */
     public function canUseSystemScopes();
 
-
     /**
      * Is Server Administrator
      * @return bool
diff --git a/app/libs/OAuth2/Models/IPrincipal.php b/app/libs/OAuth2/Models/IPrincipal.php
new file mode 100644
index 00000000..df959586
--- /dev/null
+++ b/app/libs/OAuth2/Models/IPrincipal.php
@@ -0,0 +1,23 @@
+<?php namespace OAuth2\Models;
+/**
+ * Interface IPrincipal
+ * @package OAuth2\Models
+ */
+interface IPrincipal
+{
+    /**
+     * @return int
+     */
+    public function getAuthTime();
+
+    /**
+     * @return int
+     */
+    public function getUserId();
+
+    /**
+     * OP Browser state
+     * @return string
+     */
+    public function getOPBrowserState();
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Models/IResourceServer.php b/app/libs/OAuth2/Models/IResourceServer.php
new file mode 100644
index 00000000..ef0fdf87
--- /dev/null
+++ b/app/libs/OAuth2/Models/IResourceServer.php
@@ -0,0 +1,72 @@
+<?php namespace OAuth2\Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+/**
+ * Interface IResourceServer
+ * @package OAuth2\Models
+ */
+interface IResourceServer {
+
+    /**
+     * get resource server host
+     * @return string
+     */
+    public function getHost();
+
+    /**
+     * @param string $host
+     * @return $this
+     */
+    public function setHost($host);
+
+    /**
+     * tells if resource server is active or not
+     * @return bool
+     */
+    public function isActive();
+
+    /**
+     * @param bool $active
+     * @return $this
+     */
+    public function setActive($active);
+
+
+    /**
+     * get resource server friendly name
+     * @return string
+     */
+    public function getFriendlyName();
+
+    /**
+     * @param string $friendly_name
+     * @return $this
+     */
+    public function setFriendlyName($friendly_name);
+
+    /**
+     * @return IClient
+     */
+    public function getClient();
+
+    /**
+     * @param string $ip
+     * @return bool
+     */
+    public function isOwn($ip);
+
+    /**
+     * @return string
+     */
+    public function getIPAddresses();
+} 
\ No newline at end of file
diff --git a/app/libs/oauth2/models/IScope.php b/app/libs/OAuth2/Models/IScope.php
similarity index 95%
rename from app/libs/oauth2/models/IScope.php
rename to app/libs/OAuth2/Models/IScope.php
index af7bcd3e..38609c88 100644
--- a/app/libs/oauth2/models/IScope.php
+++ b/app/libs/OAuth2/Models/IScope.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Models;
 /**
 * Copyright 2015 OpenStack Foundation
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,12 +11,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 **/
-
-namespace oauth2\models;
-
 /**
  * Interface IScope
- * @package oauth2\models
+ * @package OAuth2\Models;
  */
 interface IScope {
     /**
diff --git a/app/libs/oauth2/models/IServerPrivateKey.php b/app/libs/OAuth2/Models/IServerPrivateKey.php
similarity index 71%
rename from app/libs/oauth2/models/IServerPrivateKey.php
rename to app/libs/OAuth2/Models/IServerPrivateKey.php
index bf568c99..06c1fe2c 100644
--- a/app/libs/oauth2/models/IServerPrivateKey.php
+++ b/app/libs/OAuth2/Models/IServerPrivateKey.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Models;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\models;
-
+use DateTime;
 /**
  * Interface IServerPrivateKey
- * @package oauth2\models
+ * @package OAuth2\Models
  */
-interface IServerPrivateKey extends IAssymetricKey
+interface IServerPrivateKey extends IAsymmetricKey
 {
     /**
      * @return string
@@ -27,8 +25,8 @@ interface IServerPrivateKey extends IAssymetricKey
 
     /**
     * @param string $kid
-    * @param \DateTime $valid_from
-    * @param \DateTime $valid_to
+    * @param DateTime $valid_from
+    * @param DateTime $valid_to
     * @param string $type
     * @param string $use
     * @param string $alg
@@ -37,5 +35,5 @@ interface IServerPrivateKey extends IAssymetricKey
     * @param null|string $password
     * @return IServerPrivateKey
     */
-    static function build($kid, \DateTime $valid_from, \DateTime $valid_to, $type, $use, $alg, $active, $pem_content, $password = null);
+    static function build($kid, DateTime $valid_from, DateTime $valid_to, $type, $use, $alg, $active, $pem_content, $password = null);
 }
\ No newline at end of file
diff --git a/app/libs/OAuth2/Models/IUserConsent.php b/app/libs/OAuth2/Models/IUserConsent.php
new file mode 100644
index 00000000..823a12a5
--- /dev/null
+++ b/app/libs/OAuth2/Models/IUserConsent.php
@@ -0,0 +1,34 @@
+<?php namespace OAuth2\Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Auth\User;
+/**
+ * Interface IUserConsent
+ * @package OAuth2\Models
+ */
+interface IUserConsent {
+    /**
+     * @return string
+     */
+    public function getScope();
+
+    /**
+     * @return IClient
+     */
+    public function getClient();
+
+    /**
+     * @return User
+     */
+    public function getUser();
+} 
\ No newline at end of file
diff --git a/app/libs/oauth2/models/JWTResponseInfo.php b/app/libs/OAuth2/Models/JWTResponseInfo.php
similarity index 95%
rename from app/libs/oauth2/models/JWTResponseInfo.php
rename to app/libs/OAuth2/Models/JWTResponseInfo.php
index 9a0dc5d4..d82bde15 100644
--- a/app/libs/oauth2/models/JWTResponseInfo.php
+++ b/app/libs/OAuth2/Models/JWTResponseInfo.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Models;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,16 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\models;
-
 use jwa\cryptographic_algorithms\content_encryption\ContentEncryptionAlgorithm;
 use jwa\cryptographic_algorithms\EncryptionAlgorithm;
 use jwa\cryptographic_algorithms\IntegrityCheckingAlgorithm;
-
 /**
  * Class JWTResponseInfo
- * @package oauth2\models
+ * @package OAuth2\Models
  */
 final class JWTResponseInfo
 {
diff --git a/app/libs/oauth2/models/Principal.php b/app/libs/OAuth2/Models/Principal.php
similarity index 55%
rename from app/libs/oauth2/models/Principal.php
rename to app/libs/OAuth2/Models/Principal.php
index 8f31a0da..132bae96 100644
--- a/app/libs/oauth2/models/Principal.php
+++ b/app/libs/OAuth2/Models/Principal.php
@@ -1,22 +1,7 @@
-<?php
-/**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-namespace oauth2\models;
-
+<?php namespace OAuth2\Models;
 /**
  * Class Principal
- * @package oauth2\models
+ * @package OAuth2\Models
  */
 final class Principal implements IPrincipal
 {
@@ -31,7 +16,7 @@ final class Principal implements IPrincipal
 
     /**
      * OP Browser state
-     * http://openid.net/specs/openid-connect-session-1_0.html#OPiframe
+     * @see http://openid.net/specs/openid-connect-session-1_0.html#OPiframe
      * @var string
      */
     private $opbs;
diff --git a/app/libs/oauth2/models/RefreshToken.php b/app/libs/OAuth2/Models/RefreshToken.php
similarity index 79%
rename from app/libs/oauth2/models/RefreshToken.php
rename to app/libs/OAuth2/Models/RefreshToken.php
index cab86d8e..51c88609 100644
--- a/app/libs/oauth2/models/RefreshToken.php
+++ b/app/libs/OAuth2/Models/RefreshToken.php
@@ -1,13 +1,20 @@
-<?php
-
-namespace oauth2\models;
-
-use Zend\Math\Rand;
-use utils\IPHelper;
-use oauth2\OAuth2Protocol;
+<?php namespace OAuth2\Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\IPHelper;
 /**
  * Class RefreshToken
- * http://tools.ietf.org/html/rfc6749#section-1.5
+ * @see http://tools.ietf.org/html/rfc6749#section-1.5
  *
  * The refresh token is also a secret bound to the client identifier and
  * client instance that originally requested the authorization; the
diff --git a/app/libs/oauth2/models/SecurityContext.php b/app/libs/OAuth2/Models/SecurityContext.php
similarity index 67%
rename from app/libs/oauth2/models/SecurityContext.php
rename to app/libs/OAuth2/Models/SecurityContext.php
index ff62ed0b..deef0d02 100644
--- a/app/libs/oauth2/models/SecurityContext.php
+++ b/app/libs/OAuth2/Models/SecurityContext.php
@@ -1,22 +1,7 @@
-<?php
-/**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-namespace oauth2\models;
-
+<?php namespace OAuth2\Models;
 /**
  * Class SecurityContext
- * @package oauth2\models
+ * @package OAuth2\Models
  */
 final class SecurityContext
 {
diff --git a/app/libs/oauth2/models/Token.php b/app/libs/OAuth2/Models/Token.php
similarity index 65%
rename from app/libs/oauth2/models/Token.php
rename to app/libs/OAuth2/Models/Token.php
index 10d6dc77..ab02b16c 100644
--- a/app/libs/oauth2/models/Token.php
+++ b/app/libs/OAuth2/Models/Token.php
@@ -1,33 +1,58 @@
-<?php
-
-namespace oauth2\models;
-
+<?php namespace OAuth2\Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 use DateInterval;
 use DateTime;
 use DateTimeZone;
-use utils\IPHelper;
-use utils\model\Identifier;
-
+use Utils\IPHelper;
+use Utils\Model\Identifier;
 /**
  * Class Token
  * Defines the common behavior for all emitted tokens
- * @package oauth2\models
+ * @package OAuth2\Models
  */
 abstract class Token extends Identifier
 {
 
     const DefaultByteLength = 32;
-
+    /**
+     * @var string
+     */
     protected $issued;
     /**
      * oauth2 client id
      * @var string
      */
     protected $client_id;
+    /**
+     * @var int
+     */
     protected $len;
+    /**
+     * @var string
+     */
     protected $scope;
+    /**
+     * @var string
+     */
     protected $audience;
+    /**
+     * @var string
+     */
     protected $from_ip;
+    /**
+     * @var bool
+     */
     protected $is_hashed;
     protected $user_id;
 
@@ -36,8 +61,8 @@ abstract class Token extends Identifier
         parent::__construct($len);
 
         $this->is_hashed = false;
-        $this->issued = gmdate("Y-m-d H:i:s", time());
-        $this->from_ip = IPHelper::getUserIp();
+        $this->issued    = gmdate("Y-m-d H:i:s", time());
+        $this->from_ip   = IPHelper::getUserIp();
     }
 
     public function getIssued()
@@ -45,6 +70,9 @@ abstract class Token extends Identifier
         return $this->issued;
     }
 
+    /**
+     * @return string
+     */
     public function getScope()
     {
         return $this->scope;
@@ -101,6 +129,9 @@ abstract class Token extends Identifier
         return $seconds;
     }
 
+    /**
+     * @return bool
+     */
     public function isHashed()
     {
         return $this->is_hashed;
diff --git a/app/libs/oauth2/models/TokenEndpointAuthInfo.php b/app/libs/OAuth2/Models/TokenEndpointAuthInfo.php
similarity index 57%
rename from app/libs/oauth2/models/TokenEndpointAuthInfo.php
rename to app/libs/OAuth2/Models/TokenEndpointAuthInfo.php
index 03023f20..1836f124 100644
--- a/app/libs/oauth2/models/TokenEndpointAuthInfo.php
+++ b/app/libs/OAuth2/Models/TokenEndpointAuthInfo.php
@@ -1,24 +1,20 @@
-<?php
+<?php namespace OAuth2\Models;
 /**
-* Copyright 2015 OpenStack Foundation
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-**/
-
-namespace oauth2\models;
-
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 use jwa\cryptographic_algorithms\IntegrityCheckingAlgorithm;
-
 /**
  * Class TokenEndpointAuthInfo
- * @package oauth2\models
+ * @package OAuth2\Models
  */
 final class TokenEndpointAuthInfo {
 
diff --git a/app/libs/oauth2/OAuth2Message.php b/app/libs/OAuth2/OAuth2Message.php
similarity index 58%
rename from app/libs/oauth2/OAuth2Message.php
rename to app/libs/OAuth2/OAuth2Message.php
index 840019e6..dd17e2e1 100644
--- a/app/libs/oauth2/OAuth2Message.php
+++ b/app/libs/OAuth2/OAuth2Message.php
@@ -1,27 +1,46 @@
-<?php
-
-namespace oauth2;
-
-use utils\http\HttpMessage;
-use oauth2\requests\OAuth2RequestMemento;
-
+<?php namespace OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Http\HttpMessage;
+use OAuth2\Requests\OAuth2RequestMemento;
 /**
  * Class OAuth2Message
- * @package oauth2
+ * @package OAuth2
  */
 class OAuth2Message extends HttpMessage
 {
+    /**
+     * OAuth2Message constructor.
+     * @param array $values
+     */
     public function __construct(array $values = array())
     {
         parent::__construct($values);
     }
 
+    /**
+     * @return string
+     */
     public function toString()
     {
         $string = var_export($this->container, true);
         return $string;
     }
 
+    /**
+     * @param string $param
+     * @return null|mixed
+     */
     public function getParam($param)
     {
         return isset($this->container[$param])? $this->container[$param] : null;
diff --git a/app/libs/oauth2/OAuth2Protocol.php b/app/libs/OAuth2/OAuth2Protocol.php
similarity index 92%
rename from app/libs/oauth2/OAuth2Protocol.php
rename to app/libs/OAuth2/OAuth2Protocol.php
index bc0e498e..f58bf29d 100644
--- a/app/libs/oauth2/OAuth2Protocol.php
+++ b/app/libs/OAuth2/OAuth2Protocol.php
@@ -1,6 +1,16 @@
-<?php
-
-namespace oauth2;
+<?php namespace OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
 use Exception;
 use jwa\JSONWebSignatureAndEncryptionAlgorithms;
@@ -8,58 +18,54 @@ use jwk\impl\JWKSet;
 use jwk\impl\RSAJWKFactory;
 use jwk\impl\RSAJWKPEMPrivateKeySpecification;
 use jwk\JSONWebKeyVisibility;
-use jws\IJWS;
 use jwt\IJWT;
-use jwt\impl\UnsecuredJWT;
-use oauth2\discovery\DiscoveryDocumentBuilder;
-use oauth2\discovery\IOpenIDProviderConfigurationService;
-use oauth2\endpoints\AuthorizationEndpoint;
-use oauth2\endpoints\TokenEndpoint;
-use oauth2\endpoints\TokenIntrospectionEndpoint;
-use oauth2\endpoints\TokenRevocationEndpoint;
-use oauth2\exceptions\ExpiredAccessTokenException;
-use oauth2\exceptions\InvalidClientException;
-use oauth2\exceptions\InvalidOAuth2Request;
-use oauth2\exceptions\OAuth2BaseException;
-use oauth2\exceptions\UriNotAllowedException;
-use oauth2\factories\OAuth2AuthorizationRequestFactory;
-use oauth2\grant_types\AuthorizationCodeGrantType;
-use oauth2\grant_types\ClientCredentialsGrantType;
-use oauth2\grant_types\HybridGrantType;
-use oauth2\grant_types\ImplicitGrantType;
-use oauth2\grant_types\RefreshBearerTokenGrantType;
-use oauth2\models\IClient;
-use oauth2\repositories\IServerPrivateKeyRepository;
-use oauth2\requests\OAuth2AuthenticationRequest;
-use oauth2\requests\OAuth2AuthorizationRequest;
-use oauth2\requests\OAuth2EndSessionRequest;
-use oauth2\requests\OAuth2LogoutRequest;
-use oauth2\requests\OAuth2Request;
-use oauth2\resource_server\IUserService;
-use oauth2\responses\OAuth2DirectErrorResponse;
-use oauth2\responses\OAuth2IndirectErrorResponse;
-use oauth2\responses\OAuth2LogoutResponse;
-use oauth2\responses\OAuth2TokenRevocationResponse;
-use oauth2\services\IApiScopeService;
-use oauth2\services\IClientJWKSetReader;
-use oauth2\services\IClientService;
-use oauth2\services\IMementoOAuth2SerializerService;
-use oauth2\services\IPrincipalService;
-use oauth2\services\ISecurityContextService;
-use oauth2\services\ITokenService;
-use oauth2\services\IUserConsentService;
-use oauth2\strategies\IOAuth2AuthenticationStrategy;
-use oauth2\strategies\OAuth2IndirectErrorResponseFactoryMethod;
-use utils\ArrayUtils;
+use OAuth2\Discovery\DiscoveryDocumentBuilder;
+use OAuth2\Discovery\IOpenIDProviderConfigurationService;
+use OAuth2\Endpoints\AuthorizationEndpoint;
+use OAuth2\Endpoints\TokenEndpoint;
+use OAuth2\Endpoints\TokenIntrospectionEndpoint;
+use OAuth2\Endpoints\TokenRevocationEndpoint;
+use OAuth2\Exceptions\ExpiredAccessTokenException;
+use OAuth2\Exceptions\InvalidClientException;
+use OAuth2\Exceptions\InvalidOAuth2Request;
+use OAuth2\Exceptions\OAuth2BaseException;
+use OAuth2\Exceptions\UriNotAllowedException;
+use OAuth2\Factories\OAuth2AuthorizationRequestFactory;
+use OAuth2\GrantTypes\AuthorizationCodeGrantType;
+use OAuth2\GrantTypes\ClientCredentialsGrantType;
+use OAuth2\GrantTypes\HybridGrantType;
+use OAuth2\GrantTypes\ImplicitGrantType;
+use OAuth2\GrantTypes\RefreshBearerTokenGrantType;
+use OAuth2\Models\IClient;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Services\ITokenService;
+use OAuth2\Repositories\IServerPrivateKeyRepository;
+use OAuth2\Requests\OAuth2LogoutRequest;
+use OAuth2\Requests\OAuth2Request;
+use OAuth2\ResourceServer\IUserService;
+use OAuth2\Responses\OAuth2DirectErrorResponse;
+use OAuth2\Responses\OAuth2LogoutResponse;
+use OAuth2\Responses\OAuth2Response;
+use OAuth2\Responses\OAuth2TokenRevocationResponse;
+use OAuth2\Services\IApiScopeService;
+use OAuth2\Services\IClientJWKSetReader;
+use OAuth2\Services\IClientService;
+use OAuth2\Services\IMementoOAuth2SerializerService;
+use OAuth2\Services\IPrincipalService;
+use OAuth2\Services\ISecurityContextService;
+use OAuth2\Services\IUserConsentService;
+use OAuth2\Strategies\IOAuth2AuthenticationStrategy;
+use OAuth2\Strategies\OAuth2IndirectErrorResponseFactoryMethod;
+use Utils\ArrayUtils;
 use utils\factories\BasicJWTFactory;
-use utils\services\IAuthService;
-use utils\services\ICheckPointService;
-use utils\services\ILogService;
+use Utils\Services\IAuthService;
+use Utils\Services\ICheckPointService;
+use Utils\Services\ILogService;
 
 /**
  * Class OAuth2Protocol
- * Implementation of http://tools.ietf.org/html/rfc6749
- * @package oauth2
+ * Implementation of @see http://tools.ietf.org/html/rfc6749
+ * @package OAuth2
  */
 final class OAuth2Protocol implements IOAuth2Protocol
 {
@@ -185,6 +191,7 @@ final class OAuth2Protocol implements IOAuth2Protocol
                 )
             )) === 0)
             return self::OAuth2Protocol_ResponseMode_Fragment;
+        return null;
     }
 
 
@@ -205,7 +212,7 @@ final class OAuth2Protocol implements IOAuth2Protocol
     const OAuth2Protocol_State                 = 'state';
 
     /**
-     * http://openid.net/specs/openid-connect-session-1_0.html#CreatingUpdatingSessions
+     * @see http://openid.net/specs/openid-connect-session-1_0.html#CreatingUpdatingSessions
      * In OpenID Connect, the session at the RP typically starts when the RP validates the End-User's ID Token. Refer
      * to the OpenID Connect Core 1.0 [OpenID.Core] specification to find out how to obtain an ID Token and validate it.
      * When the OP supports session management, it MUST also return the Session State as an additional session_state
@@ -413,10 +420,12 @@ final class OAuth2Protocol implements IOAuth2Protocol
 
         if($flow === OAuth2Protocol::OAuth2Protocol_GrantType_Hybrid)
             return $hybrid_flow;
+
+        return array();
     }
 
     /**
-     * http://openid.net/specs/oauth-v2-multiple-response-types-1_0.html#Terminology
+     * @see http://openid.net/specs/oauth-v2-multiple-response-types-1_0.html#Terminology
      *
      * The OAuth 2.0 specification allows for registration of space-separated response_type parameter values. If a
      * Response Type contains one of more space characters (%20), it is compared as a space-delimited list of values in
@@ -695,7 +704,7 @@ final class OAuth2Protocol implements IOAuth2Protocol
     );
 
     /**
-     * http://tools.ietf.org/html/rfc6749#appendix-A
+     * @see http://tools.ietf.org/html/rfc6749#appendix-A
      * VSCHAR     = %x20-7E
      */
     const VsChar = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_~';
@@ -709,11 +718,17 @@ final class OAuth2Protocol implements IOAuth2Protocol
      * @var ICheckPointService
      */
     private $checkpoint_service;
+
     /**
      * @var IClientService
      */
     private $client_service;
 
+    /**
+     * @var IClientRepository
+     */
+    private $client_repository;
+
     /**
      * @var IAuthService
      */
@@ -767,27 +782,13 @@ final class OAuth2Protocol implements IOAuth2Protocol
      * @var IMementoOAuth2SerializerService
      */
     private $memento_service;
-    /**
-     * @param ILogService $log_service
-     * @param IClientService $client_service
-     * @param ITokenService $token_service
-     * @param IAuthService $auth_service
-     * @param IOAuth2AuthenticationStrategy $auth_strategy
-     * @param ICheckPointService $checkpoint_service
-     * @param IApiScopeService $scope_service
-     * @param IUserConsentService $user_consent_service
-     * @param IServerPrivateKeyRepository $server_private_keys_repository
-     * @param IOpenIDProviderConfigurationService $oidc_provider_configuration_service
-     * @param IMementoOAuth2SerializerService $memento_service
-     * @param ISecurityContextService $security_context_service
-     * @param IPrincipalService $principal_service
-     * @param IServerPrivateKeyRepository $server_private_key_repository
-     * @param IClientJWKSetReader $jwk_set_reader_service
-     */
+
+
     public function __construct
     (
         ILogService    $log_service,
         IClientService $client_service,
+        IClientRepository $client_repository,
         ITokenService  $token_service,
         IAuthService   $auth_service,
         IOAuth2AuthenticationStrategy $auth_strategy,
@@ -812,6 +813,7 @@ final class OAuth2Protocol implements IOAuth2Protocol
         (
             $scope_service,
             $client_service,
+            $client_repository,
             $token_service,
             $auth_service,
             $auth_strategy,
@@ -828,6 +830,7 @@ final class OAuth2Protocol implements IOAuth2Protocol
         (
             $scope_service,
             $client_service,
+            $client_repository,
             $token_service,
             $auth_service,
             $auth_strategy,
@@ -844,6 +847,7 @@ final class OAuth2Protocol implements IOAuth2Protocol
         (
             $scope_service,
             $client_service,
+            $client_repository,
             $token_service,
             $auth_service,
             $auth_strategy,
@@ -859,6 +863,7 @@ final class OAuth2Protocol implements IOAuth2Protocol
         $refresh_bearer_token_grant_type  = new RefreshBearerTokenGrantType
         (
             $client_service,
+            $client_repository,
             $token_service,
             $log_service
         );
@@ -867,6 +872,7 @@ final class OAuth2Protocol implements IOAuth2Protocol
         (
             $scope_service,
             $client_service,
+            $client_repository,
             $token_service,
             $log_service
         );
@@ -880,21 +886,22 @@ final class OAuth2Protocol implements IOAuth2Protocol
         $this->log_service                = $log_service;
         $this->checkpoint_service         = $checkpoint_service;
         $this->client_service             = $client_service;
+        $this->client_repository          = $client_repository;
         $this->auth_service               = $auth_service;
         $this->principal_service          = $principal_service;
         $this->token_service              = $token_service;
 
         $this->authorize_endpoint         = new AuthorizationEndpoint($this);
         $this->token_endpoint             = new TokenEndpoint($this);
-        $this->revoke_endpoint            = new TokenRevocationEndpoint($this,$client_service, $token_service, $log_service);
-        $this->introspection_endpoint     = new TokenIntrospectionEndpoint($this, $client_service, $token_service, $auth_service, $log_service);
+        $this->revoke_endpoint            = new TokenRevocationEndpoint($this, $client_service, $client_repository, $token_service, $log_service);
+        $this->introspection_endpoint     = new TokenIntrospectionEndpoint($this, $client_service, $client_repository, $token_service, $auth_service, $log_service);
     }
 
     /**
      * @param OAuth2Request $request
-     * @return mixed|OAuth2IndirectErrorResponse
-     * @throws \Exception
-     * @throws exceptions\UriNotAllowedException
+     * @return OAuth2Response
+     * @throws Exception
+     * @throws UriNotAllowedException
      */
     public function authorize(OAuth2Request $request = null)
     {
@@ -966,7 +973,7 @@ final class OAuth2Protocol implements IOAuth2Protocol
 
     /**
      * @param OAuth2Request $request
-     * @return OAuth2DirectErrorResponse|void
+     * @return OAuth2Response
      */
     public function token(OAuth2Request $request = null)
     {
@@ -987,7 +994,7 @@ final class OAuth2Protocol implements IOAuth2Protocol
             $this->log_service->warning($ex1);
             $this->checkpoint_service->trackException($ex1);
 
-            return new OAuth2DirectErrorResponse($ex1->getError(), $ex1->getMessage());;
+            return new OAuth2DirectErrorResponse($ex1->getError(), $ex1->getMessage());
         }
         catch (Exception $ex)
         {
@@ -1004,9 +1011,9 @@ final class OAuth2Protocol implements IOAuth2Protocol
 
     /**
      * Revoke Token Endpoint
-     * http://tools.ietf.org/html/rfc7009
+     * @see http://tools.ietf.org/html/rfc7009
      * @param OAuth2Request $request
-     * @return mixed
+     * @return OAuth2Response
      */
     public function revoke(OAuth2Request $request = null){
 
@@ -1031,9 +1038,9 @@ final class OAuth2Protocol implements IOAuth2Protocol
 
     /**
      * Introspection Token Endpoint
-     * http://tools.ietf.org/html/draft-richer-oauth-introspection-04
+     * @see http://tools.ietf.org/html/draft-richer-oauth-introspection-04
      * @param OAuth2Request $request
-     * @return mixed
+     * @return OAuth2Response
      */
     public function introspection(OAuth2Request $request = null)
     {
@@ -1084,8 +1091,8 @@ final class OAuth2Protocol implements IOAuth2Protocol
      */
     static public function isClientAllowedToUseTokenEndpointAuth(IClient $client)
     {
-        return $client->client_type === IClient::ClientType_Confidential ||
-               $client->application_type === IClient::ApplicationType_Native;
+        return $client->getClientType() === IClient::ClientType_Confidential ||
+               $client->getApplicationType() === IClient::ApplicationType_Native;
     }
 
     static public function getTokenEndpointAuthMethodsPerClientType(IClient $client)
@@ -1212,7 +1219,7 @@ final class OAuth2Protocol implements IOAuth2Protocol
     }
 
     /**
-     * http://openid.net/specs/openid-connect-discovery-1_0.html
+     * @see http://openid.net/specs/openid-connect-discovery-1_0.html
      * @return string
      */
     public function getDiscoveryDocument()
@@ -1314,9 +1321,9 @@ final class OAuth2Protocol implements IOAuth2Protocol
     }
 
     /**
-     * http://openid.net/specs/openid-connect-session-1_0.html#RPLogout
-     * @param OAuth2Request|null $request
-     * @return null|OAuth2DirectErrorResponse
+     * @see http://openid.net/specs/openid-connect-session-1_0.html#RPLogout
+     * @param OAuth2Request $request
+     * @return OAuth2Response
      */
     public function endSession(OAuth2Request $request = null)
     {
@@ -1343,7 +1350,7 @@ final class OAuth2Protocol implements IOAuth2Protocol
 
             if(is_null($client_id)) throw new InvalidClientException('claim aud not set on id_token_hint!');
 
-            $client = $this->client_service->getClientById($client_id->getString());
+            $client = $this->client_repository->getClientById($client_id->getString());
 
             if(is_null($client)) throw new InvalidClientException('client not found!');
 
@@ -1377,20 +1384,19 @@ final class OAuth2Protocol implements IOAuth2Protocol
 
             return null;
         }
-
-        catch(OAuth2BaseException $ex1)
+        catch (UriNotAllowedException $ex1)
         {
             $this->log_service->warning($ex1);
             $this->checkpoint_service->trackException($ex1);
 
-            return new OAuth2DirectErrorResponse($ex1->getError(), $ex1->getMessage());;
+            return new OAuth2DirectErrorResponse(OAuth2Protocol::OAuth2Protocol_Error_UnauthorizedClient);
         }
-        catch (UriNotAllowedException $ex2)
+        catch(OAuth2BaseException $ex2)
         {
             $this->log_service->warning($ex2);
             $this->checkpoint_service->trackException($ex2);
 
-            return new OAuth2DirectErrorResponse(OAuth2Protocol::OAuth2Protocol_Error_UnauthorizedClient);
+            return new OAuth2DirectErrorResponse($ex2->getError(), $ex2->getMessage());
         }
         catch (Exception $ex)
         {
@@ -1427,7 +1433,7 @@ final class OAuth2Protocol implements IOAuth2Protocol
         $client_id = $request->getClientId();
         if (is_null($client_id))
             return null;
-        $client = $this->client_service->getClientById($client_id);
+        $client = $this->client_repository->getClientById($client_id);
         if (is_null($client))
             return null;
         if (!$client->isUriAllowed($redirect_uri))
diff --git a/app/libs/OAuth2/OAuth2ServiceProvider.php b/app/libs/OAuth2/OAuth2ServiceProvider.php
new file mode 100644
index 00000000..67ec82ec
--- /dev/null
+++ b/app/libs/OAuth2/OAuth2ServiceProvider.php
@@ -0,0 +1,39 @@
+<?php namespace OAuth2;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\App;
+
+/**
+ * Class OAuth2ServiceProvider
+ * @package OAuth2
+ */
+final class OAuth2ServiceProvider extends ServiceProvider
+{
+    protected $defer = true;
+
+    public function boot()
+    {
+    }
+
+    public function register()
+    {
+        App::singleton(\OAuth2\IOAuth2Protocol::class, \OAuth2\OAuth2Protocol::class);
+    }
+
+    public function provides()
+    {
+        return [\OAuth2\IOAuth2Protocol::class];
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Repositories/IAccessTokenRepository.php b/app/libs/OAuth2/Repositories/IAccessTokenRepository.php
new file mode 100644
index 00000000..c721f255
--- /dev/null
+++ b/app/libs/OAuth2/Repositories/IAccessTokenRepository.php
@@ -0,0 +1,76 @@
+<?php namespace OAuth2\Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+use Models\OAuth2\AccessToken;
+use Models\OAuth2\RefreshToken;
+use Utils\Db\IBaseRepository;
+
+/**
+ * Interface IAccessTokenRepository
+ * @package OAuth2\Repositories
+ */
+interface IAccessTokenRepository extends IBaseRepository
+{
+    /**
+     * @param int $client_identifier
+     * @param int $page_nbr
+     * @param int $page_size
+     * @return LengthAwarePaginator
+     */
+    function getAllByClientIdentifier($client_identifier, $page_nbr = 1, $page_size = 10);
+
+    /**
+     * @param int $client_identifier
+     * @param int $page_nbr
+     * @param int $page_size
+     * @return LengthAwarePaginator
+     */
+    function getAllValidByClientIdentifier($client_identifier, $page_nbr = 1, $page_size = 10);
+
+    /**
+     * @param int $user_id
+     * @param int $page_nbr
+     * @param int $page_size
+     * @return LengthAwarePaginator
+     */
+    function getAllByUserId($user_id, $page_nbr = 1, $page_size = 10);
+
+    /**
+     * @param int $user_id
+     * @param int $page_nbr
+     * @param int $page_size
+     * @return LengthAwarePaginator
+     */
+    function getAllValidByUserId($user_id, $page_nbr = 1, $page_size = 10);
+
+    /**
+     * @param string $hashed_value
+     * @return AccessToken
+     */
+    function getByValue($hashed_value);
+
+    /**
+     * @param string $hashed_value
+     * @return AccessToken
+     */
+    function getByAuthCode($hashed_value);
+
+    /**
+     * @param int $refresh_token_id
+     * @return AccessToken[]
+     */
+    function getByRefreshToken($refresh_token_id);
+
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Repositories/IApiEndpointRepository.php b/app/libs/OAuth2/Repositories/IApiEndpointRepository.php
new file mode 100644
index 00000000..fde65eeb
--- /dev/null
+++ b/app/libs/OAuth2/Repositories/IApiEndpointRepository.php
@@ -0,0 +1,43 @@
+<?php namespace OAuth2\Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\Models\IApiEndpoint;
+use Utils\Db\IBaseRepository;
+/**
+ * Interface IApiEndpointRepository
+ * @package OAuth2\Repositories
+ */
+interface IApiEndpointRepository extends IBaseRepository
+{
+    /**
+     * @param string $url
+     * @param string $http_method
+     * @return IApiEndpoint
+     */
+    public function getApiEndpointByUrlAndMethod($url, $http_method);
+
+    /**
+     * @param string $url
+     * @param string $http_method
+     * @param int $api_id
+     * @return IApiEndpoint
+     */
+    public function getApiEndpointByUrlAndMethodAndApi($url, $http_method, $api_id);
+
+    /**
+     * @param string $url
+     * @return IApiEndpoint
+     */
+    public function getApiEndpointByUrl($url);
+
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Repositories/IApiRepository.php b/app/libs/OAuth2/Repositories/IApiRepository.php
new file mode 100644
index 00000000..95ec58f2
--- /dev/null
+++ b/app/libs/OAuth2/Repositories/IApiRepository.php
@@ -0,0 +1,34 @@
+<?php namespace OAuth2\Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\Models\IApi;
+use Utils\Db\IBaseRepository;
+/**
+ * Interface IApiRepository
+ * @package OAuth2\Repositories
+ */
+interface IApiRepository extends IBaseRepository
+{
+    /**
+     * @param string $api_name
+     * @return IApi
+     */
+    public function getByName($api_name);
+
+    /**
+     * @param string $api_name
+     * @param int $resource_server_id
+     * @return IApi
+     */
+    public function getByNameAndResourceServer($api_name, $resource_server_id);
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Repositories/IApiScopeGroupRepository.php b/app/libs/OAuth2/Repositories/IApiScopeGroupRepository.php
new file mode 100644
index 00000000..53b7dcbb
--- /dev/null
+++ b/app/libs/OAuth2/Repositories/IApiScopeGroupRepository.php
@@ -0,0 +1,27 @@
+<?php namespace OAuth2\Repositories;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Models\OAuth2\ApiScopeGroup;
+use Utils\Db\IBaseRepository;
+/**
+ * Interface IApiScopeGroupRepository
+ * @package OAuth2\Repositories
+ */
+interface IApiScopeGroupRepository extends IBaseRepository
+{
+    /**
+     * @param string $name
+     * @return ApiScopeGroup
+     */
+    public function getByName($name);
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Repositories/IApiScopeRepository.php b/app/libs/OAuth2/Repositories/IApiScopeRepository.php
new file mode 100644
index 00000000..4602e1a8
--- /dev/null
+++ b/app/libs/OAuth2/Repositories/IApiScopeRepository.php
@@ -0,0 +1,42 @@
+<?php namespace OAuth2\Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\Models\IApiScope;
+use Utils\Db\IBaseRepository;
+/**
+ * Interface IApiScopeRepository
+ * @package OAuth2\Repositories
+ */
+interface IApiScopeRepository extends IBaseRepository
+{
+    /**
+     * @param array $scopes_names
+     * @return IApiScope[]
+     */
+    public function getByName(array $scopes_names);
+
+    /**
+     * @return IApiScope[]
+     */
+    public function getDefaults();
+
+    /**
+     * @return IApiScope[]
+     */
+    public function getActives();
+
+    /**
+     * @return IApiScope[]
+     */
+    public function getAssignableByGroups();
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/repositories/IAssymetricKeyRepository.php b/app/libs/OAuth2/Repositories/IAsymmetricKeyRepository.php
similarity index 58%
rename from app/libs/oauth2/repositories/IAssymetricKeyRepository.php
rename to app/libs/OAuth2/Repositories/IAsymmetricKeyRepository.php
index 7c1d0a4b..0c2ebd01 100644
--- a/app/libs/oauth2/repositories/IAssymetricKeyRepository.php
+++ b/app/libs/OAuth2/Repositories/IAsymmetricKeyRepository.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Repositories;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,26 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\repositories;
-
-use oauth2\models\IAssymetricKey;
-
+use OAuth2\Models\IAsymmetricKey;
+use Utils\Db\IBaseRepository;
 /**
- * Interface IAssymetricKeyRepository
- * @package oauth2\repositories
+ * Interface IAsymmetricKeyRepository
+ * @package OAuth2\Repositories
  */
-interface IAssymetricKeyRepository
+interface IAsymmetricKeyRepository extends IBaseRepository
 {
-    /**
-     * @param string $kid
-     * @return IAssymetricKey
-     */
-    public function get($kid);
-
     /**
      * @param string $pem
-     * @return IAssymetricKey
+     * @return IAsymmetricKey
      */
     public function getByPEM($pem);
 
@@ -41,39 +32,18 @@ interface IAssymetricKeyRepository
      * @param \DateTime $valid_from
      * @param \DateTime $valid_to
      * @param int|null $owner_id
-     * @return IAssymetricKey[]
+     * @return IAsymmetricKey[]
      */
     public function getByValidityRange($type, $usage, $alg, \DateTime $valid_from, \DateTime $valid_to, $owner_id = null);
 
     /**
      * @param int $id
-     * @return IAssymetricKey
+     * @return IAsymmetricKey
      */
     public function getById($id);
 
     /**
-     * @param IAssymetricKey $key
-     * @return void
-     */
-    public function add(IAssymetricKey $key);
-
-    /**
-     * @param IAssymetricKey $key
-     * @return void
-     */
-    public function delete(IAssymetricKey $key);
-
-    /**
-     * @param int $page_nbr
-     * @param int $page_size
-     * @param array $filters
-     * @param array $fields
-     * @return IAssymetricKey[]
-     */
-    public function getAll($page_nbr = 1, $page_size = 10, array $filters = array(), array $fields = array('*'));
-
-    /**
-     * @return IAssymetricKey[]
+     * @return IAsymmetricKey[]
      */
     public function getActives();
 
@@ -82,7 +52,7 @@ interface IAssymetricKeyRepository
      * @param string $usage
      * @param string $alg
      * @param int|null $owner_id
-     * @return IAssymetricKey
+     * @return IAsymmetricKey
      */
     public function getActiveByCriteria($type, $usage, $alg, $owner_id = null);
 
diff --git a/app/libs/OAuth2/Repositories/IClientPublicKeyRepository.php b/app/libs/OAuth2/Repositories/IClientPublicKeyRepository.php
new file mode 100644
index 00000000..8d4ecf56
--- /dev/null
+++ b/app/libs/OAuth2/Repositories/IClientPublicKeyRepository.php
@@ -0,0 +1,9 @@
+<?php namespace OAuth2\Repositories;
+/**
+ * Interface IClientPublicKeyRepository
+ * @package OAuth2\Repositories
+ */
+interface IClientPublicKeyRepository extends IAsymmetricKeyRepository
+{
+
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/repositories/IClientRepository.php b/app/libs/OAuth2/Repositories/IClientRepository.php
similarity index 64%
rename from app/libs/oauth2/repositories/IClientRepository.php
rename to app/libs/OAuth2/Repositories/IClientRepository.php
index 0c48a815..0fe53d2f 100644
--- a/app/libs/oauth2/repositories/IClientRepository.php
+++ b/app/libs/OAuth2/Repositories/IClientRepository.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Repositories;
 /**
 * Copyright 2015 OpenStack Foundation
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,39 +11,35 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 **/
-
-namespace oauth2\repositories;
-
-use oauth2\models\IClient;
-
+use OAuth2\Models\IClient;
+use Utils\Db\IBaseRepository;
 /**
  * Interface IClientRepository
- * @package oauth2\repositories
+ * @package OAuth2\Repositories
  */
-interface IClientRepository
+interface IClientRepository extends IBaseRepository
 {
-
-    /**
-     * @param int id
-     * @return IClient
-     */
-    public function get($id);
-
-    /**
-     * @param IClient $client
-     * @return void
-     */
-    public function add(IClient $client);
-
-    /**
-     * @param IClient $client
-     * @return void
-     */
-    public function delete(IClient $client);
-
     /**
      * @param string $app_name
      * @return IClient
      */
     public function getByApplicationName($app_name);
+
+    /**
+     * @param string $client_id
+     * @return IClient
+     */
+    public function getClientById($client_id);
+
+    /**
+     * @param int $id
+     * @return IClient
+     */
+    public function getClientByIdentifier($id);
+
+    /**
+     * @param string $origin
+     * @return IClient
+     */
+    public function getByOrigin($origin);
 }
\ No newline at end of file
diff --git a/app/libs/OAuth2/Repositories/IRefreshTokenRepository.php b/app/libs/OAuth2/Repositories/IRefreshTokenRepository.php
new file mode 100644
index 00000000..b91c7965
--- /dev/null
+++ b/app/libs/OAuth2/Repositories/IRefreshTokenRepository.php
@@ -0,0 +1,62 @@
+<?php namespace OAuth2\Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+use Models\OAuth2\RefreshToken;
+use Utils\Db\IBaseRepository;
+
+/**
+ * Interface IRefreshTokenRepository
+ * @package OAuth2\Repositories
+ */
+interface IRefreshTokenRepository extends IBaseRepository
+{
+    /**
+     * @param int $client_identifier
+     * @param int $page_nbr
+     * @param int $page_size
+     * @return LengthAwarePaginator
+     */
+    function getAllByClientIdentifier($client_identifier, $page_nbr = 1, $page_size = 10);
+
+    /**
+     * @param int $client_identifier
+     * @param int $page_nbr
+     * @param int $page_size
+     * @return LengthAwarePaginator
+     */
+    function getAllValidByClientIdentifier($client_identifier, $page_nbr = 1, $page_size = 10);
+
+    /**
+     * @param int $user_id
+     * @param int $page_nbr
+     * @param int $page_size
+     * @return LengthAwarePaginator
+     */
+    function getAllByUserId($user_id, $page_nbr = 1, $page_size = 10);
+
+    /**
+     * @param int $user_id
+     * @param int $page_nbr
+     * @param int $page_size
+     * @return LengthAwarePaginator
+     */
+    function getAllValidByUserId($user_id, $page_nbr = 1, $page_size = 10);
+
+    /**
+     * @param $hashed_value
+     * @return RefreshToken
+     */
+    function getByValue($hashed_value);
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Repositories/IResourceServerRepository.php b/app/libs/OAuth2/Repositories/IResourceServerRepository.php
new file mode 100644
index 00000000..84ce1fad
--- /dev/null
+++ b/app/libs/OAuth2/Repositories/IResourceServerRepository.php
@@ -0,0 +1,49 @@
+<?php namespace OAuth2\Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\Models\IResourceServer;
+use Utils\Db\IBaseRepository;
+
+/**
+ * Interface IResourceServerRepository
+ * @package OAuth2\Repositories
+ */
+interface IResourceServerRepository extends IBaseRepository
+{
+    /**
+     * @param string $host
+     * @return IResourceServer
+     */
+    public function getByHost($host);
+
+    /**
+     * @param string $ip
+     * @return IResourceServer
+     */
+    public function getByIp($ip);
+
+    /**
+     * @param string $name
+     * @return IResourceServer
+     */
+    public function getByFriendlyName($name);
+
+    /**
+     * @param array $audience
+     * @param string $ip
+     * @return IResourceServer
+     */
+    public function getByAudienceAndIpAndActive(array $audience, $ip);
+
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/repositories/IServerPrivateKeyRepository.php b/app/libs/OAuth2/Repositories/IServerPrivateKeyRepository.php
similarity index 82%
rename from app/libs/oauth2/repositories/IServerPrivateKeyRepository.php
rename to app/libs/OAuth2/Repositories/IServerPrivateKeyRepository.php
index 5183880e..8e5ca253 100644
--- a/app/libs/oauth2/repositories/IServerPrivateKeyRepository.php
+++ b/app/libs/OAuth2/Repositories/IServerPrivateKeyRepository.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Repositories;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,13 +12,11 @@
  * limitations under the License.
  **/
 
-namespace oauth2\repositories;
-
 /**
  * Interface IServerPrivateKeyRepository
- * @package oauth2\repositories
+ * @package OAuth2\Repositories
  */
-interface IServerPrivateKeyRepository extends IAssymetricKeyRepository
+interface IServerPrivateKeyRepository extends IAsymmetricKeyRepository
 {
 
 }
\ No newline at end of file
diff --git a/app/config/packages/greggilbert/recaptcha/.gitkeep b/app/libs/OAuth2/Requests/.gitkeep
similarity index 100%
rename from app/config/packages/greggilbert/recaptcha/.gitkeep
rename to app/libs/OAuth2/Requests/.gitkeep
diff --git a/app/libs/OAuth2/Requests/OAuth2AccessTokenRequestAuthCode.php b/app/libs/OAuth2/Requests/OAuth2AccessTokenRequestAuthCode.php
new file mode 100644
index 00000000..55aee725
--- /dev/null
+++ b/app/libs/OAuth2/Requests/OAuth2AccessTokenRequestAuthCode.php
@@ -0,0 +1,77 @@
+<?php namespace OAuth2\Requests;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\OAuth2Protocol;
+use OAuth2\OAuth2Message;
+
+/**
+ * Class OAuth2AccessTokenRequest
+ * @see http://tools.ietf.org/html/rfc6749#section-4.1.3
+ * @package OAuth2\Requests
+ */
+class OAuth2AccessTokenRequestAuthCode extends OAuth2TokenRequest
+{
+
+    /**
+     * OAuth2AccessTokenRequestAuthCode constructor.
+     * @param OAuth2Message $msg
+     */
+    public function __construct(OAuth2Message $msg)
+    {
+        parent::__construct($msg);
+    }
+
+    /**
+     * @return bool
+     */
+    public function isValid()
+    {
+        if (!parent::isValid())
+            return false;
+
+        $redirect_uri = $this->getRedirectUri();
+
+        if (is_null($redirect_uri))
+        {
+            $this->last_validation_error = 'redirect_uri not set';
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getRedirectUri()
+    {
+        return $this->getParam(OAuth2Protocol::OAuth2Protocol_RedirectUri);
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getClientId()
+    {
+        return $this->getParam(OAuth2Protocol::OAuth2Protocol_ClientId);
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getCode()
+    {
+        return $this->getParam(OAuth2Protocol::OAuth2Protocol_ResponseType_Code);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Requests/OAuth2AccessTokenRequestClientCredentials.php b/app/libs/OAuth2/Requests/OAuth2AccessTokenRequestClientCredentials.php
new file mode 100644
index 00000000..af090caf
--- /dev/null
+++ b/app/libs/OAuth2/Requests/OAuth2AccessTokenRequestClientCredentials.php
@@ -0,0 +1,52 @@
+<?php namespace OAuth2\Requests;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\OAuth2Protocol;
+use OAuth2\OAuth2Message;
+
+/**
+ * Class OAuth2AccessTokenRequestClientCredentials
+ * @see http://tools.ietf.org/html/rfc6749#section-4.4.2
+ * @package OAuth2\Requests
+ */
+class OAuth2AccessTokenRequestClientCredentials extends OAuth2TokenRequest {
+
+    /**
+     * OAuth2AccessTokenRequestClientCredentials constructor.
+     * @param OAuth2Message $msg
+     */
+    public function __construct(OAuth2Message $msg)
+    {
+        parent::__construct($msg);
+    }
+
+    /**
+     * @return bool
+     */
+    public function isValid()
+    {
+        if (!parent::isValid())
+            return false;
+
+        return true;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getScope()
+    {
+        return $this->getParam(OAuth2Protocol::OAuth2Protocol_Scope);
+    }
+} 
\ No newline at end of file
diff --git a/app/libs/OAuth2/Requests/OAuth2AccessTokenValidationRequest.php b/app/libs/OAuth2/Requests/OAuth2AccessTokenValidationRequest.php
new file mode 100644
index 00000000..81692b60
--- /dev/null
+++ b/app/libs/OAuth2/Requests/OAuth2AccessTokenValidationRequest.php
@@ -0,0 +1,55 @@
+<?php namespace OAuth2\Requests;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\OAuth2Protocol;
+use OAuth2\OAuth2Message;
+
+/**
+ * Class OAuth2AccessTokenValidationRequest
+ * @package OAuth2\Requests
+ */
+class OAuth2AccessTokenValidationRequest  extends OAuth2Request {
+
+    /**
+     * OAuth2AccessTokenValidationRequest constructor.
+     * @param OAuth2Message $msg
+     */
+    public function __construct(OAuth2Message $msg)
+    {
+        parent::__construct($msg);
+    }
+
+    /**
+     * @return bool
+     */
+    public function isValid()
+    {
+        $this->last_validation_error = '';
+        $token = $this->getToken();
+
+        if(is_null($token)) {
+            $this->last_validation_error = 'token not set';
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getToken(){
+        return $this->getParam(OAuth2Protocol::OAuth2Protocol_Token);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/requests/OAuth2AuthenticationRequest.php b/app/libs/OAuth2/Requests/OAuth2AuthenticationRequest.php
similarity index 96%
rename from app/libs/oauth2/requests/OAuth2AuthenticationRequest.php
rename to app/libs/OAuth2/Requests/OAuth2AuthenticationRequest.php
index f446e92f..e0c0b2a9 100644
--- a/app/libs/oauth2/requests/OAuth2AuthenticationRequest.php
+++ b/app/libs/OAuth2/Requests/OAuth2AuthenticationRequest.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Requests;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,22 +12,22 @@
  * limitations under the License.
  **/
 
-namespace oauth2\requests;
-
-use oauth2\exceptions\InvalidOAuth2Request;
-use oauth2\OAuth2Protocol;
-use oauth2\resource_server\IUserService;
+use OAuth2\OAuth2Protocol;
+use OAuth2\ResourceServer\IUserService;
 
 /**
  * Class OAuth2AuthenticationRequest
- * @package oauth2\requests
- * http://openid.net/specs/openid-connect-core-1_0.html#AuthRequest
+ * @package OAuth2\Requests
+ * @see http://openid.net/specs/openid-connect-core-1_0.html#AuthRequest
  * An Authentication Request is an OAuth 2.0 Authorization Request that requests that the End-User be authenticated by
  * the Authorization Server.
  */
 class OAuth2AuthenticationRequest extends OAuth2AuthorizationRequest
 {
 
+    /**
+     * @var array
+     */
     public static $optional_params = array
     (
         OAuth2Protocol::OAuth2Protocol_Nonce,
@@ -121,7 +121,7 @@ class OAuth2AuthenticationRequest extends OAuth2AuthorizationRequest
     }
 
     /**
-     * http://openid.net/specs/oauth-v2-multiple-response-types-1_0.html#ResponseModes
+     * @see http://openid.net/specs/oauth-v2-multiple-response-types-1_0.html#ResponseModes
      * The Response Mode request parameter response_mode informs the Authorization Server of the mechanism to be used
      * for returning Authorization Response parameters from the Authorization Endpoint
      */
@@ -236,7 +236,6 @@ class OAuth2AuthenticationRequest extends OAuth2AuthorizationRequest
         return $res;
     }
 
-
     /**
      * @param string $param_name
      * @return bool
diff --git a/app/libs/oauth2/requests/OAuth2AuthorizationRequest.php b/app/libs/OAuth2/Requests/OAuth2AuthorizationRequest.php
similarity index 88%
rename from app/libs/oauth2/requests/OAuth2AuthorizationRequest.php
rename to app/libs/OAuth2/Requests/OAuth2AuthorizationRequest.php
index c42e057b..512c011c 100644
--- a/app/libs/oauth2/requests/OAuth2AuthorizationRequest.php
+++ b/app/libs/OAuth2/Requests/OAuth2AuthorizationRequest.php
@@ -1,14 +1,25 @@
-<?php
+<?php namespace OAuth2\Requests;
 
-namespace oauth2\requests;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-use oauth2\OAuth2Message;
-use oauth2\OAuth2Protocol;
+use OAuth2\OAuth2Message;
+use OAuth2\OAuth2Protocol;
 
 /**
  * Class OAuth2AuthorizationRequest
- * http://tools.ietf.org/html/rfc6749#section-4.1.1
- * @package oauth2\requests
+ * @see http://tools.ietf.org/html/rfc6749#section-4.1.1
+ * @package OAuth2\Requests
  */
 class OAuth2AuthorizationRequest extends OAuth2Request
 {
diff --git a/app/libs/oauth2/requests/OAuth2LogoutRequest.php b/app/libs/OAuth2/Requests/OAuth2LogoutRequest.php
similarity index 90%
rename from app/libs/oauth2/requests/OAuth2LogoutRequest.php
rename to app/libs/OAuth2/Requests/OAuth2LogoutRequest.php
index 6c347b34..58e68f08 100644
--- a/app/libs/oauth2/requests/OAuth2LogoutRequest.php
+++ b/app/libs/OAuth2/Requests/OAuth2LogoutRequest.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Requests;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,26 +12,26 @@
  * limitations under the License.
  **/
 
-namespace oauth2\requests;
-
-use oauth2\OAuth2Message;
-use oauth2\OAuth2Protocol;
+use OAuth2\OAuth2Message;
+use OAuth2\OAuth2Protocol;
 
 /**
  * OpenID Connect logout request initiated by the relying party (RP).
  *
  * Class OAuth2LogoutRequest
- * @package oauth2\requests
+ * @package OAuth2\Requests
  */
 final class OAuth2LogoutRequest extends OAuth2Request
 {
-
+    /**
+     * OAuth2LogoutRequest constructor.
+     * @param OAuth2Message $msg
+     */
     public function __construct(OAuth2Message $msg)
     {
         parent::__construct($msg);
     }
 
-
     /**
      * @return bool
      */
diff --git a/app/libs/OAuth2/Requests/OAuth2RefreshAccessTokenRequest.php b/app/libs/OAuth2/Requests/OAuth2RefreshAccessTokenRequest.php
new file mode 100644
index 00000000..78c2bdc7
--- /dev/null
+++ b/app/libs/OAuth2/Requests/OAuth2RefreshAccessTokenRequest.php
@@ -0,0 +1,64 @@
+<?php namespace OAuth2\Requests;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\OAuth2Protocol;
+use OAuth2\OAuth2Message;
+
+/**
+ * Class OAuth2RefreshAccessTokenRequest
+ * @package OAuth2\Requests
+ */
+class OAuth2RefreshAccessTokenRequest extends OAuth2TokenRequest {
+
+    /**
+     * OAuth2RefreshAccessTokenRequest constructor.
+     * @param OAuth2Message $msg
+     */
+    public function __construct(OAuth2Message $msg)
+    {
+        parent::__construct($msg);
+    }
+
+    /**
+     * @return bool
+     */
+    public function isValid()
+    {
+        if(!parent::isValid())
+            return false;
+
+        $refresh_token = $this->getRefreshToken();
+
+        if(is_null($refresh_token)) {
+            $this->last_validation_error = 'refresh_token not set';
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getRefreshToken(){
+        return $this->getParam(OAuth2Protocol::OAuth2Protocol_RefreshToken);
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getScope(){
+        return $this->getParam(OAuth2Protocol::OAuth2Protocol_Scope);
+    }
+} 
\ No newline at end of file
diff --git a/app/libs/oauth2/requests/OAuth2Request.php b/app/libs/OAuth2/Requests/OAuth2Request.php
similarity index 64%
rename from app/libs/oauth2/requests/OAuth2Request.php
rename to app/libs/OAuth2/Requests/OAuth2Request.php
index 1bb8267e..0aeb3a58 100644
--- a/app/libs/oauth2/requests/OAuth2Request.php
+++ b/app/libs/OAuth2/Requests/OAuth2Request.php
@@ -1,11 +1,22 @@
-<?php
-namespace oauth2\requests;
-
-use oauth2\OAuth2Message;
+<?php namespace OAuth2\Requests;
 
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\OAuth2Message;
 /**
  * Class OAuth2Request
- * @package oauth2\requests
+ * @package OAuth2\Requests
  */
 abstract class OAuth2Request {
 
diff --git a/app/libs/oauth2/requests/OAuth2RequestMemento.php b/app/libs/OAuth2/Requests/OAuth2RequestMemento.php
similarity index 92%
rename from app/libs/oauth2/requests/OAuth2RequestMemento.php
rename to app/libs/OAuth2/Requests/OAuth2RequestMemento.php
index b0f6ac9a..865dae28 100644
--- a/app/libs/oauth2/requests/OAuth2RequestMemento.php
+++ b/app/libs/OAuth2/Requests/OAuth2RequestMemento.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace OAuth2\Requests;
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,14 +12,12 @@
  * limitations under the License.
  **/
 
-namespace oauth2\requests;
-
-use oauth2\OAuth2Message;
+use OAuth2\OAuth2Message;
 use ReflectionObject;
 
 /**
  * Class OAuth2RequestMemento
- * @package oauth2\requests
+ * @package OAuth2\Requests
  */
 class OAuth2RequestMemento
 {
@@ -27,6 +25,7 @@ class OAuth2RequestMemento
      * @var array
      */
     protected $state  = array();
+
     /**
      * @param array $state
      */
diff --git a/app/libs/OAuth2/Requests/OAuth2TokenRequest.php b/app/libs/OAuth2/Requests/OAuth2TokenRequest.php
new file mode 100644
index 00000000..9fcb144f
--- /dev/null
+++ b/app/libs/OAuth2/Requests/OAuth2TokenRequest.php
@@ -0,0 +1,59 @@
+<?php namespace OAuth2\Requests;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\OAuth2Message;
+use OAuth2\OAuth2Protocol;
+
+/**
+ * Class OAuth2TokenRequest
+ * Base Token Request
+ * @package oauth2\requests
+ */
+class OAuth2TokenRequest extends OAuth2Request
+{
+
+    /**
+     * OAuth2TokenRequest constructor.
+     * @param OAuth2Message $msg
+     */
+    public function __construct(OAuth2Message $msg)
+    {
+        parent::__construct($msg);
+    }
+
+    /**
+     * @return bool
+     */
+    public function isValid()
+    {
+        $this->last_validation_error = '';
+
+        $grant_type = $this->getGrantType();
+
+        if(is_null($grant_type)) {
+            $this->last_validation_error = 'grant_type not set';
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getGrantType()
+    {
+        return $this->getParam(OAuth2Protocol::OAuth2Protocol_GrantType);
+    }
+} 
\ No newline at end of file
diff --git a/app/libs/OAuth2/Requests/OAuth2TokenRevocationRequest.php b/app/libs/OAuth2/Requests/OAuth2TokenRevocationRequest.php
new file mode 100644
index 00000000..787d82b2
--- /dev/null
+++ b/app/libs/OAuth2/Requests/OAuth2TokenRevocationRequest.php
@@ -0,0 +1,63 @@
+<?php namespace OAuth2\Requests;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\OAuth2Message;
+use OAuth2\OAuth2Protocol;
+
+/**
+ * Class OAuth2TokenRevocationRequest
+ * @package OAuth2\Requests
+ */
+class OAuth2TokenRevocationRequest extends OAuth2Request {
+
+    /**
+     * OAuth2TokenRevocationRequest constructor.
+     * @param OAuth2Message $msg
+     */
+    public function __construct(OAuth2Message $msg)
+    {
+        parent::__construct($msg);
+    }
+
+    /**
+     * @return bool
+     */
+    public function isValid()
+    {
+        $this->last_validation_error = '';
+
+        $token = $this->getToken();
+
+        if(is_null($token)) {
+            $this->last_validation_error = 'token not set';
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getToken(){
+        return $this->getParam(OAuth2Protocol::OAuth2Protocol_Token);
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getTokenHint(){
+        return $this->getParam(OAuth2Protocol::OAuth2Protocol_TokenType_Hint);
+    }
+} 
\ No newline at end of file
diff --git a/app/libs/oauth2/resource_server/IUserService.php b/app/libs/OAuth2/ResourceServer/IUserService.php
similarity index 53%
rename from app/libs/oauth2/resource_server/IUserService.php
rename to app/libs/OAuth2/ResourceServer/IUserService.php
index 09977d04..66a0a40f 100644
--- a/app/libs/oauth2/resource_server/IUserService.php
+++ b/app/libs/OAuth2/ResourceServer/IUserService.php
@@ -1,12 +1,20 @@
-<?php
-
-namespace oauth2\resource_server;
-
+<?php namespace OAuth2\ResourceServer;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 use jwt\impl\JWTClaimSet;
-
 /**
  * Interface IUserService
- * @package oauth2\resource_server
+ * @package OAuth2\ResourceServer
  */
 interface IUserService
 {
@@ -25,6 +33,9 @@ interface IUserService
     */
     const UserProfileScope_Address   = 'address';
 
+    /**
+     * @return mixed
+     */
     public function getCurrentUserInfo();
 
     /**
diff --git a/app/libs/OAuth2/ResourceServer/OAuth2ProtectedService.php b/app/libs/OAuth2/ResourceServer/OAuth2ProtectedService.php
new file mode 100644
index 00000000..d6b82ea6
--- /dev/null
+++ b/app/libs/OAuth2/ResourceServer/OAuth2ProtectedService.php
@@ -0,0 +1,44 @@
+<?php namespace OAuth2\ResourceServer;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\IResourceServerContext;
+use Utils\Services\ILogService;
+
+/**
+ * Class OAuth2ProtectedService
+ * Base Class for OAUTH2 protected endpoints
+ * @package OAuth2\ResourceServer
+ */
+abstract class OAuth2ProtectedService
+{
+
+    /**
+     * @var IResourceServerContext
+     */
+    protected $resource_server_context;
+    /**
+     * @var ILogService
+     */
+    protected $log_service;
+
+    /**
+     * @param IResourceServerContext $resource_server_context
+     * @param ILogService $log_service
+     */
+    public function __construct(IResourceServerContext $resource_server_context, ILogService $log_service)
+    {
+        $this->log_service             = $log_service;
+        $this->resource_server_context = $resource_server_context;
+    }
+} 
\ No newline at end of file
diff --git a/app/config/packages/greggilbert/recaptcha/dev/.gitkeep b/app/libs/OAuth2/Responses/.gitkeep
similarity index 100%
rename from app/config/packages/greggilbert/recaptcha/dev/.gitkeep
rename to app/libs/OAuth2/Responses/.gitkeep
diff --git a/app/libs/oauth2/responses/OAuth2AccessTokenFragmentResponse.php b/app/libs/OAuth2/Responses/OAuth2AccessTokenFragmentResponse.php
similarity index 51%
rename from app/libs/oauth2/responses/OAuth2AccessTokenFragmentResponse.php
rename to app/libs/OAuth2/Responses/OAuth2AccessTokenFragmentResponse.php
index d8c694aa..e9dcdf72 100644
--- a/app/libs/oauth2/responses/OAuth2AccessTokenFragmentResponse.php
+++ b/app/libs/OAuth2/Responses/OAuth2AccessTokenFragmentResponse.php
@@ -1,22 +1,30 @@
-<?php
-
-namespace oauth2\responses;
-
-use oauth2\OAuth2Protocol;
-
+<?php namespace OAuth2\Responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\OAuth2Protocol;
 /**
  * Class OAuth2AccessTokenFragmentResponse
- * @package oauth2\responses
+ * @package OAuth2\Responses
  */
 class OAuth2AccessTokenFragmentResponse extends OAuth2IndirectFragmentResponse
 {
 
     /**
-     * @param $return_to
-     * @param $access_token
-     * @param $expires_in
-     * @param null $scope
-     * @param null $state
+     * @param string $return_to
+     * @param string $access_token
+     * @param int $expires_in
+     * @param null|string $scope
+     * @param null|string $state
      */
     public function __construct($return_to, $access_token, $expires_in, $scope = null, $state = null)
     {
diff --git a/app/libs/oauth2/responses/OAuth2AccessTokenResponse.php b/app/libs/OAuth2/Responses/OAuth2AccessTokenResponse.php
similarity index 59%
rename from app/libs/oauth2/responses/OAuth2AccessTokenResponse.php
rename to app/libs/OAuth2/Responses/OAuth2AccessTokenResponse.php
index 03b8d7d6..cdff1e84 100644
--- a/app/libs/oauth2/responses/OAuth2AccessTokenResponse.php
+++ b/app/libs/OAuth2/Responses/OAuth2AccessTokenResponse.php
@@ -1,15 +1,24 @@
-<?php
-
-namespace oauth2\responses;
-
-use oauth2\OAuth2Protocol;
-use utils\http\HttpContentType;
+<?php namespace OAuth2\Responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
+use OAuth2\OAuth2Protocol;
+use Utils\Http\HttpContentType;
 
 /**
  * Class OAuth2AccessTokenResponse
- * http://tools.ietf.org/html/rfc6749#section-4.1.4
- * @package oauth2\responses
+ * @see http://tools.ietf.org/html/rfc6749#section-4.1.4
+ * @package OAuth2\Responses
  */
 class OAuth2AccessTokenResponse extends OAuth2DirectResponse
 {
diff --git a/app/libs/oauth2/responses/OAuth2AccessTokenValidationResponse.php b/app/libs/OAuth2/Responses/OAuth2AccessTokenValidationResponse.php
similarity index 71%
rename from app/libs/oauth2/responses/OAuth2AccessTokenValidationResponse.php
rename to app/libs/OAuth2/Responses/OAuth2AccessTokenValidationResponse.php
index 2382dbeb..b7e644ae 100644
--- a/app/libs/oauth2/responses/OAuth2AccessTokenValidationResponse.php
+++ b/app/libs/OAuth2/Responses/OAuth2AccessTokenValidationResponse.php
@@ -1,15 +1,26 @@
-<?php
+<?php namespace OAuth2\Responses;
 
-namespace oauth2\responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-use oauth2\models\IClient;
-use oauth2\OAuth2Protocol;
-use openid\model\IOpenIdUser;
-use utils\http\HttpContentType;
+use OAuth2\Models\IClient;
+use OAuth2\OAuth2Protocol;
+use OpenId\Models\IOpenIdUser;
+use Utils\Http\HttpContentType;
 
 /**
  * Class OAuth2AccessTokenValidationResponse
- * @package oauth2\responses
+ * @package OAuth2\Responses
  */
 class OAuth2AccessTokenValidationResponse extends OAuth2DirectResponse {
 
diff --git a/app/libs/oauth2/responses/OAuth2AuthorizationResponse.php b/app/libs/OAuth2/Responses/OAuth2AuthorizationResponse.php
similarity index 56%
rename from app/libs/oauth2/responses/OAuth2AuthorizationResponse.php
rename to app/libs/OAuth2/Responses/OAuth2AuthorizationResponse.php
index ee1150ab..6d6200cb 100644
--- a/app/libs/oauth2/responses/OAuth2AuthorizationResponse.php
+++ b/app/libs/OAuth2/Responses/OAuth2AuthorizationResponse.php
@@ -1,23 +1,34 @@
-<?php
+<?php namespace OAuth2\Responses;
 
-namespace oauth2\responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-use oauth2\OAuth2Protocol;
+use OAuth2\OAuth2Protocol;
 
 /**
  * Class OAuth2AuthorizationResponse
- * http://tools.ietf.org/html/rfc6749#section-4.1.2
- * @package oauth2\responses
+ * @see http://tools.ietf.org/html/rfc6749#section-4.1.2
+ * @package OAuth2\Responses
  */
 class OAuth2AuthorizationResponse extends OAuth2IndirectResponse
 {
 
     /**
-     * @param $return_url
-     * @param $code
-     * @param null $scope
-     * @param null $state
-     * @param null $session_state
+     * @param string $return_url
+     * @param string $code
+     * @param null|string $scope
+     * @param null|string $state
+     * @param null|string $session_state
      */
     public function __construct($return_url, $code, $scope = null, $state = null, $session_state = null)
     {
@@ -35,22 +46,33 @@ class OAuth2AuthorizationResponse extends OAuth2IndirectResponse
             $this[OAuth2Protocol::OAuth2Protocol_Session_State] = $session_state;
     }
 
+    /**
+     * @return null|string
+     */
     public function getAuthCode()
     {
         return isset($this[OAuth2Protocol::OAuth2Protocol_ResponseType_Code])?$this[OAuth2Protocol::OAuth2Protocol_ResponseType_Code] :null;
     }
 
+    /**
+     * @return null|string
+     */
     public function getState()
     {
         return isset($this[OAuth2Protocol::OAuth2Protocol_State])?$this[OAuth2Protocol::OAuth2Protocol_State] :null;
     }
 
+    /**
+     * @return null|string
+     */
     public function getScope()
     {
         return isset($this[OAuth2Protocol::OAuth2Protocol_Scope])?$this[OAuth2Protocol::OAuth2Protocol_Scope] :null;
     }
 
-
+    /**
+     * @return null|string
+     */
     public function getSessionState()
     {
         return isset($this[OAuth2Protocol::OAuth2Protocol_Session_State])?$this[OAuth2Protocol::OAuth2Protocol_Session_State] :null;
diff --git a/app/libs/oauth2/responses/OAuth2DirectErrorResponse.php b/app/libs/OAuth2/Responses/OAuth2DirectErrorResponse.php
similarity index 65%
rename from app/libs/oauth2/responses/OAuth2DirectErrorResponse.php
rename to app/libs/OAuth2/Responses/OAuth2DirectErrorResponse.php
index fd7b004c..c3527986 100644
--- a/app/libs/oauth2/responses/OAuth2DirectErrorResponse.php
+++ b/app/libs/OAuth2/Responses/OAuth2DirectErrorResponse.php
@@ -1,13 +1,24 @@
-<?php
+<?php namespace OAuth2\Responses;
 
-namespace oauth2\responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-use oauth2\OAuth2Protocol;
-use utils\http\HttpContentType;
+use OAuth2\OAuth2Protocol;
+use Utils\Http\HttpContentType;
 
 /**
  * Class OAuth2DirectErrorResponse
- * @package oauth2\responses
+ * @package OAuth2\Responses
  */
 class OAuth2DirectErrorResponse extends OAuth2DirectResponse
 {
diff --git a/app/libs/OAuth2/Responses/OAuth2DirectResponse.php b/app/libs/OAuth2/Responses/OAuth2DirectResponse.php
new file mode 100644
index 00000000..dc843c53
--- /dev/null
+++ b/app/libs/OAuth2/Responses/OAuth2DirectResponse.php
@@ -0,0 +1,41 @@
+<?php namespace OAuth2\Responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Http\HttpContentType;
+/**
+ * Class OAuth2DirectResponse
+ * @package OAuth2\Responses
+ */
+class OAuth2DirectResponse extends OAuth2Response
+{
+
+    const OAuth2DirectResponse  = 'OAuth2DirectResponse';
+
+    public function __construct($http_code = self::HttpOkResponse, $content_type = HttpContentType::Json)
+    {
+        // Successful Responses: A server receiving a valid request MUST send a
+        // response with an HTTP status code of 200.
+        parent::__construct($http_code,$content_type );
+    }
+
+    public function getContent()
+    {
+        $json_encoded_format = json_encode($this->container);
+        return $json_encoded_format;
+    }
+
+    public function getType()
+    {
+        return self::OAuth2DirectResponse;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/responses/OAuth2HybridTokenFragmentResponse.php b/app/libs/OAuth2/Responses/OAuth2HybridTokenFragmentResponse.php
similarity index 91%
rename from app/libs/oauth2/responses/OAuth2HybridTokenFragmentResponse.php
rename to app/libs/OAuth2/Responses/OAuth2HybridTokenFragmentResponse.php
index 163de476..20199141 100644
--- a/app/libs/oauth2/responses/OAuth2HybridTokenFragmentResponse.php
+++ b/app/libs/OAuth2/Responses/OAuth2HybridTokenFragmentResponse.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\Responses;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,14 +13,11 @@
  * limitations under the License.
  **/
 
-namespace oauth2\responses;
-
-use Illuminate\Support\Facades\Auth;
-use oauth2\OAuth2Protocol;
+use OAuth2\OAuth2Protocol;
 
 /**
  * Class OAuth2HybridTokenFragmentResponse
- * @package oauth2\responses
+ * @package OAuth2\Responses
  */
 class OAuth2HybridTokenFragmentResponse extends OAuth2IDTokenFragmentResponse
 {
diff --git a/app/libs/oauth2/responses/OAuth2IDTokenFragmentResponse.php b/app/libs/OAuth2/Responses/OAuth2IDTokenFragmentResponse.php
similarity index 79%
rename from app/libs/oauth2/responses/OAuth2IDTokenFragmentResponse.php
rename to app/libs/OAuth2/Responses/OAuth2IDTokenFragmentResponse.php
index 133170ed..9dcfcc70 100644
--- a/app/libs/oauth2/responses/OAuth2IDTokenFragmentResponse.php
+++ b/app/libs/OAuth2/Responses/OAuth2IDTokenFragmentResponse.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\Responses;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,24 +13,22 @@
  * limitations under the License.
  **/
 
-namespace oauth2\responses;
-
-use oauth2\OAuth2Protocol;
+use OAuth2\OAuth2Protocol;
 
 /**
  * Class OAuth2IDTokenFragmentResponse
- * @package oauth2\responses
+ * @package OAuth2\Responses
  */
 class OAuth2IDTokenFragmentResponse extends OAuth2AccessTokenFragmentResponse
 {
     /**
-     * @param $return_to
-     * @param null $access_token
-     * @param null $expires_in
-     * @param null $scope
-     * @param null $state
-     * @param null $session_state
-     * @param null $id_token
+     * @param string $return_to
+     * @param null|string $access_token
+     * @param null|int $expires_in
+     * @param null|string $scope
+     * @param null|string $state
+     * @param null|string $session_state
+     * @param null|string $id_token
      */
     public function __construct
     (
diff --git a/app/libs/oauth2/responses/OAuth2IdTokenResponse.php b/app/libs/OAuth2/Responses/OAuth2IdTokenResponse.php
similarity index 85%
rename from app/libs/oauth2/responses/OAuth2IdTokenResponse.php
rename to app/libs/OAuth2/Responses/OAuth2IdTokenResponse.php
index 2b8ac5a3..2caf1840 100644
--- a/app/libs/oauth2/responses/OAuth2IdTokenResponse.php
+++ b/app/libs/OAuth2/Responses/OAuth2IdTokenResponse.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\Responses;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,21 +13,19 @@
  * limitations under the License.
  **/
 
-namespace oauth2\responses;
-
-use oauth2\OAuth2Protocol;
+use OAuth2\OAuth2Protocol;
 
 /**
  * Class OAuth2IdTokenResponse
- * @package oauth2\responses
+ * @package OAuth2\Responses
  */
 final class OAuth2IdTokenResponse extends OAuth2AccessTokenResponse
 {
 
     /**
-     * @param string $access_token
-     * @param string $expires_in
-     * @param string $id_token
+     * @param string      $access_token
+     * @param string      $expires_in
+     * @param string      $id_token
      * @param null|string $refresh_token
      * @param null|string $scope
      */
diff --git a/app/libs/oauth2/responses/OAuth2IndirectErrorResponse.php b/app/libs/OAuth2/Responses/OAuth2IndirectErrorResponse.php
similarity index 64%
rename from app/libs/oauth2/responses/OAuth2IndirectErrorResponse.php
rename to app/libs/OAuth2/Responses/OAuth2IndirectErrorResponse.php
index 6619ce5e..161876fa 100644
--- a/app/libs/oauth2/responses/OAuth2IndirectErrorResponse.php
+++ b/app/libs/OAuth2/Responses/OAuth2IndirectErrorResponse.php
@@ -1,13 +1,24 @@
-<?php
+<?php namespace OAuth2\Responses;
 
-namespace oauth2\responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-use oauth2\OAuth2Protocol;
-use utils\http\HttpResponse;
+use OAuth2\OAuth2Protocol;
+use Utils\Http\HttpResponse;
 
 /**
  * Class OAuth2IndirectErrorResponse
- * @package oauth2\responses
+ * @package OAuth2\Responses
  */
 class OAuth2IndirectErrorResponse extends OAuth2IndirectResponse
 {
diff --git a/app/libs/oauth2/responses/OAuth2IndirectFragmentErrorResponse.php b/app/libs/OAuth2/Responses/OAuth2IndirectFragmentErrorResponse.php
similarity index 58%
rename from app/libs/oauth2/responses/OAuth2IndirectFragmentErrorResponse.php
rename to app/libs/OAuth2/Responses/OAuth2IndirectFragmentErrorResponse.php
index 00a7d487..30b8db1b 100644
--- a/app/libs/oauth2/responses/OAuth2IndirectFragmentErrorResponse.php
+++ b/app/libs/OAuth2/Responses/OAuth2IndirectFragmentErrorResponse.php
@@ -1,12 +1,22 @@
-<?php
+<?php namespace OAuth2\Responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-namespace oauth2\responses;
-
-use oauth2\OAuth2Protocol;
+use OAuth2\OAuth2Protocol;
 
 /**
  * Class OAuth2IndirectFragmentErrorResponse
- * @package oauth2\responses
+ * @package OAuth2\Responses
  */
 class OAuth2IndirectFragmentErrorResponse extends OAuth2IndirectFragmentResponse
 {
diff --git a/app/libs/oauth2/responses/OAuth2IndirectFragmentResponse.php b/app/libs/OAuth2/Responses/OAuth2IndirectFragmentResponse.php
similarity index 68%
rename from app/libs/oauth2/responses/OAuth2IndirectFragmentResponse.php
rename to app/libs/OAuth2/Responses/OAuth2IndirectFragmentResponse.php
index 00938965..7b36c011 100644
--- a/app/libs/oauth2/responses/OAuth2IndirectFragmentResponse.php
+++ b/app/libs/OAuth2/Responses/OAuth2IndirectFragmentResponse.php
@@ -1,7 +1,8 @@
-<?php
-
-namespace oauth2\responses;
-
+<?php namespace OAuth2\Responses;
+/**
+ * Class OAuth2IndirectFragmentResponse
+ * @package OAuth2\Responses
+ */
 class OAuth2IndirectFragmentResponse extends OAuth2IndirectResponse
 {
 
@@ -12,6 +13,9 @@ class OAuth2IndirectFragmentResponse extends OAuth2IndirectResponse
         parent::__construct();
     }
 
+    /**
+     * @return string
+     */
     public function getType()
     {
         return self::OAuth2IndirectFragmentResponse;
diff --git a/app/libs/oauth2/responses/OAuth2IndirectResponse.php b/app/libs/OAuth2/Responses/OAuth2IndirectResponse.php
similarity index 67%
rename from app/libs/oauth2/responses/OAuth2IndirectResponse.php
rename to app/libs/OAuth2/Responses/OAuth2IndirectResponse.php
index 7448cc52..0c1ef2e9 100644
--- a/app/libs/oauth2/responses/OAuth2IndirectResponse.php
+++ b/app/libs/OAuth2/Responses/OAuth2IndirectResponse.php
@@ -1,12 +1,20 @@
-<?php
-
-namespace oauth2\responses;
-
-use utils\http\HttpContentType;
-
+<?php namespace OAuth2\Responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Http\HttpContentType;
 /**
  * Class OAuth2IndirectResponse
- * @package oauth2\responses
+ * @package OAuth2\Responses
  */
 abstract class OAuth2IndirectResponse extends OAuth2Response
 {
diff --git a/app/libs/oauth2/responses/OAuth2LogoutResponse.php b/app/libs/OAuth2/Responses/OAuth2LogoutResponse.php
similarity index 89%
rename from app/libs/oauth2/responses/OAuth2LogoutResponse.php
rename to app/libs/OAuth2/Responses/OAuth2LogoutResponse.php
index 364ec707..3fb171b4 100644
--- a/app/libs/oauth2/responses/OAuth2LogoutResponse.php
+++ b/app/libs/OAuth2/Responses/OAuth2LogoutResponse.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\Responses;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,19 +13,17 @@
  * limitations under the License.
  **/
 
-namespace oauth2\responses;
-
-use oauth2\OAuth2Protocol;
+use OAuth2\OAuth2Protocol;
 
 /**
  * Class OAuth2LogoutResponse
- * @package oauth2\responses
+ * @package OAuth2\Responses
  */
 final class OAuth2LogoutResponse extends OAuth2IndirectResponse
 {
     /**
      * @param string $return_to
-     * @param null $state
+     * @param null|string $state
      */
     public function __construct($return_to, $state = null)
     {
diff --git a/app/libs/oauth2/responses/OAuth2PostResponse.php b/app/libs/OAuth2/Responses/OAuth2PostResponse.php
similarity index 89%
rename from app/libs/oauth2/responses/OAuth2PostResponse.php
rename to app/libs/OAuth2/Responses/OAuth2PostResponse.php
index d8bc0579..643f59df 100644
--- a/app/libs/oauth2/responses/OAuth2PostResponse.php
+++ b/app/libs/OAuth2/Responses/OAuth2PostResponse.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\Responses;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,16 +13,13 @@
  * limitations under the License.
  **/
 
-namespace oauth2\responses;
-
-use Illuminate\Support\Facades\HTML;
-use utils\http\HttpContentType;
+use Utils\Http\HttpContentType;
 
 /**
- * http://openid.net/specs/oauth-v2-form-post-response-mode-1_0.html
+ * @see http://openid.net/specs/oauth-v2-form-post-response-mode-1_0.html
  *
  * Class OAuth2PostResponse
- * @package oauth2\responses
+ * @package OAuth2\Responses
  */
 final class OAuth2PostResponse extends OAuth2Response
 {
@@ -30,8 +28,7 @@ final class OAuth2PostResponse extends OAuth2Response
      */
     protected $return_to;
 
-
-    const OAuth2PostResponse            = "OAuth2PostResponse";
+    const OAuth2PostResponse = "OAuth2PostResponse";
 
     public function __construct()
     {
diff --git a/app/libs/oauth2/repositories/IApiScopeGroupRepository.php b/app/libs/OAuth2/Responses/OAuth2Response.php
similarity index 72%
rename from app/libs/oauth2/repositories/IApiScopeGroupRepository.php
rename to app/libs/OAuth2/Responses/OAuth2Response.php
index fffee52d..eaa5f034 100644
--- a/app/libs/oauth2/repositories/IApiScopeGroupRepository.php
+++ b/app/libs/OAuth2/Responses/OAuth2Response.php
@@ -1,6 +1,7 @@
-<?php
+<?php namespace OAuth2\Responses;
+
 /**
- * Copyright 2015 OpenStack Foundation
+ * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,15 +13,12 @@
  * limitations under the License.
  **/
 
-namespace oauth2\repositories;
-
-use oauth2\models\IApiScopeGroup;
+use Utils\Http\HttpResponse;
 
 /**
- * Interface IApiScopeGroupRepository
- * @package oauth2\repositories
+ * Class OAuth2Response
+ * @package OAuth2\Responses
  */
-interface IApiScopeGroupRepository
-{
+abstract class OAuth2Response extends HttpResponse {
 
-}
\ No newline at end of file
+} 
\ No newline at end of file
diff --git a/app/libs/oauth2/responses/OAuth2TokenRevocationResponse.php b/app/libs/OAuth2/Responses/OAuth2TokenRevocationResponse.php
similarity index 57%
rename from app/libs/oauth2/responses/OAuth2TokenRevocationResponse.php
rename to app/libs/OAuth2/Responses/OAuth2TokenRevocationResponse.php
index 9fbb9437..058b04d3 100644
--- a/app/libs/oauth2/responses/OAuth2TokenRevocationResponse.php
+++ b/app/libs/OAuth2/Responses/OAuth2TokenRevocationResponse.php
@@ -1,12 +1,23 @@
-<?php
+<?php namespace OAuth2\Responses;
 
-namespace oauth2\responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-use utils\http\HttpContentType;
+use Utils\Http\HttpContentType;
 
 /**
  * Class OAuth2TokenRevocationResponse
- * http://tools.ietf.org/html/rfc7009#section-2.2
+ * @see http://tools.ietf.org/html/rfc7009#section-2.2
  * The authorization server responds with HTTP status code 200 if the
  * token has been revoked successfully or if the client submitted an
  * invalid token.
@@ -18,7 +29,7 @@ use utils\http\HttpContentType;
  * necessary information is conveyed in the response code.
  * An invalid token type hint value is ignored by the authorization
  * server and does not influence the revocation response.
- * @package oauth2\responses
+ * @package OAuth2\Responses
  */
 class OAuth2TokenRevocationResponse extends OAuth2DirectResponse {
 
diff --git a/app/libs/oauth2/responses/OAuth2WWWAuthenticateErrorResponse.php b/app/libs/OAuth2/Responses/OAuth2WWWAuthenticateErrorResponse.php
similarity index 52%
rename from app/libs/oauth2/responses/OAuth2WWWAuthenticateErrorResponse.php
rename to app/libs/OAuth2/Responses/OAuth2WWWAuthenticateErrorResponse.php
index 628e1848..629f60bd 100644
--- a/app/libs/oauth2/responses/OAuth2WWWAuthenticateErrorResponse.php
+++ b/app/libs/OAuth2/Responses/OAuth2WWWAuthenticateErrorResponse.php
@@ -1,24 +1,60 @@
-<?php
+<?php namespace OAuth2\Responses;
 
-namespace oauth2\responses;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-use utils\http\HttpContentType;
+use Utils\Http\HttpContentType;
 
 /**
  * Class OAuth2WWWAuthenticateErrorResponse
- * http://tools.ietf.org/html/rfc6750#section-3
- * @package oauth2\responses
+ * @see http://tools.ietf.org/html/rfc6750#section-3
+ * @package OAuth2\Responses
  */
 class OAuth2WWWAuthenticateErrorResponse extends OAuth2DirectResponse {
 
+    /**
+     * @var string
+     */
     private $realm;
+    /**
+     * @var string
+     */
     private $error;
+    /**
+     * @var string
+     */
     private $error_description;
+    /**
+     * @var string
+     */
     private $scope;
+    /**
+     * @var int
+     */
     private $http_error;
 
-    public function __construct($realm, $error, $error_description, $scope, $http_error){
+    /**
+     * OAuth2WWWAuthenticateErrorResponse constructor.
+     * @param int $realm
+     * @param string $error
+     * @param $error_description
+     * @param null| string $scope
+     * @param int $http_error
+     */
+    public function __construct($realm, $error, $error_description, $scope = null, $http_error = self::HttpOkResponse){
+
         parent::__construct($http_error, HttpContentType::Json);
+
         $this->realm             = $realm;
         $this->error             = $error;
         $this->error_description = $error_description;
@@ -35,7 +71,9 @@ class OAuth2WWWAuthenticateErrorResponse extends OAuth2DirectResponse {
         return $value;
     }
 
-
+    /**
+     * @return array
+     */
     public function getContent()
     {
         $content = array(
diff --git a/app/config/packages/greggilbert/recaptcha/local/.gitkeep b/app/libs/OAuth2/Services/.gitkeep
similarity index 100%
rename from app/config/packages/greggilbert/recaptcha/local/.gitkeep
rename to app/libs/OAuth2/Services/.gitkeep
diff --git a/app/libs/oauth2/services/AccessTokenGenerator.php b/app/libs/OAuth2/Services/AccessTokenGenerator.php
similarity index 82%
rename from app/libs/oauth2/services/AccessTokenGenerator.php
rename to app/libs/OAuth2/Services/AccessTokenGenerator.php
index fb0df891..1d4ccfa9 100644
--- a/app/libs/oauth2/services/AccessTokenGenerator.php
+++ b/app/libs/OAuth2/Services/AccessTokenGenerator.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Services;
 /**
 * Copyright 2015 OpenStack Foundation
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,12 +11,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 **/
-
-namespace oauth2\services;
-
 /**
  * Class AccessTokenGenerator
- * @package oauth2\services
+ * @package OAuth2\Services
  */
-final class AccessTokenGenerator extends OAuth2ATokenGenerator {
+final class AccessTokenGenerator extends OAuth2TokenGenerator {
 }
\ No newline at end of file
diff --git a/app/libs/oauth2/services/AuthorizationCodeGenerator.php b/app/libs/OAuth2/Services/AuthorizationCodeGenerator.php
similarity index 82%
rename from app/libs/oauth2/services/AuthorizationCodeGenerator.php
rename to app/libs/OAuth2/Services/AuthorizationCodeGenerator.php
index 7abcd5b2..5c712ba4 100644
--- a/app/libs/oauth2/services/AuthorizationCodeGenerator.php
+++ b/app/libs/OAuth2/Services/AuthorizationCodeGenerator.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Services;
 /**
 * Copyright 2015 OpenStack Foundation
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,12 +12,9 @@
 * limitations under the License.
 **/
 
-namespace oauth2\services;
-
-
 /**
  * Class AuthorizationCodeGenerator
- * @package oauth2\services
+ * @package OAuth2\Services
  */
-final class AuthorizationCodeGenerator extends OAuth2ATokenGenerator {
+final class AuthorizationCodeGenerator extends OAuth2TokenGenerator {
 }
\ No newline at end of file
diff --git a/app/libs/oauth2/services/IApiEndpointService.php b/app/libs/OAuth2/Services/IApiEndpointService.php
similarity index 56%
rename from app/libs/oauth2/services/IApiEndpointService.php
rename to app/libs/OAuth2/Services/IApiEndpointService.php
index 50885ad6..eb6d607a 100644
--- a/app/libs/oauth2/services/IApiEndpointService.php
+++ b/app/libs/OAuth2/Services/IApiEndpointService.php
@@ -1,44 +1,28 @@
-<?php
+<?php namespace OAuth2\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-namespace oauth2\services;
-
-use oauth2\models\IApiEndpoint;
+use OAuth2\Models\IApiEndpoint;
+use OAuth2\Exceptions\InvalidApiScope;
+use OAuth2\Exceptions\InvalidApiEndpoint;
+use Utils\Exceptions\EntityNotFoundException;
 
 /**
  * Interface IApiEndpointService
- * @package oauth2\services
+ * @package OAuth2\Services
  */
 interface IApiEndpointService {
 
-    /**
-     * @param string$url
-     * @param string $http_method
-     * @return IApiEndpoint
-     */
-    public function getApiEndpointByUrlAndMethod($url,$http_method);
-
-    /**
-     * @param string $url
-     * @return IApiEndpoint
-     */
-    public function getApiEndpointByUrl($url);
-
-    /**
-     * @param $id
-     * @return IApiEndpoint
-     */
-    public function get($id);
-
-    /**
-     * @param int $page_nbr
-     * @param int $page_size
-     * @param array $filters
-     * @param array $fields
-     * @return mixed
-     */
-    public function getAll($page_nbr=1,$page_size=10,array $filters=array(),array $fields=array('*'));
-
-
     /**
      * Adds a new api endpoint to an existent api
      * @param string $name
@@ -53,15 +37,15 @@ interface IApiEndpointService {
      */
     public function add($name, $description, $active, $allow_cors, $route, $http_method, $api_id, $rate_limit);
 
-
     /**
      * Adds a new required scope to a given api endpoint,
      * given scope must belongs to owner api of the given endpoint
      * @param int $api_endpoint_id
      * @param int $scope_id
      * @return boolean
-     * @throws \oauth2\exceptions\InvalidApiScope
-     * @throws \oauth2\exceptions\InvalidApiEndpoint
+     * @throws InvalidApiScope
+     * @throws InvalidApiEndpoint
+     * @throws EntityNotFoundException
      */
     public function addRequiredScope($api_endpoint_id, $scope_id);
 
@@ -71,8 +55,9 @@ interface IApiEndpointService {
      * @param int $api_endpoint_id
      * @param int $scope_id
      * @return boolean
-     * @throws \oauth2\exceptions\InvalidApiScope
-     * @throws \oauth2\exceptions\InvalidApiEndpoint
+     * @throws InvalidApiScope
+     * @throws InvalidApiEndpoint
+     * @throws EntityNotFoundException
      */
     public function removeRequiredScope($api_endpoint_id, $scope_id);
 
@@ -80,28 +65,25 @@ interface IApiEndpointService {
      * deletes a given api endpoint
      * @param int $id
      * @return boolean
+     * @throws EntityNotFoundException
      */
     public function delete($id);
 
-    public function save(IApiEndpoint $api_endpoint);
-
     /**
-     * Updates attributes of a endpoint api given instance
      * @param int $id
      * @param array $params
      * @return bool
-     * @throws \oauth2\exceptions\InvalidApiEndpoint
+     * @throws EntityNotFoundException
+     * @throws InvalidApiEndpoint
      */
     public function update($id, array $params);
 
     /**
      * @param int $id
      * @param boolean $active
+     * @throws EntityNotFoundException
      * @return boolean
      */
     public function setStatus($id, $active);
 
-
-
-
 } 
\ No newline at end of file
diff --git a/app/libs/oauth2/services/IApiScopeGroupService.php b/app/libs/OAuth2/Services/IApiScopeGroupService.php
similarity index 87%
rename from app/libs/oauth2/services/IApiScopeGroupService.php
rename to app/libs/OAuth2/Services/IApiScopeGroupService.php
index 64e40147..825f1747 100644
--- a/app/libs/oauth2/services/IApiScopeGroupService.php
+++ b/app/libs/OAuth2/Services/IApiScopeGroupService.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Services;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,14 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\services;
-
-use oauth2\models\IApiScopeGroup;
-
+use OAuth2\Models\IApiScopeGroup;
+use OAuth2\Exceptions\InvalidApiScopeGroup;
 /**
  * Interface IApiScopeGroupService
- * @package oauth2\services
+ * @package OAuth2\Services
  */
 interface IApiScopeGroupService
 {
@@ -26,7 +23,7 @@ interface IApiScopeGroupService
      * @param $id
      * @param array $params
      * @return bool
-     * @throws \oauth2\exceptions\InvalidApiScopeGroup
+     * @throws InvalidApiScopeGroup
      */
     public function update($id, array $params);
 
diff --git a/app/libs/oauth2/services/IApiScopeService.php b/app/libs/OAuth2/Services/IApiScopeService.php
similarity index 59%
rename from app/libs/oauth2/services/IApiScopeService.php
rename to app/libs/OAuth2/Services/IApiScopeService.php
index 8d537fdc..da916959 100644
--- a/app/libs/oauth2/services/IApiScopeService.php
+++ b/app/libs/OAuth2/Services/IApiScopeService.php
@@ -1,57 +1,47 @@
-<?php
-
-namespace oauth2\services;
-
-use oauth2\models\IApiScope;
+<?php namespace OAuth2\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\Models\IApiScope;
+use OAuth2\Exceptions\InvalidApiScope;
+use Utils\Exceptions\EntityNotFoundException;
 
 /**
  * Interface IApiScopeService
- * @package oauth2\services
+ * @package OAuth2\Services
  */
 interface IApiScopeService
 {
-    /**
-     * gets an api scope by id
-     * @param int $id id of api scope
-     * @return IApiScope
-     */
-    public function get($id);
-
-    /**
-     * @param int $page_nbr
-     * @param int $page_size
-     * @param array $filters
-     * @param array $fields
-     * @return mixed
-     */
-    public function getAll($page_nbr=1,$page_size=10, array $filters=array(), array $fields=array('*'));
-
-    /**
-     * @param IApiScope $scope
-     * @return bool
-     */
-    public function save(IApiScope $scope);
-
     /**
      * @param $id
      * @param array $params
      * @return bool
-     * @throws \oauth2\exceptions\InvalidApiScope
+     * @throws InvalidApiScope
+     * @throws EntityNotFoundException
      */
     public function update($id, array $params);
 
     /**
-     * sets api scope status (active/deactivated)
-     * @param $id id of api scope
-     * @param bool $status status (active/non active)
-     * @return void
+     * @param int $id
+     * @param bool $active
+     * @return bool
+     * @throws EntityNotFoundException
      */
-    public function setStatus($id,$status);
+    public function setStatus($id, $active);
 
     /**
-     * deletes an api scope
-     * @param $id id of api scope
+     * @param int $id
      * @return bool
+     * @throws EntityNotFoundException
      */
     public function delete($id);
 
@@ -69,12 +59,6 @@ interface IApiScopeService
      */
     public function add($name, $short_description, $description, $active, $default, $system, $api_id, $assigned_by_groups);
 
-    /**
-     * @param array $scopes_names
-     * @return mixed
-     */
-    public function getScopesByName(array $scopes_names);
-
     /**
      * Given an array of scopes names, gets friendly names for given ones
      * @param array $scopes_names
@@ -104,12 +88,6 @@ interface IApiScopeService
      */
     public function getStrAudienceByScopeNames(array $scopes_names);
 
-    /**
-     * gets a list of default scopes
-     * @return mixed
-     */
-    public function getDefaultScopes();
-
     /**
      * @return mixed
      */
diff --git a/app/libs/OAuth2/Services/IApiService.php b/app/libs/OAuth2/Services/IApiService.php
new file mode 100644
index 00000000..85e52ba8
--- /dev/null
+++ b/app/libs/OAuth2/Services/IApiService.php
@@ -0,0 +1,56 @@
+<?php namespace OAuth2\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\Models\IApi;
+use OAuth2\Exceptions\InvalidApi;
+use Utils\Exceptions\EntityNotFoundException;
+/**
+ * Interface IApiService
+ * @package OAuth2\Services
+ */
+interface IApiService {
+
+    /**
+     * @param int $id
+     * @return bool
+     * @throws EntityNotFoundException
+     */
+    public function delete($id);
+
+    /**
+     * @param $name
+     * @param $description
+     * @param $active
+     * @param $resource_server_id
+     * @return IApi
+     */
+    public function add($name, $description, $active, $resource_server_id);
+
+    /**
+     * @param $id
+     * @param array $params
+     * @return bool
+     * @throws EntityNotFoundException
+     * @throws InvalidApi
+     */
+    public function update($id, array $params);
+
+    /**
+     * @param int $id
+     * @param bool $active
+     * @return bool
+     * @throws EntityNotFoundException
+     */
+    public function setStatus($id, $active);
+
+} 
\ No newline at end of file
diff --git a/app/libs/oauth2/services/IAssymetricKeyService.php b/app/libs/OAuth2/Services/IAsymmetricKeyService.php
similarity index 82%
rename from app/libs/oauth2/services/IAssymetricKeyService.php
rename to app/libs/OAuth2/Services/IAsymmetricKeyService.php
index d7f3e709..dd1f04a5 100644
--- a/app/libs/oauth2/services/IAssymetricKeyService.php
+++ b/app/libs/OAuth2/Services/IAsymmetricKeyService.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\Services;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,16 +13,17 @@
  * limitations under the License.
  **/
 
-namespace oauth2\services;
+use OAuth2\Models\IAsymmetricKey;
 
-
-use oauth2\models\IAssymetricKey;
-
-interface IAssymetricKeyService
+/**
+ * Interface IAsymmetricKeyService
+ * @package OAuth2\Services
+ */
+interface IAsymmetricKeyService
 {
     /**
      * @param array $params
-     * @return IAssymetricKey
+     * @return IAsymmetricKey
      */
     public function register(array $params);
 
diff --git a/app/libs/oauth2/services/IClientCrendentialGenerator.php b/app/libs/OAuth2/Services/IClientCrendentialGenerator.php
similarity index 81%
rename from app/libs/oauth2/services/IClientCrendentialGenerator.php
rename to app/libs/OAuth2/Services/IClientCrendentialGenerator.php
index 33151216..2d7a53d2 100644
--- a/app/libs/oauth2/services/IClientCrendentialGenerator.php
+++ b/app/libs/OAuth2/Services/IClientCrendentialGenerator.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Services;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,16 +12,16 @@
  * limitations under the License.
  **/
 
-namespace oauth2\services;
-
-use oauth2\models\IClient;
+use OAuth2\Models\IClient;
 
 /**
- * Interface IClientCrendentialGenerator
+ * Interface IClientCredentialGenerator
  * @package oauth2\services
  */
-interface IClientCrendentialGenerator
+interface IClientCredentialGenerator
 {
+    const ClientSuffix = '.openstack.client';
+
     /**
      * @param IClient $client
      * @param bool|false $only_secret
diff --git a/app/libs/oauth2/services/IClientJWKSetReader.php b/app/libs/OAuth2/Services/IClientJWKSetReader.php
similarity index 89%
rename from app/libs/oauth2/services/IClientJWKSetReader.php
rename to app/libs/OAuth2/Services/IClientJWKSetReader.php
index b7e9f796..bcb3b127 100644
--- a/app/libs/oauth2/services/IClientJWKSetReader.php
+++ b/app/libs/OAuth2/Services/IClientJWKSetReader.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\Services;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,14 +13,12 @@
  * limitations under the License.
  **/
 
-namespace oauth2\services;
-
 use jwk\IJWKSet;
-use oauth2\models\IClient;
+use OAuth2\Models\IClient;
 
 /**
  * Interface IClientJWKSetReader
- * @package oauth2\services
+ * @package OAuth2\Services
  */
 interface IClientJWKSetReader
 {
diff --git a/app/libs/oauth2/repositories/IClientPublicKeyRepository.php b/app/libs/OAuth2/Services/IClientPublicKeyService.php
similarity index 78%
rename from app/libs/oauth2/repositories/IClientPublicKeyRepository.php
rename to app/libs/OAuth2/Services/IClientPublicKeyService.php
index 89e400a8..8851a1f5 100644
--- a/app/libs/oauth2/repositories/IClientPublicKeyRepository.php
+++ b/app/libs/OAuth2/Services/IClientPublicKeyService.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Services;
 /**
 * Copyright 2015 OpenStack Foundation
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,12 +12,11 @@
 * limitations under the License.
 **/
 
-namespace oauth2\repositories;
-
 /**
- * Interface IClientPublicKeyRepository
+ * Interface IClientPublicKeyService
+ * @package OAuth2\Services
  */
-interface IClientPublicKeyRepository extends IAssymetricKeyRepository
+interface IClientPublicKeyService extends IAsymmetricKeyService
 {
 
 }
\ No newline at end of file
diff --git a/app/libs/OAuth2/Services/IClientService.php b/app/libs/OAuth2/Services/IClientService.php
new file mode 100644
index 00000000..52895722
--- /dev/null
+++ b/app/libs/OAuth2/Services/IClientService.php
@@ -0,0 +1,138 @@
+<?php namespace OAuth2\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+
+use OAuth2\Exceptions\InvalidClientAuthMethodException;
+use OAuth2\Exceptions\MissingClientAuthorizationInfo;
+use OAuth2\Models\ClientAuthenticationContext;
+use OAuth2\Models\IClient;
+use Services\Exceptions\ValidationException;
+use Utils\Exceptions\EntityNotFoundException;
+
+/**
+ * Interface IClientService
+ * @package OAuth2\Services
+ */
+interface IClientService {
+
+    /**
+     * Clients in possession of a client password MAY use the HTTP Basic
+     * authentication scheme as defined in [RFC2617] to authenticate with
+     * the authorization server
+     * Alternatively, the authorization server MAY support including the
+     * client credentials in the request-body using the following
+     * parameters:
+     * implementation of @link http://tools.ietf.org/html/rfc6749#section-2.3.1
+     * implementation of @link http://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication
+     * @throws InvalidClientAuthMethodException
+     * @throws MissingClientAuthorizationInfo
+     * @return ClientAuthenticationContext
+     */
+    public function getCurrentClientAuthInfo();
+
+    /**
+     * @param string $application_type
+     * @param string $app_name
+     * @param string $app_description
+     * @param null|string  $app_url
+     * @param array $admin_users
+     * @param string $app_logo
+     * @return IClient
+     * @throws ValidationException
+     */
+    public function register
+    (
+        $application_type,
+        $app_name,
+        $app_description,
+        $app_url = null,
+        array $admin_users = array(),
+        $app_logo = ''
+    );
+
+    /**
+     * @param $id
+     * @param array $params
+     * @throws EntityNotFoundException
+     * @throws ValidationException
+     * @return IClient
+     */
+    public function update($id, array $params);
+
+    /**
+     * @param int $id
+     * @param int $scope_id
+     * @return mixed
+     */
+    public function addClientScope($id, $scope_id);
+
+    /**
+     * @param int $id
+     * @param int $scope_id
+     * @return mixed
+     */
+    public function deleteClientScope($id, $scope_id);
+
+    /**
+     * @param  int $id
+     * @return mixed
+     */
+    public function deleteClientByIdentifier($id);
+
+    /**
+     * Regenerates Client Secret
+     * @param int $id
+     * @return IClient
+     */
+    public function regenerateClientSecret($id);
+
+    /**
+     * Lock a client application by id
+     * @param int $id
+     * @return bool
+     */
+    public function lockClient($id);
+
+    /**
+     * unLock a client application by id
+     * @param string $id
+     * @return bool
+     */
+    public function unlockClient($id);
+
+    /**
+     * Activate/Deactivate given client
+     * @param int $id
+     * @param bool $active
+     * @return bool
+     */
+    public function activateClient($id, $active);
+
+    /**
+     * set/unset refresh token usage for a given client
+     * @param int $id
+     * @param bool $use_refresh_token
+     * @return bool
+     */
+    public function setRefreshTokenUsage($id, $use_refresh_token);
+
+    /**
+     * set/unset rotate refresh token policy for a given client
+     * @param int $id
+     * @param bool $rotate_refresh_token
+     * @return bool
+     */
+    public function setRotateRefreshTokenPolicy($id, $rotate_refresh_token);
+
+} 
\ No newline at end of file
diff --git a/app/libs/OAuth2/Services/IMementoOAuth2SerializerService.php b/app/libs/OAuth2/Services/IMementoOAuth2SerializerService.php
new file mode 100644
index 00000000..c65df165
--- /dev/null
+++ b/app/libs/OAuth2/Services/IMementoOAuth2SerializerService.php
@@ -0,0 +1,41 @@
+<?php namespace OAuth2\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\Requests\OAuth2RequestMemento;
+/**
+ * Interface IMementoOAuth2SerializerService
+ * @package OAuth2\Services
+ */
+interface IMementoOAuth2SerializerService {
+
+    /**
+     * @param OAuth2RequestMemento $memento
+     * @return void
+     */
+    public function serialize(OAuth2RequestMemento $memento);
+
+    /**
+     * @return OAuth2RequestMemento
+     */
+    public function load();
+
+    /**
+     * @return void
+     */
+    public function forget();
+
+    /**
+     * @return bool
+     */
+    public function exists();
+} 
\ No newline at end of file
diff --git a/app/libs/oauth2/services/IPrincipalService.php b/app/libs/OAuth2/Services/IPrincipalService.php
similarity index 92%
rename from app/libs/oauth2/services/IPrincipalService.php
rename to app/libs/OAuth2/Services/IPrincipalService.php
index dc8725ed..0ebeb4f2 100644
--- a/app/libs/oauth2/services/IPrincipalService.php
+++ b/app/libs/OAuth2/Services/IPrincipalService.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\Services;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,13 +13,11 @@
  * limitations under the License.
  **/
 
-namespace oauth2\services;
-
-use oauth2\models\IPrincipal;
+use OAuth2\Models\IPrincipal;
 
 /**
  * Interface IPrincipalService
- * @package oauth2\services
+ * @package OAuth2\Services
  */
 interface IPrincipalService
 {
diff --git a/app/libs/OAuth2/Services/IResourceServerService.php b/app/libs/OAuth2/Services/IResourceServerService.php
new file mode 100644
index 00000000..f4c2cd58
--- /dev/null
+++ b/app/libs/OAuth2/Services/IResourceServerService.php
@@ -0,0 +1,65 @@
+<?php namespace OAuth2\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OAuth2\Exceptions\InvalidResourceServer;
+use OAuth2\Models\IResourceServer;
+use Utils\Exceptions\EntityNotFoundException;
+
+/**
+ * Interface IResourceServerService
+ * @package OAuth2\Services
+ */
+interface IResourceServerService {
+
+    /**
+     * @param string $host
+     * @param string $ips
+     * @param string $friendly_name
+     * @param bool $active
+     * @return IResourceServer
+     * @throws InvalidResourceServer
+     */
+    public function add($host, $ips, $friendly_name, $active);
+
+    /**
+     * @param int $id
+     * @param array $params
+     * @return bool
+     * @throws InvalidResourceServer
+     * @throws EntityNotFoundException
+     */
+    public function update($id, array $params);
+
+    /**
+     * @param int $id
+     * @param bool $active
+     * @return bool
+     * @throws EntityNotFoundException
+     */
+    public function setStatus($id , $active);
+
+    /**
+     * @param int $id
+     * @return bool
+     * @throws EntityNotFoundException
+     */
+    public function delete($id);
+
+    /**
+     * @param int $id
+     * @return string
+     * @throws EntityNotFoundException
+     */
+    public function regenerateClientSecret($id);
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/services/ISecurityContextService.php b/app/libs/OAuth2/Services/ISecurityContextService.php
similarity index 88%
rename from app/libs/oauth2/services/ISecurityContextService.php
rename to app/libs/OAuth2/Services/ISecurityContextService.php
index 3cd0febc..ce96f268 100644
--- a/app/libs/oauth2/services/ISecurityContextService.php
+++ b/app/libs/OAuth2/Services/ISecurityContextService.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Services;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,14 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace oauth2\services;
-
-use oauth2\models\SecurityContext;
-
+use OAuth2\Models\SecurityContext;
 /**
  * Interface ISecurityContextService
- * @package oauth2\services
+ * @package OAuth2\Services
  */
 interface ISecurityContextService
 {
@@ -29,7 +25,7 @@ interface ISecurityContextService
 
     /**
      * @param SecurityContext $security_context
-     * @return void
+     * @return $this
      */
     public function save(SecurityContext $security_context);
 
diff --git a/app/libs/oauth2/services/IServerPrivateKeyService.php b/app/libs/OAuth2/Services/IServerPrivateKeyService.php
similarity index 83%
rename from app/libs/oauth2/services/IServerPrivateKeyService.php
rename to app/libs/OAuth2/Services/IServerPrivateKeyService.php
index 6fdb46b5..8085aa9d 100644
--- a/app/libs/oauth2/services/IServerPrivateKeyService.php
+++ b/app/libs/OAuth2/Services/IServerPrivateKeyService.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\Services;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,13 +13,11 @@
  * limitations under the License.
  **/
 
-namespace oauth2\services;
-
 /**
  * Interface IServerPrivateKeyService
- * @package oauth2\services
+ * @package OAuth2\Services
  */
-interface IServerPrivateKeyService extends IAssymetricKeyService
+interface IServerPrivateKeyService extends IAsymmetricKeyService
 {
 
 }
\ No newline at end of file
diff --git a/app/libs/oauth2/services/ITokenService.php b/app/libs/OAuth2/Services/ITokenService.php
similarity index 72%
rename from app/libs/oauth2/services/ITokenService.php
rename to app/libs/OAuth2/Services/ITokenService.php
index 3eda9342..9af01fdb 100644
--- a/app/libs/oauth2/services/ITokenService.php
+++ b/app/libs/OAuth2/Services/ITokenService.php
@@ -1,18 +1,30 @@
-<?php
-
-namespace oauth2\services;
-
+<?php namespace OAuth2\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 use jwt\IBasicJWT;
-use oauth2\models\AuthorizationCode;
-use oauth2\models\AccessToken;
-use oauth2\models\RefreshToken;
-use oauth2\OAuth2Protocol;
-
+use OAuth2\Exceptions\InvalidAuthorizationCodeException;
+use OAuth2\Exceptions\ReplayAttackException;
+use OAuth2\Models\AuthorizationCode;
+use OAuth2\Models\AccessToken;
+use OAuth2\Models\RefreshToken;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Exceptions\InvalidAccessTokenException;
+use OAuth2\Exceptions\InvalidGrantTypeException;
 /**
  * Interface ITokenService
  * Defines the interface for an OAuth2 Token Service
  * Provides all Tokens related operations (create, get and revoke)
- * @package oauth2\services
+ * @package OAuth2\Services
  */
 interface ITokenService {
 
@@ -37,15 +49,15 @@ interface ITokenService {
         $user_id,
         $client_id,
         $scope,
-        $audience        = '' ,
-        $redirect_uri    = null,
-        $access_type     = OAuth2Protocol::OAuth2Protocol_AccessType_Online,
-        $approval_prompt = OAuth2Protocol::OAuth2Protocol_Approval_Prompt_Auto,
+        $audience                  = '' ,
+        $redirect_uri              = null,
+        $access_type               = OAuth2Protocol::OAuth2Protocol_AccessType_Online,
+        $approval_prompt           = OAuth2Protocol::OAuth2Protocol_Approval_Prompt_Auto,
         $has_previous_user_consent = false,
-        $state = null,
-        $nonce = null,
-        $response_type = null,
-        $prompt        = null
+        $state                     = null,
+        $nonce                     = null,
+        $response_type             = null,
+        $prompt                    = null
     );
 
 
@@ -53,8 +65,8 @@ interface ITokenService {
      * Retrieves a given Authorization Code
      * @param $value
      * @return AuthorizationCode
-     * @throws \oauth2\exceptions\ReplayAttackException
-     * @throws \oauth2\exceptions\InvalidAuthorizationCodeException
+     * @throws ReplayAttackException
+     * @throws InvalidAuthorizationCodeException
      */
     public function getAuthorizationCode($value);
 
@@ -65,7 +77,6 @@ interface ITokenService {
      */
     public function createAccessToken(AuthorizationCode $auth_code, $redirect_uri=null);
 
-
     /**
      * Create a brand new Access Token by params
      * @param $client_id
@@ -90,12 +101,11 @@ interface ITokenService {
      * @param $value
      * @param $is_hashed
      * @return AccessToken
-     * @throws \oauth2\exceptions\InvalidAccessTokenException
-     * @throws \oauth2\exceptions\InvalidGrantTypeException
+     * @throws InvalidAccessTokenException
+     * @throws InvalidGrantTypeException
      */
     public function getAccessToken($value, $is_hashed = false);
 
-
     /**
      * @param AuthorizationCode $auth_code
      * @return AccessToken|null
@@ -110,7 +120,6 @@ interface ITokenService {
      */
     public function checkAccessTokenAudience(AccessToken $access_token, $current_ip);
 
-
     /**
      * Creates a new refresh token and associate it with given access token
      * @param AccessToken $access_token
@@ -120,11 +129,11 @@ interface ITokenService {
 
     /**
      * Get a refresh token by its value
-     * @param  $value refresh token value
-     * @param $is_hashed
+     * @param string $value
+     * @param bool $is_hashed
      * @return RefreshToken
-     * @throws \oauth2\exceptions\ReplayAttackException
-     * @throws \oauth2\exceptions\InvalidGrantTypeException
+     * @throws ReplayAttackException
+     * @throws InvalidGrantTypeException
      */
     public function getRefreshToken($value, $is_hashed = false);
 
@@ -142,14 +151,6 @@ interface ITokenService {
      */
     public function revokeClientRelatedTokens($client_id);
 
-    public function getAccessTokenByClient($client_id);
-    
-    public function getRefreshTokenByClient($client_id);
-
-    public function getAccessTokenByUserId($user_id);
-
-    public function getRefreshTokenByUserId($user_id);
-
     /**
      * Revokes a given access token
      * @param $value
@@ -204,5 +205,4 @@ interface ITokenService {
         AccessToken $access_token    = null,
         AuthorizationCode $auth_code = null
     );
-
-} 
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/libs/OAuth2/Services/IUserConsentService.php b/app/libs/OAuth2/Services/IUserConsentService.php
new file mode 100644
index 00000000..a0072517
--- /dev/null
+++ b/app/libs/OAuth2/Services/IUserConsentService.php
@@ -0,0 +1,39 @@
+<?php namespace OAuth2\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\Models\IUserConsent;
+use Utils\Exceptions\EntityNotFoundException;
+
+/**
+ * Interface IUserConsentService
+ * @package OAuth2\Services
+ */
+interface IUserConsentService
+{
+    /**
+     * @param int $user_id
+     * @param string $client_id
+     * @param string $scopes
+     * @return IUserConsent
+     */
+    public function get($user_id, $client_id, $scopes);
+
+    /**
+     * @param int  $user_id
+     * @param string $client_id
+     * @param string $scopes
+     * @return IUserConsent
+     * @throws EntityNotFoundException
+     */
+    public function add($user_id, $client_id, $scopes);
+} 
\ No newline at end of file
diff --git a/app/libs/OAuth2/Services/OAuth2ServiceCatalog.php b/app/libs/OAuth2/Services/OAuth2ServiceCatalog.php
new file mode 100644
index 00000000..0c808168
--- /dev/null
+++ b/app/libs/OAuth2/Services/OAuth2ServiceCatalog.php
@@ -0,0 +1,23 @@
+<?php namespace OAuth2\Services;
+/**
+ * Class OAuth2ServiceCatalog
+ * @package OAuth2\Services
+ */
+abstract class OAuth2ServiceCatalog
+{
+    const TokenService                       = \OAuth2\Services\ITokenService::class;
+    const ClientCredentialGenerator          = \OAuth2\Services\IClientCredentialGenerator::class;
+    const ClientService                      = \OAuth2\Services\IClientService::class;
+    const ScopeService                       = \OAuth2\Services\IApiScopeService::class;
+    const ResourceServerService              = \OAuth2\Services\IResourceServerService::class;
+    const ApiService                         = \OAuth2\Services\IApiService::class;
+    const ApiEndpointService                 = \OAuth2\Services\IApiEndpointService::class;
+    const UserConsentService                 = \OAuth2\Services\IUserConsentService::class;
+    const ClientPublicKeyService             = \OAuth2\Services\IClientPublicKeyService::class;
+    const ServerPrivateKeyService            = \OAuth2\Services\IServerPrivateKeyService::class;
+    const OpenIDProviderConfigurationService = \OAuth2\Discovery\IOpenIDProviderConfigurationService::class;
+    const MementoSerializerService           = \OAuth2\Services\IMementoOAuth2SerializerService::class;
+    const AuthenticationStrategy             = \OAuth2\Strategies\IOAuth2AuthenticationStrategy::class;
+    const PrincipalService                   = \OAuth2\Services\IPrincipalService::class;
+    const SecurityContextService             = \OAuth2\Services\ISecurityContextService::class;
+}
\ No newline at end of file
diff --git a/app/libs/oauth2/services/OAuth2ATokenGenerator.php b/app/libs/OAuth2/Services/OAuth2TokenGenerator.php
similarity index 77%
rename from app/libs/oauth2/services/OAuth2ATokenGenerator.php
rename to app/libs/OAuth2/Services/OAuth2TokenGenerator.php
index bfab8c1f..967799bd 100644
--- a/app/libs/oauth2/services/OAuth2ATokenGenerator.php
+++ b/app/libs/OAuth2/Services/OAuth2TokenGenerator.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\Services;
+
 /**
  * Copyright 2016 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,18 +13,16 @@
  * limitations under the License.
  **/
 
-namespace oauth2\services;
-
-use oauth2\OAuth2Protocol;
-use utils\model\Identifier;
-use utils\services\UniqueIdentifierGenerator;
+use OAuth2\OAuth2Protocol;
+use Utils\Model\Identifier;
+use Utils\Services\UniqueIdentifierGenerator;
 use Zend\Math\Rand;
 
 /**
- * Class OAuth2ATokenGenerator
- * @package libs\oauth2\services
+ * Class OAuth2TokenGenerator
+ * @package OAuth2\Services
  */
-class OAuth2ATokenGenerator extends UniqueIdentifierGenerator
+class OAuth2TokenGenerator extends UniqueIdentifierGenerator
 {
     /**
      * @param Identifier $identifier
diff --git a/app/libs/oauth2/services/RefreshTokenGenerator.php b/app/libs/OAuth2/Services/RefreshTokenGenerator.php
similarity index 82%
rename from app/libs/oauth2/services/RefreshTokenGenerator.php
rename to app/libs/OAuth2/Services/RefreshTokenGenerator.php
index f1d0dfbd..5e78cb99 100644
--- a/app/libs/oauth2/services/RefreshTokenGenerator.php
+++ b/app/libs/OAuth2/Services/RefreshTokenGenerator.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OAuth2\Services;
 /**
 * Copyright 2015 OpenStack Foundation
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,12 +11,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 **/
-
-namespace oauth2\services;
-
 /**
  * Class RefreshTokenGenerator
- * @package oauth2\services
+ * @package OAuth2\Services
  */
-final class RefreshTokenGenerator extends OAuth2ATokenGenerator {
+final class RefreshTokenGenerator extends OAuth2TokenGenerator {
 }
\ No newline at end of file
diff --git a/app/libs/oauth2/StandardClaims.php b/app/libs/OAuth2/StandardClaims.php
similarity index 90%
rename from app/libs/oauth2/StandardClaims.php
rename to app/libs/OAuth2/StandardClaims.php
index f3c0112b..845338c8 100644
--- a/app/libs/oauth2/StandardClaims.php
+++ b/app/libs/OAuth2/StandardClaims.php
@@ -1,23 +1,9 @@
-<?php
-/**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-namespace oauth2;
+<?php namespace OAuth2;
 
 /**
  * Class StandardClaims
- * @package oauth2
- * http://openid.net/specs/openid-connect-core-1_0.html#StandardClaims
+ * @package OAuth2
+ * @see http://openid.net/specs/openid-connect-core-1_0.html#StandardClaims
  */
 abstract class StandardClaims
 {
diff --git a/app/libs/oauth2/strategies/ClientAssertionAuthContextValidator.php b/app/libs/OAuth2/Strategies/ClientAssertionAuthContextValidator.php
similarity index 91%
rename from app/libs/oauth2/strategies/ClientAssertionAuthContextValidator.php
rename to app/libs/OAuth2/Strategies/ClientAssertionAuthContextValidator.php
index 96aa494c..82623b9a 100644
--- a/app/libs/oauth2/strategies/ClientAssertionAuthContextValidator.php
+++ b/app/libs/OAuth2/Strategies/ClientAssertionAuthContextValidator.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\Strategies;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,18 +13,15 @@
  * limitations under the License.
  **/
 
-namespace oauth2\strategies;
-
 use jwk\IJWK;
-use oauth2\exceptions\InvalidClientAuthenticationContextException;
-use oauth2\exceptions\RecipientKeyNotFoundException;
-use oauth2\models\ClientAssertionAuthenticationContext;
-use oauth2\models\ClientAuthenticationContext;
+use OAuth2\Exceptions\InvalidClientAuthenticationContextException;
+use OAuth2\Models\ClientAssertionAuthenticationContext;
+use OAuth2\Models\ClientAuthenticationContext;
 use utils\json_types\JsonValue;
 
 /**
  * Class ClientAssertionAuthContextValidator
- * @package oauth2\strategies
+ * @package OAuth2\Strategies
  */
 abstract class ClientAssertionAuthContextValidator implements IClientAuthContextValidator
 {
@@ -54,6 +52,7 @@ abstract class ClientAssertionAuthContextValidator implements IClientAuthContext
     /**
      * @param ClientAuthenticationContext $context
      * @return bool
+     * @throws InvalidClientAuthenticationContextException
      */
     public function validate(ClientAuthenticationContext $context)
     {
diff --git a/app/libs/oauth2/strategies/ClientAuthContextValidatorFactory.php b/app/libs/OAuth2/Strategies/ClientAuthContextValidatorFactory.php
similarity index 89%
rename from app/libs/oauth2/strategies/ClientAuthContextValidatorFactory.php
rename to app/libs/OAuth2/Strategies/ClientAuthContextValidatorFactory.php
index fd9c7692..aba35a38 100644
--- a/app/libs/oauth2/strategies/ClientAuthContextValidatorFactory.php
+++ b/app/libs/OAuth2/Strategies/ClientAuthContextValidatorFactory.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\Strategies;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,16 +13,14 @@
  * limitations under the License.
  **/
 
-namespace oauth2\strategies;
-
-use oauth2\exceptions\InvalidTokenEndpointAuthMethodException;
-use oauth2\models\ClientAuthenticationContext;
-use oauth2\OAuth2Protocol;
-use oauth2\services\IClientJWKSetReader;
+use OAuth2\Exceptions\InvalidTokenEndpointAuthMethodException;
+use OAuth2\Models\ClientAuthenticationContext;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Services\IClientJWKSetReader;
 
 /**
  * Class ClientAuthContextValidatorFactory
- * @package oauth2\strategies
+ * @package OAuth2\Strategies
  */
 final class ClientAuthContextValidatorFactory
 {
@@ -54,6 +53,7 @@ final class ClientAuthContextValidatorFactory
     /**
      * @param ClientAuthenticationContext $context
      * @return IClientAuthContextValidator
+     * @throws InvalidTokenEndpointAuthMethodException
      */
     static public function build(ClientAuthenticationContext $context)
     {
diff --git a/app/libs/oauth2/strategies/ClientPlainCredentialsAuthContextValidator.php b/app/libs/OAuth2/Strategies/ClientPlainCredentialsAuthContextValidator.php
similarity index 81%
rename from app/libs/oauth2/strategies/ClientPlainCredentialsAuthContextValidator.php
rename to app/libs/OAuth2/Strategies/ClientPlainCredentialsAuthContextValidator.php
index 79a5b0f0..5c1eb9b9 100644
--- a/app/libs/oauth2/strategies/ClientPlainCredentialsAuthContextValidator.php
+++ b/app/libs/OAuth2/Strategies/ClientPlainCredentialsAuthContextValidator.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\Strategies;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,18 +13,15 @@
  * limitations under the License.
  **/
 
-namespace oauth2\strategies;
-
-use oauth2\exceptions\InvalidClientAuthenticationContextException;
-use oauth2\exceptions\InvalidClientCredentials;
-use oauth2\models\ClientAuthenticationContext;
-use oauth2\models\ClientCredentialsAuthenticationContext;
-use oauth2\models\IClient;
-use oauth2\OAuth2Protocol;
+use OAuth2\Exceptions\InvalidClientAuthenticationContextException;
+use OAuth2\Exceptions\InvalidClientCredentials;
+use OAuth2\Models\ClientAuthenticationContext;
+use OAuth2\Models\ClientCredentialsAuthenticationContext;
+use OAuth2\Models\IClient;
 
 /**
  * Class ClientPlainCredentialsAuthContextValidator
- * @package oauth2\strategies
+ * @package OAuth2\Strategies
  */
 final class ClientPlainCredentialsAuthContextValidator implements IClientAuthContextValidator
 {
@@ -31,6 +29,8 @@ final class ClientPlainCredentialsAuthContextValidator implements IClientAuthCon
     /**
      * @param ClientAuthenticationContext $context
      * @return bool
+     * @throws InvalidClientAuthenticationContextException
+     * @throws InvalidClientCredentials
      */
     public function validate(ClientAuthenticationContext $context)
     {
diff --git a/app/libs/oauth2/strategies/ClientPrivateKeyAssertionAuthContextValidator.php b/app/libs/OAuth2/Strategies/ClientPrivateKeyAssertionAuthContextValidator.php
similarity index 91%
rename from app/libs/oauth2/strategies/ClientPrivateKeyAssertionAuthContextValidator.php
rename to app/libs/OAuth2/Strategies/ClientPrivateKeyAssertionAuthContextValidator.php
index 1756383a..5f3f5664 100644
--- a/app/libs/oauth2/strategies/ClientPrivateKeyAssertionAuthContextValidator.php
+++ b/app/libs/OAuth2/Strategies/ClientPrivateKeyAssertionAuthContextValidator.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\Strategies;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,19 +13,17 @@
  * limitations under the License.
  **/
 
-namespace oauth2\strategies;
-
 use jwk\IJWK;
 use jwk\JSONWebKeyPublicKeyUseValues;
-use oauth2\exceptions\InvalidClientAuthenticationContextException;
-use oauth2\models\ClientAssertionAuthenticationContext;
-use oauth2\models\ClientAuthenticationContext;
-use oauth2\services\IClientJWKSetReader;
+use OAuth2\Exceptions\InvalidClientAuthenticationContextException;
+use OAuth2\Models\ClientAssertionAuthenticationContext;
+use OAuth2\Models\ClientAuthenticationContext;
+use OAuth2\Services\IClientJWKSetReader;
 use utils\json_types\JsonValue;
 
 /**
  * Class ClientPrivateKeyAssertionAuthContextValidator
- * @package oauth2\strategies
+ * @package OAuth2\Strategies
  */
 final class ClientPrivateKeyAssertionAuthContextValidator extends ClientAssertionAuthContextValidator
 {
diff --git a/app/libs/oauth2/strategies/ClientSharedSecretAssertionAuthContextValidator.php b/app/libs/OAuth2/Strategies/ClientSharedSecretAssertionAuthContextValidator.php
similarity index 79%
rename from app/libs/oauth2/strategies/ClientSharedSecretAssertionAuthContextValidator.php
rename to app/libs/OAuth2/Strategies/ClientSharedSecretAssertionAuthContextValidator.php
index bc685fa9..fefe8e99 100644
--- a/app/libs/oauth2/strategies/ClientSharedSecretAssertionAuthContextValidator.php
+++ b/app/libs/OAuth2/Strategies/ClientSharedSecretAssertionAuthContextValidator.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\Strategies;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,19 +13,20 @@
  * limitations under the License.
  **/
 
-namespace oauth2\strategies;
-
 use jwk\IJWK;
 use jwk\impl\OctetSequenceJWKFactory;
 use jwk\impl\OctetSequenceJWKSpecification;
-use oauth2\exceptions\InvalidClientAuthenticationContextException;
-use oauth2\models\ClientAssertionAuthenticationContext;
-use oauth2\models\ClientAuthenticationContext;
+use jwk\exceptions\InvalidJWKAlgorithm;
+use jwk\exceptions\JWKInvalidSpecException;
 use utils\json_types\JsonValue;
+use OAuth2\Exceptions\InvalidClientAuthenticationContextException;
+use OAuth2\Models\ClientAssertionAuthenticationContext;
+use OAuth2\Models\ClientAuthenticationContext;
+
 
 /**
  * Class ClientSharedSecretAssertionAuthContextValidator
- * @package oauth2\strategies
+ * @package OAuth2\Strategies
  */
 final class ClientSharedSecretAssertionAuthContextValidator extends ClientAssertionAuthContextValidator
 {
@@ -34,9 +36,13 @@ final class ClientSharedSecretAssertionAuthContextValidator extends ClientAssert
      * Clients that have received a client_secret value from the Authorization Server create a JWT using an HMAC SHA
      * algorithm, such as HMAC SHA-256. The HMAC (Hash-based Message Authentication Code) is calculated using the octets
      * of the UTF-8 representation of the client_secret as the shared key.
-     * @param JsonValue $kid
+     *
      * @param ClientAuthenticationContext $context
+     * @param JsonValue|null $kid
      * @return IJWK
+     * @throws InvalidClientAuthenticationContextException
+     * @throws InvalidJWKAlgorithm
+     * @throws JWKInvalidSpecException
      */
     protected function getKey(ClientAuthenticationContext $context, JsonValue $kid = null)
     {
diff --git a/app/libs/oauth2/strategies/IClientAuthContextValidator.php b/app/libs/OAuth2/Strategies/IClientAuthContextValidator.php
similarity index 88%
rename from app/libs/oauth2/strategies/IClientAuthContextValidator.php
rename to app/libs/OAuth2/Strategies/IClientAuthContextValidator.php
index d71c2516..a265d24a 100644
--- a/app/libs/oauth2/strategies/IClientAuthContextValidator.php
+++ b/app/libs/OAuth2/Strategies/IClientAuthContextValidator.php
@@ -1,4 +1,5 @@
-<?php
+<?php namespace OAuth2\Strategies;
+
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,13 +13,11 @@
  * limitations under the License.
  **/
 
-namespace oauth2\strategies;
-
-use oauth2\models\ClientAuthenticationContext;
+use OAuth2\Models\ClientAuthenticationContext;
 
 /**
  * Interface IClientAuthContextValidator
- * @package oauth2\strategies
+ * @package OAuth2\Strategies
  */
 interface IClientAuthContextValidator
 {
diff --git a/app/libs/OAuth2/Strategies/IOAuth2AuthenticationStrategy.php b/app/libs/OAuth2/Strategies/IOAuth2AuthenticationStrategy.php
new file mode 100644
index 00000000..fd04a93a
--- /dev/null
+++ b/app/libs/OAuth2/Strategies/IOAuth2AuthenticationStrategy.php
@@ -0,0 +1,32 @@
+<?php namespace OAuth2\Strategies;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\requests\OAuth2AuthorizationRequest;
+/**
+ * Interface IOAuth2AuthenticationStrategy
+ * @package OAuth2\Strategies
+ */
+interface IOAuth2AuthenticationStrategy {
+
+    /**
+     * @param OAuth2AuthorizationRequest $request
+     * @return mixed
+     */
+    public function doLogin(OAuth2AuthorizationRequest $request);
+
+    /**
+     * @param OAuth2AuthorizationRequest $request
+     * @return mixed
+     */
+    public function doConsent(OAuth2AuthorizationRequest $request);
+} 
\ No newline at end of file
diff --git a/app/libs/oauth2/strategies/OAuth2IndirectErrorResponseFactoryMethod.php b/app/libs/OAuth2/Strategies/OAuth2IndirectErrorResponseFactoryMethod.php
similarity index 64%
rename from app/libs/oauth2/strategies/OAuth2IndirectErrorResponseFactoryMethod.php
rename to app/libs/OAuth2/Strategies/OAuth2IndirectErrorResponseFactoryMethod.php
index a8f9ff9d..b68dcc73 100644
--- a/app/libs/oauth2/strategies/OAuth2IndirectErrorResponseFactoryMethod.php
+++ b/app/libs/OAuth2/Strategies/OAuth2IndirectErrorResponseFactoryMethod.php
@@ -1,17 +1,29 @@
-<?php
+<?php namespace OAuth2\Strategies;
 
-namespace oauth2\strategies;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-use oauth2\requests\OAuth2Request;
-use oauth2\responses\OAuth2IndirectErrorResponse;
-use oauth2\responses\OAuth2IndirectFragmentErrorResponse;
-use oauth2\OAuth2Protocol;
 use Exception;
-use oauth2\requests\OAuth2AuthorizationRequest;
+use OAuth2\Requests\OAuth2Request;
+use OAuth2\Responses\OAuth2IndirectErrorResponse;
+use OAuth2\Responses\OAuth2IndirectFragmentErrorResponse;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Responses\OAuth2Response;
+use OAuth2\Requests\OAuth2AuthorizationRequest;
 
 /**
  * Class OAuth2IndirectErrorResponseFactoryMethod
- * @package oauth2\strategies
+ * @package OAuth2\Strategies
  */
 final class OAuth2IndirectErrorResponseFactoryMethod
 {
@@ -21,14 +33,12 @@ final class OAuth2IndirectErrorResponseFactoryMethod
      * @param string $error
      * @param string $error_description
      * @param string|null $return_url
-     * @return null|OAuth2IndirectErrorResponse|OAuth2IndirectFragmentErrorResponse
+     * @return null|OAuth2Response
      * @throws Exception
      */
     public static function buildResponse(OAuth2Request $request = null, $error, $error_description, $return_url = null)
     {
 
-        $response = null;
-
         if($request instanceof OAuth2AuthorizationRequest)
         {
             $response_type = $request->getResponseType(false);
diff --git a/app/libs/oauth2/strategies/OAuth2ResponseStrategyFactoryMethod.php b/app/libs/OAuth2/Strategies/OAuth2ResponseStrategyFactoryMethod.php
similarity index 67%
rename from app/libs/oauth2/strategies/OAuth2ResponseStrategyFactoryMethod.php
rename to app/libs/OAuth2/Strategies/OAuth2ResponseStrategyFactoryMethod.php
index fc5e9178..b7621656 100644
--- a/app/libs/oauth2/strategies/OAuth2ResponseStrategyFactoryMethod.php
+++ b/app/libs/OAuth2/Strategies/OAuth2ResponseStrategyFactoryMethod.php
@@ -1,21 +1,33 @@
-<?php
+<?php namespace OAuth2\Strategies;
 
-namespace oauth2\strategies;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-use oauth2\requests\OAuth2AuthenticationRequest;
-use oauth2\requests\OAuth2Request;
-use oauth2\responses\OAuth2DirectResponse;
-use oauth2\responses\OAuth2IndirectFragmentResponse;
-use oauth2\responses\OAuth2IndirectResponse;
-use oauth2\responses\OAuth2PostResponse;
-use oauth2\responses\OAuth2Response;
-use utils\IHttpResponseStrategy;
-use utils\services\ServiceLocator;
-use oauth2\OAuth2Protocol;
+use OAuth2\Requests\OAuth2AuthenticationRequest;
+use OAuth2\Requests\OAuth2Request;
+use OAuth2\Responses\OAuth2DirectResponse;
+use OAuth2\Responses\OAuth2IndirectFragmentResponse;
+use OAuth2\Responses\OAuth2IndirectResponse;
+use OAuth2\Responses\OAuth2PostResponse;
+use OAuth2\Responses\OAuth2Response;
+use Utils\IHttpResponseStrategy;
+use Utils\Services\ServiceLocator;
+use OAuth2\OAuth2Protocol;
+use Exception;
 
 /**
  * Class OAuth2ResponseStrategyFactoryMethod
- * @package oauth2\strategies
+ * @package OAuth2\Strategies
  */
 final class OAuth2ResponseStrategyFactoryMethod
 {
@@ -24,7 +36,7 @@ final class OAuth2ResponseStrategyFactoryMethod
      * @param OAuth2Request $request
      * @param OAuth2Response $response
      * @return IHttpResponseStrategy
-     * @throws \Exception
+     * @throws Exception
      */
     public static function buildStrategy(OAuth2Request $request, OAuth2Response $response)
     {
@@ -80,7 +92,7 @@ final class OAuth2ResponseStrategyFactoryMethod
             }
             break;
             default:
-                throw new \Exception(sprintf("Invalid OAuth2 response Type %s", $type));
+                throw new Exception(sprintf("Invalid OAuth2 response Type %s", $type));
             break;
         }
     }
diff --git a/app/libs/OpenId/Exceptions/InvalidAssociation.php b/app/libs/OpenId/Exceptions/InvalidAssociation.php
new file mode 100644
index 00000000..3f0a1b47
--- /dev/null
+++ b/app/libs/OpenId/Exceptions/InvalidAssociation.php
@@ -0,0 +1,26 @@
+<?php namespace OpenId\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class InvalidAssociation
+ * @package OpenId\Exceptions
+ */
+class InvalidAssociation extends Exception {
+
+    public function __construct($message = "")
+    {
+        $message = "Invalid Association: " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Exceptions/InvalidAssociationTypeException.php b/app/libs/OpenId/Exceptions/InvalidAssociationTypeException.php
new file mode 100644
index 00000000..e5f1049b
--- /dev/null
+++ b/app/libs/OpenId/Exceptions/InvalidAssociationTypeException.php
@@ -0,0 +1,26 @@
+<?php namespace OpenId\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class InvalidAssociationTypeException
+ * @package OpenId\Exceptions
+ */
+class InvalidAssociationTypeException extends Exception {
+
+    public function __construct($message = "")
+    {
+        $message = "Invalid Association Type: " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Exceptions/InvalidDHParam.php b/app/libs/OpenId/Exceptions/InvalidDHParam.php
new file mode 100644
index 00000000..19ef3dd5
--- /dev/null
+++ b/app/libs/OpenId/Exceptions/InvalidDHParam.php
@@ -0,0 +1,26 @@
+<?php namespace OpenId\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class InvalidDHParam
+ * @package OpenId\Exceptions
+ */
+class InvalidDHParam extends Exception {
+
+    public function __construct($message = "")
+    {
+        $message = "Invalid Diffie Helman Parameter : " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Exceptions/InvalidKVFormat.php b/app/libs/OpenId/Exceptions/InvalidKVFormat.php
new file mode 100644
index 00000000..c3d8e267
--- /dev/null
+++ b/app/libs/OpenId/Exceptions/InvalidKVFormat.php
@@ -0,0 +1,26 @@
+<?php namespace OpenId\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class InvalidKVFormat
+ * @package OpenId\Exceptions
+ */
+class InvalidKVFormat extends Exception {
+
+    public function __construct($message = "")
+    {
+        $message = "Invalid Key Value Format : " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Exceptions/InvalidNonce.php b/app/libs/OpenId/Exceptions/InvalidNonce.php
new file mode 100644
index 00000000..0477666a
--- /dev/null
+++ b/app/libs/OpenId/Exceptions/InvalidNonce.php
@@ -0,0 +1,26 @@
+<?php namespace OpenId\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class InvalidNonce
+ * @package OpenId\Exceptions
+ */
+class InvalidNonce extends Exception {
+
+    public function __construct($message = "")
+    {
+        $message = "Invalid Nonce : " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Exceptions/InvalidOpenIdAuthenticationRequestMode.php b/app/libs/OpenId/Exceptions/InvalidOpenIdAuthenticationRequestMode.php
new file mode 100644
index 00000000..14121792
--- /dev/null
+++ b/app/libs/OpenId/Exceptions/InvalidOpenIdAuthenticationRequestMode.php
@@ -0,0 +1,36 @@
+<?php namespace OpenId\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **//**
+ * Class InvalidOpenIdAuthenticationRequestMode
+ * @package OpenId\Exceptions
+ */
+class InvalidOpenIdAuthenticationRequestMode extends Exception {
+    public function __construct($message = "")
+    {
+        $message = "Invalid OpenId Authentication Request Mode : " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Exceptions/InvalidOpenIdMessageException.php b/app/libs/OpenId/Exceptions/InvalidOpenIdMessageException.php
new file mode 100644
index 00000000..8ed15a4e
--- /dev/null
+++ b/app/libs/OpenId/Exceptions/InvalidOpenIdMessageException.php
@@ -0,0 +1,26 @@
+<?php namespace OpenId\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class InvalidOpenIdMessageException
+ * @package OpenId\Exceptions
+ */
+class InvalidOpenIdMessageException extends Exception {
+
+    public function __construct($message = "")
+    {
+        $message = "Invalid OpenId Message : " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Exceptions/InvalidOpenIdMessageMode.php b/app/libs/OpenId/Exceptions/InvalidOpenIdMessageMode.php
new file mode 100644
index 00000000..07a02390
--- /dev/null
+++ b/app/libs/OpenId/Exceptions/InvalidOpenIdMessageMode.php
@@ -0,0 +1,25 @@
+<?php namespace OpenId\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class InvalidOpenIdMessageMode
+ * @package OpenId\Exceptions
+ */
+class InvalidOpenIdMessageMode extends Exception {
+    public function __construct($message = "")
+    {
+        $message = "Invalid OpenId Message Mode : " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Exceptions/InvalidRequestContextException.php b/app/libs/OpenId/Exceptions/InvalidRequestContextException.php
new file mode 100644
index 00000000..c17d935e
--- /dev/null
+++ b/app/libs/OpenId/Exceptions/InvalidRequestContextException.php
@@ -0,0 +1,26 @@
+<?php namespace OpenId\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class InvalidRequestContextException
+ * @package OpenId\Exceptions
+ */
+class InvalidRequestContextException extends Exception {
+
+    public function __construct($message = "")
+    {
+        $message = "Invalid Request Context : " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Exceptions/InvalidSessionTypeException.php b/app/libs/OpenId/Exceptions/InvalidSessionTypeException.php
new file mode 100644
index 00000000..36cf30ad
--- /dev/null
+++ b/app/libs/OpenId/Exceptions/InvalidSessionTypeException.php
@@ -0,0 +1,26 @@
+<?php namespace OpenId\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class InvalidSessionTypeException
+ * @package OpenId\Exceptions
+ */
+class InvalidSessionTypeException extends Exception {
+
+    public function __construct($message = "")
+    {
+        $message = "Invalid Session Type: " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Exceptions/InvalidTLDException.php b/app/libs/OpenId/Exceptions/InvalidTLDException.php
new file mode 100644
index 00000000..bdb6e88e
--- /dev/null
+++ b/app/libs/OpenId/Exceptions/InvalidTLDException.php
@@ -0,0 +1,26 @@
+<?php namespace OpenId\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class InvalidTLDException
+ * @package OpenId\Exceptions
+ */
+class InvalidTLDException extends Exception {
+
+    public function __construct($message = "")
+    {
+        $message = "Invalid TDL: " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Exceptions/OpenIdCryptoException.php b/app/libs/OpenId/Exceptions/OpenIdCryptoException.php
new file mode 100644
index 00000000..fd39eea1
--- /dev/null
+++ b/app/libs/OpenId/Exceptions/OpenIdCryptoException.php
@@ -0,0 +1,26 @@
+<?php namespace OpenId\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class OpenIdCryptoException
+ * @package OpenId\Exceptions
+ */
+class OpenIdCryptoException extends Exception {
+
+    public function __construct($message = "")
+    {
+        $message = "OpenId Crypto Error: " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Exceptions/OpenIdInvalidRealmException.php b/app/libs/OpenId/Exceptions/OpenIdInvalidRealmException.php
new file mode 100644
index 00000000..cec7a1a2
--- /dev/null
+++ b/app/libs/OpenId/Exceptions/OpenIdInvalidRealmException.php
@@ -0,0 +1,26 @@
+<?php namespace OpenId\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class OpenIdInvalidRealmException
+ * @package OpenId\Exceptions
+ */
+class OpenIdInvalidRealmException extends Exception {
+
+    public function __construct($message = "")
+    {
+        $message = "OpenId Invalid Realm : " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Exceptions/ReplayAttackException.php b/app/libs/OpenId/Exceptions/ReplayAttackException.php
new file mode 100644
index 00000000..835a5a4f
--- /dev/null
+++ b/app/libs/OpenId/Exceptions/ReplayAttackException.php
@@ -0,0 +1,26 @@
+<?php namespace OpenId\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Class ReplayAttackException
+ * @package OpenId\Exceptions
+ */
+class ReplayAttackException extends Exception {
+
+    public function __construct($message = "")
+    {
+        $message = "Possible Replay Attack : " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/openid/extensions/implementations/OpenIdAXExtension.php b/app/libs/OpenId/Extensions/Implementations/OpenIdAXExtension.php
similarity index 62%
rename from app/libs/openid/extensions/implementations/OpenIdAXExtension.php
rename to app/libs/OpenId/Extensions/Implementations/OpenIdAXExtension.php
index 0b49d4b1..3f763a35 100644
--- a/app/libs/openid/extensions/implementations/OpenIdAXExtension.php
+++ b/app/libs/OpenId/Extensions/Implementations/OpenIdAXExtension.php
@@ -1,47 +1,62 @@
-<?php
-
-namespace openid\extensions\implementations;
-
+<?php namespace OpenId\Extensions\Implementations;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 use Exception;
-use openid\extensions\OpenIdExtension;
-use openid\OpenIdProtocol;
-use openid\requests\contexts\PartialView;
-use openid\requests\contexts\RequestContext;
-use openid\requests\OpenIdRequest;
-use openid\responses\contexts\ResponseContext;
-use openid\responses\OpenIdResponse;
-use utils\services\ILogService;
-use utils\services\IAuthService;
+use OpenId\Extensions\OpenIdExtension;
+use OpenId\OpenIdProtocol;
+use OpenId\Requests\Contexts\PartialView;
+use OpenId\Requests\Contexts\RequestContext;
+use OpenId\Requests\OpenIdRequest;
+use OpenId\Responses\Contexts\ResponseContext;
+use OpenId\Responses\OpenIdResponse;
+use Utils\Services\ILogService;
+use Utils\Services\IAuthService;
 /**
  * Class OpenIdAXExtension
  * Implements
  * http://openid.net/specs/openid-attribute-exchange-1_0.html
- * @package openid\extensions\implementations
+ * @package OpenId\Extensions\Implementations
  */
 class OpenIdAXExtension extends OpenIdExtension
 {
-    const Prefix = "ax";
-    const NamespaceUrl = "http://openid.net/srv/ax/1.0";
+    const Prefix             = "ax";
+    const NamespaceUrl       = "http://openid.net/srv/ax/1.0";
     const RequiredAttributes = "required";
-    const Mode = "mode";
-    const Country = "country";
-    const Email = "email";
-    const FirstMame = "firstname";
-    const Language = "language";
-    const LastName = "lastname";
-    const Type = "type";
-    const Value = "value";
-    const FetchResponse = "fetch_response";
-    const FetchRequest = "fetch_request";
-    public static $available_properties;
+    const Mode               = "mode";
+    const Country            = "country";
+    const Email              = "email";
+    const FirstMame          = "firstname";
+    const Language           = "language";
+    const LastName           = "lastname";
+    const Type               = "type";
+    const Value              = "value";
+    const FetchResponse      = "fetch_response";
+    const FetchRequest       = "fetch_request";
+    /**
+     * @var array
+     */
+    public static $available_properties = array();
 
+    /**
+     * @var IAuthService
+     */
 	private $auth_service;
 
 	/**
-	 * @param              $name
-	 * @param              $namespace
-	 * @param              $view_name
-	 * @param              $description
+	 * @param string       $name
+	 * @param string       $namespace
+	 * @param string       $view_name
+	 * @param string       $description
 	 * @param IAuthService $auth_service
 	 * @param ILogService  $log_service
 	 */
@@ -50,14 +65,21 @@ class OpenIdAXExtension extends OpenIdExtension
                                 ILogService $log_service)
     {
         parent::__construct($name, $namespace, $view_name, $description, $log_service);
+
 	    $this->auth_service = $auth_service;
-        self::$available_properties[OpenIdAXExtension::Country] = "http://axschema.org/contact/country/home";
-        self::$available_properties[OpenIdAXExtension::Email] = "http://axschema.org/contact/email";
+
+        self::$available_properties[OpenIdAXExtension::Country]   = "http://axschema.org/contact/country/home";
+        self::$available_properties[OpenIdAXExtension::Email]     = "http://axschema.org/contact/email";
         self::$available_properties[OpenIdAXExtension::FirstMame] = "http://axschema.org/namePerson/first";
-        self::$available_properties[OpenIdAXExtension::LastName] = "http://axschema.org/namePerson/last";
-        self::$available_properties[OpenIdAXExtension::Language] = "http://axschema.org/pref/language";
+        self::$available_properties[OpenIdAXExtension::LastName]  = "http://axschema.org/namePerson/last";
+        self::$available_properties[OpenIdAXExtension::Language]  = "http://axschema.org/pref/language";
     }
 
+    /**
+     * @param OpenIdRequest $request
+     * @param RequestContext $context
+     * @return void
+     */
     public function parseRequest(OpenIdRequest $request, RequestContext $context)
     {
         try {
@@ -75,6 +97,12 @@ class OpenIdAXExtension extends OpenIdExtension
         }
     }
 
+    /**
+     * @param OpenIdRequest $request
+     * @param OpenIdResponse $response
+     * @param ResponseContext $context
+     * @return void
+     */
     public function prepareResponse(OpenIdRequest $request, OpenIdResponse $response, ResponseContext $context)
     {
         try {
@@ -113,16 +141,29 @@ class OpenIdAXExtension extends OpenIdExtension
         }
     }
 
+    /**
+     * @param string $separator
+     * @return string
+     */
     public static function paramNamespace($separator = '.')
     {
         return OpenIdProtocol::OpenIdPrefix . $separator . OpenIdProtocol::OpenIDProtocol_NS . $separator . self::Prefix;
     }
 
+    /**
+     * @param $param
+     * @param string $separator
+     * @return string
+     */
     public static function param($param, $separator = '.')
     {
         return OpenIdProtocol::OpenIdPrefix . $separator . self::Prefix . $separator . $param;
     }
 
+    /**
+     * @param OpenIdRequest $request
+     * @return array
+     */
     public function getTrustedData(OpenIdRequest $request)
     {
         $data = array();
@@ -135,6 +176,7 @@ class OpenIdAXExtension extends OpenIdExtension
                 }
             }
         } catch (Exception $ex) {
+            $this->log_service->debug_msg($request->__toString());
             $this->log_service->error($ex);
         }
         return $data;
diff --git a/app/libs/OpenId/Extensions/Implementations/OpenIdAXRequest.php b/app/libs/OpenId/Extensions/Implementations/OpenIdAXRequest.php
new file mode 100644
index 00000000..12b669ff
--- /dev/null
+++ b/app/libs/OpenId/Extensions/Implementations/OpenIdAXRequest.php
@@ -0,0 +1,98 @@
+<?php namespace OpenId\Extensions\Implementations;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OpenId\Exceptions\InvalidOpenIdMessageException;
+use OpenId\Helpers\OpenIdErrorMessages;
+use OpenId\OpenIdMessage;
+use OpenId\Requests\OpenIdRequest;
+use Utils\Http\HttpMessage;
+
+/**
+ * Class OpenIdAXRequest
+ * Implements http://openid.net/specs/openid-attribute-exchange-1_0.html
+ * @package OpenId\Extensions\Implementations
+ */
+class OpenIdAXRequest extends OpenIdRequest
+{
+    /**
+     * @var array
+     */
+    private $attributes;
+
+    /**
+     * OpenIdAXRequest constructor.
+     * @param OpenIdMessage $message
+     */
+    public function __construct(OpenIdMessage $message)
+    {
+        parent::__construct($message);
+        $this->attributes = array();
+    }
+
+    /**
+     * @return bool
+     * @throws InvalidOpenIdMessageException
+     */
+    public function isValid()
+    {
+
+        //check identifier
+        if (isset($this->message[OpenIdAXExtension::paramNamespace(HttpMessage::PHP_REQUEST_VAR_SEPARATOR)])
+            && $this->message[OpenIdAXExtension::paramNamespace(HttpMessage::PHP_REQUEST_VAR_SEPARATOR)] == OpenIdAXExtension::NamespaceUrl
+        ) {
+
+            //check required fields
+
+            if (!isset($this->message[OpenIdAXExtension::param(OpenIdAXExtension::Mode, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)])
+                || $this->message[OpenIdAXExtension::param(OpenIdAXExtension::Mode, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)] != OpenIdAXExtension::FetchRequest
+            )
+                throw new InvalidOpenIdMessageException(OpenIdErrorMessages::AXInvalidModeMessage);
+
+            if (!isset($this->message[OpenIdAXExtension::param(OpenIdAXExtension::RequiredAttributes, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)]))
+                throw new InvalidOpenIdMessageException(OpenIdErrorMessages::AXInvalidRequiredAttributesMessage);
+
+            //get attributes
+            $attributes = $this->message[OpenIdAXExtension::param(OpenIdAXExtension::RequiredAttributes, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)];
+            $attributes = explode(",", $attributes);
+
+            foreach ($attributes as $attr) {
+                $attr = trim($attr);
+                if (!isset(OpenIdAXExtension::$available_properties[$attr]))
+                    continue;
+
+                $attr_ns = OpenIdAXExtension::param(OpenIdAXExtension::Type, HttpMessage::PHP_REQUEST_VAR_SEPARATOR) . HttpMessage::PHP_REQUEST_VAR_SEPARATOR . $attr;
+
+                if (!isset($this->message[$attr_ns]))
+                    throw new InvalidOpenIdMessageException(sprintf(OpenIdErrorMessages::AXInvalidNamespaceMessage,$attr_ns, $attr));
+
+                $ns = $this->message[$attr_ns];
+
+                if ($ns != OpenIdAXExtension::$available_properties[$attr])
+                    throw new InvalidOpenIdMessageException(sprintf(OpenIdErrorMessages::AXInvalidNamespaceMessage, $ns, $attr));
+
+                array_push($this->attributes, $attr);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @return array
+     */
+    public function getRequiredAttributes()
+    {
+        return $this->attributes;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/openid/extensions/implementations/OpenIdOAuth2Extension.php b/app/libs/OpenId/Extensions/Implementations/OpenIdOAuth2Extension.php
similarity index 76%
rename from app/libs/openid/extensions/implementations/OpenIdOAuth2Extension.php
rename to app/libs/OpenId/Extensions/Implementations/OpenIdOAuth2Extension.php
index 1d457845..11af3916 100644
--- a/app/libs/openid/extensions/implementations/OpenIdOAuth2Extension.php
+++ b/app/libs/OpenId/Extensions/Implementations/OpenIdOAuth2Extension.php
@@ -1,27 +1,35 @@
-<?php
-
-namespace openid\extensions\implementations;
-
-use oauth2\IOAuth2Protocol;
-use oauth2\services\IApiScopeService;
-use oauth2\services\IClientService;
-use openid\requests\contexts\PartialView;
-use openid\extensions\OpenIdExtension;
-use openid\OpenIdProtocol;
-use openid\requests\contexts\RequestContext;
-use openid\requests\OpenIdRequest;
-use openid\responses\contexts\ResponseContext;
-use openid\responses\OpenIdResponse;
+<?php namespace OpenId\Extensions\Implementations;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\IOAuth2Protocol;
+use OAuth2\Repositories\IApiScopeRepository;
+use OAuth2\Repositories\IClientRepository;
+use OAuth2\Responses\OAuth2AuthorizationResponse;
+use OAuth2\Services\IApiScopeService;
+use OAuth2\Services\IClientService;
+use OpenId\Requests\Contexts\PartialView;
+use OpenId\Extensions\OpenIdExtension;
+use OpenId\OpenIdProtocol;
+use OpenId\Requests\Contexts\RequestContext;
+use OpenId\Requests\OpenIdRequest;
+use OpenId\Responses\Contexts\ResponseContext;
+use OpenId\Responses\OpenIdResponse;
+use Utils\Services\ICheckPointService;
+use Utils\Services\ILogService;
+use OAuth2\Requests\OAuth2AuthorizationRequest;
+use OAuth2\OAuth2Protocol;
+use OAuth2\OAuth2Message;
 use Exception;
-
-use utils\services\ICheckPointService;
-use utils\services\ILogService;
-
-use oauth2\requests\OAuth2AuthorizationRequest;
-use oauth2\OAuth2Protocol;
-use oauth2\OAuth2Message;
-
-
 /**
  * Class OpenIdOAuthExtension
  * Implements
@@ -31,7 +39,7 @@ use oauth2\OAuth2Message;
  * and OAuth, particularly in that it simplifies the process for users by requesting
  * their approval once instead of twice.
  * In this way, the user can approve login and service access at the same time.
- * @package openid\extensions\implementations
+ * @package OpenId\Extensions\Implementations
  */
 class OpenIdOAuth2Extension extends OpenIdExtension
 {
@@ -44,34 +52,47 @@ class OpenIdOAuth2Extension extends OpenIdExtension
     const ClientId      = OAuth2Protocol::OAuth2Protocol_ClientId;
     const State         = OAuth2Protocol::OAuth2Protocol_State;
 
+    /**
+     * @var IOAuth2Protocol
+     */
     private $oauth2_protocol;
+    /**
+     * @var ICheckPointService
+     */
     private $checkpoint_service;
-    private $client_service;
-    private $scope_service;
+    /**
+     * @var IClientRepository
+     */
+    protected $client_repository;
+    /**
+     * @var IApiScopeRepository
+     */
+    private $scope_repository;
 
-	/**
-	 * @param                    $name
-	 * @param                    $namespace
-	 * @param                    $view_name
-	 * @param                    $description
-	 * @param IOAuth2Protocol    $oauth2_protocol
-	 * @param IClientService     $client_service
-	 * @param IApiScopeService   $scope_service
-	 * @param ICheckPointService $checkpoint_service
-	 * @param ILogService        $log_service
-	 */
+    /**
+     * OpenIdOAuth2Extension constructor.
+     * @param string $name
+     * @param string $namespace
+     * @param string $view_name
+     * @param string $description
+     * @param IOAuth2Protocol $oauth2_protocol
+     * @param IClientRepository $client_repository
+     * @param IApiScopeRepository $scope_repository
+     * @param ICheckPointService $checkpoint_service
+     * @param ILogService $log_service
+     */
 	public function __construct($name, $namespace, $view_name, $description,
 	                            IOAuth2Protocol $oauth2_protocol,
-	                            IClientService $client_service,
-	                            IApiScopeService $scope_service,
+                                IClientRepository $client_repository,
+                                IApiScopeRepository $scope_repository,
 	                            ICheckPointService $checkpoint_service,
 	                            ILogService $log_service)
     {
         parent::__construct($name, $namespace, $view_name, $description,$log_service);
 
         $this->oauth2_protocol     = $oauth2_protocol;
-	    $this->client_service      = $client_service;
-	    $this->scope_service       = $scope_service;
+	    $this->client_repository   = $client_repository;
+	    $this->scope_repository    = $scope_repository;
         $this->checkpoint_service  = $checkpoint_service;
     }
 
@@ -112,7 +133,7 @@ class OpenIdOAuth2Extension extends OpenIdExtension
             $scopes    = $oauth2_request->getScope();
             $client_id = $oauth2_request->getClientId();
 
-            $client = $this->client_service->getClientById($client_id);
+            $client = $this->client_repository->getClientById($client_id);
             // do some validations to allow show the oauth2 sub view...
             if(is_null($client)){
                 $this->log_service->warning_msg(sprintf("OpenIdOAuth2Extension: client id %s not found!.",$client_id));
@@ -134,7 +155,7 @@ class OpenIdOAuth2Extension extends OpenIdExtension
 
             $scopes           = explode(' ', $scopes);
             //get scopes entities
-            $requested_scopes = $this->scope_service->getScopesByName($scopes);
+            $requested_scopes = $this->scope_repository->getByName($scopes);
 
             // set view data
 
@@ -183,7 +204,7 @@ class OpenIdOAuth2Extension extends OpenIdExtension
             // do oauth2 Authorization Code Grant 1st step (get auth code to exchange for an access token)
             // http://tools.ietf.org/html/rfc6749#section-4.1
             $oauth2_response = $this->oauth2_protocol->authorize(new OAuth2AuthorizationRequest($oauth2_msg));
-            if ( get_class($oauth2_response) =='oauth2\\responses\\OAuth2AuthorizationResponse') {
+            if ( $oauth2_response instanceof OAuth2AuthorizationResponse ) {
                 //add namespace
                 $response->addParam(self::paramNamespace(),self::NamespaceUrl );
                 $context->addSignParam(self::paramNamespace());
diff --git a/app/libs/openid/extensions/implementations/OpenIdOAuth2Request.php b/app/libs/OpenId/Extensions/Implementations/OpenIdOAuth2Request.php
similarity index 57%
rename from app/libs/openid/extensions/implementations/OpenIdOAuth2Request.php
rename to app/libs/OpenId/Extensions/Implementations/OpenIdOAuth2Request.php
index 97b40fcd..493c919c 100644
--- a/app/libs/openid/extensions/implementations/OpenIdOAuth2Request.php
+++ b/app/libs/OpenId/Extensions/Implementations/OpenIdOAuth2Request.php
@@ -1,16 +1,25 @@
-<?php
-
-namespace openid\extensions\implementations;
-
-use openid\exceptions\InvalidOpenIdMessageException;
-use openid\helpers\OpenIdErrorMessages;
-use openid\OpenIdMessage;
-use openid\requests\OpenIdRequest;
-use oauth2\OAuth2Protocol;
-
+<?php namespace OpenId\Extensions\Implementations;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Exceptions\InvalidOpenIdMessageException;
+use OpenId\Helpers\OpenIdErrorMessages;
+use OpenId\OpenIdMessage;
+use OpenId\Requests\OpenIdRequest;
+use OAuth2\OAuth2Protocol;
+use Utils\Http\HttpMessage;
 /**
  * Class OpenIdOAuth2Request
- * @package openid\extensions\implementations
+ * @package OpenId\Extensions\Implementations
  */
 class OpenIdOAuth2Request  extends OpenIdRequest {
 
@@ -24,13 +33,14 @@ class OpenIdOAuth2Request  extends OpenIdRequest {
 
     /**
      * @return bool
-     * @throws \openid\exceptions\InvalidOpenIdMessageException
+     * @throws InvalidOpenIdMessageException
      */
     public function isValid()
     {
         //check identifier
-        if (isset($this->message[OpenIdOAuth2Extension::paramNamespace('_')])
-            && $this->message[OpenIdOAuth2Extension::paramNamespace('_')] == OpenIdOAuth2Extension::NamespaceUrl
+        $ns = OpenIdOAuth2Extension::paramNamespace(HttpMessage::PHP_REQUEST_VAR_SEPARATOR);
+        if (isset($this->message[$ns])
+            && $this->message[$ns] == OpenIdOAuth2Extension::NamespaceUrl
         ) {
             if(is_null($this->getClientId()))
                 throw new InvalidOpenIdMessageException(sprintf(OpenIdErrorMessages::OAuth2MissingRequiredParam,'client_id'));
@@ -52,8 +62,8 @@ class OpenIdOAuth2Request  extends OpenIdRequest {
      * @return null|string
      */
     public function getApprovalPrompt(){
-        return isset($this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_Approval_Prompt, '_')])?
-            $this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_Approval_Prompt, '_')]:OAuth2Protocol::OAuth2Protocol_Approval_Prompt_Auto;
+        return isset($this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_Approval_Prompt, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)])?
+            $this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_Approval_Prompt, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)]:OAuth2Protocol::OAuth2Protocol_Approval_Prompt_Auto;
     }
 
     /**
@@ -64,31 +74,31 @@ class OpenIdOAuth2Request  extends OpenIdRequest {
      * @return null|string
      */
     public function getAccessType(){
-        return isset($this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_AccessType, '_')])?
-            $this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_AccessType, '_')]:OAuth2Protocol::OAuth2Protocol_AccessType_Online;
+        return isset($this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_AccessType, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)])?
+            $this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_AccessType, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)]:OAuth2Protocol::OAuth2Protocol_AccessType_Online;
     }
 
     /**
      * @return null|string
      */
     public function getClientId(){
-        return isset($this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_ClientId, '_')])?
-            $this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_ClientId, '_')]:null;
+        return isset($this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_ClientId, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)])?
+            $this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_ClientId, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)]:null;
     }
 
     /**
      * @return null|string
      */
     public function getScope(){
-        return isset($this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_Scope, '_')])?
-            $this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_Scope, '_')]:null;
+        return isset($this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_Scope, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)])?
+            $this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_Scope, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)]:null;
     }
 
     /**
      * @return null|string
      */
     public function getState(){
-        return isset($this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_State, '_')])?
-            $this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_State, '_')]:null;
+        return isset($this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_State, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)])?
+            $this->message[OpenIdOAuth2Extension::param(OAuth2Protocol::OAuth2Protocol_State, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)]:null;
     }
 }
\ No newline at end of file
diff --git a/app/libs/OpenId/Extensions/Implementations/OpenIdPAPEExtension.php b/app/libs/OpenId/Extensions/Implementations/OpenIdPAPEExtension.php
new file mode 100644
index 00000000..32a0db91
--- /dev/null
+++ b/app/libs/OpenId/Extensions/Implementations/OpenIdPAPEExtension.php
@@ -0,0 +1,82 @@
+<?php namespace OpenId\Extensions\Implementations;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Extensions\OpenIdExtension;
+use OpenId\OpenIdProtocol;
+use OpenId\Requests\Contexts\RequestContext;
+use OpenId\Responses\Contexts\ResponseContext;
+use OpenId\Requests\OpenIdRequest;
+use OpenId\Responses\OpenIdResponse;
+use Utils\Services\ILogService;
+/**
+ * Class OpenIdPAPEExtension
+ * Implements http://openid.net/specs/openid-provider-authentication-policy-extension-1_0.html
+ * @package OpenId\Extensions\Implementations
+ */
+class OpenIdPAPEExtension extends OpenIdExtension
+{
+
+    const Prefix = "pape";
+
+    /**
+     * OpenIdPAPEExtension constructor.
+     * @param string $name
+     * @param string $namespace
+     * @param string $view
+     * @param string $description
+     * @param ILogService $log_service
+     */
+    public function __construct($name, $namespace, $view, $description, ILogService $log_service)
+    {
+        parent::__construct($name, $namespace, $view, $description,$log_service);
+    }
+
+    /**
+     * @param $param
+     * @param string $separator
+     * @return string
+     */
+    public static function param($param, $separator = '.')
+    {
+        return OpenIdProtocol::OpenIdPrefix . $separator . self::Prefix . $separator . $param;
+    }
+
+    /**
+     * @param string $separator
+     * @return string
+     */
+    public static function paramNamespace($separator = '.')
+    {
+        return OpenIdProtocol::OpenIdPrefix . $separator . OpenIdProtocol::OpenIDProtocol_NS . $separator . self::Prefix;
+    }
+
+    public function parseRequest(OpenIdRequest $request, RequestContext $context)
+    {
+        // TODO: Implement parseRequest() method.
+    }
+
+    public function prepareResponse(OpenIdRequest $request, OpenIdResponse $response, ResponseContext $context)
+    {
+        // TODO: Implement prepareResponse() method.
+    }
+
+    public function getTrustedData(OpenIdRequest $request)
+    {
+
+    }
+
+    protected function populateProperties()
+    {
+        // TODO: Implement populateProperties() method.
+    }
+}
\ No newline at end of file
diff --git a/app/libs/openid/extensions/implementations/OpenIdSREGExtension.php b/app/libs/OpenId/Extensions/Implementations/OpenIdSREGExtension.php
similarity index 67%
rename from app/libs/openid/extensions/implementations/OpenIdSREGExtension.php
rename to app/libs/OpenId/Extensions/Implementations/OpenIdSREGExtension.php
index 3d9877e5..2b701c50 100644
--- a/app/libs/openid/extensions/implementations/OpenIdSREGExtension.php
+++ b/app/libs/OpenId/Extensions/Implementations/OpenIdSREGExtension.php
@@ -1,45 +1,60 @@
-<?php
-
-namespace openid\extensions\implementations;
-
-use openid\extensions\OpenIdExtension;
-use openid\OpenIdProtocol;
-use openid\requests\contexts\PartialView;
-use openid\requests\contexts\RequestContext;
-use openid\requests\OpenIdRequest;
-use openid\responses\contexts\ResponseContext;
-use openid\responses\OpenIdResponse;
-use utils\services\IAuthService;
-use utils\services\ILogService;
+<?php namespace OpenId\Extensions\Implementations;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Extensions\OpenIdExtension;
+use OpenId\OpenIdProtocol;
+use OpenId\Requests\Contexts\PartialView;
+use OpenId\Requests\Contexts\RequestContext;
+use OpenId\Responses\Contexts\ResponseContext;
+use OpenId\Requests\OpenIdRequest;
+use OpenId\Responses\OpenIdResponse;
+use Utils\Services\IAuthService;
+use Utils\Services\ILogService;
 use Exception;
 /**
  * Class OpenIdSREGExtension
- * Implements http://openid.net/specs/openid-simple-registration-extension-1_0.html
- * @package openid\extensions\implementations
+ * Implements @see http://openid.net/specs/openid-simple-registration-extension-1_0.html
+ * @package OpenId\Extensions\Implementations
  */
 class OpenIdSREGExtension extends OpenIdExtension
 {
 
-    const Prefix = "sreg";
-    const NamespaceUrl = "http://openid.net/extensions/sreg/1.1";
+    const Prefix        = 'sreg';
+    const NamespaceUrl  = 'http://openid.net/extensions/sreg/1.1';
     const NamespaceType = 'ns';
-    const Required = 'required';
-    const Optional = 'optional';
-    const PolicyUrl = 'policy_url';
+    const Required      = 'required';
+    const Optional      = 'optional';
+    const PolicyUrl     = 'policy_url';
 
     //properties
-    const Nickname = 'nickname';
-    const Email = 'email';
-    const FullName = 'fullname';
+    const Nickname       = 'nickname';
+    const Email          = 'email';
+    const FullName       = 'fullname';
     const DateOfBirthday = 'dob';
-    const Gender = 'gender';
-    const Postcode = 'postcode';
-    const Country = 'country';
-    const Language = 'language';
-    const Timezone = 'timezone';
+    const Gender         = 'gender';
+    const Postcode       = 'postcode';
+    const Country        = 'country';
+    const Language       = 'language';
+    const Timezone       = 'timezone';
 
-    public static $available_properties;
+    /**
+     * @var array
+     */
+    public static $available_properties = array();
 
+    /**
+     * @var IAuthService
+     */
 	private $auth_service;
 
 	/**
@@ -55,7 +70,9 @@ class OpenIdSREGExtension extends OpenIdExtension
                                 ILogService $log_service)
     {
         parent::__construct($name, $namespace, $view_name, $description,$log_service);
+
 	    $this->auth_service = $auth_service;
+
         self::$available_properties[OpenIdSREGExtension::Nickname] = OpenIdSREGExtension::Nickname;
         self::$available_properties[OpenIdSREGExtension::Email] = OpenIdSREGExtension::Email;
         self::$available_properties[OpenIdSREGExtension::FullName] = OpenIdSREGExtension::FullName;
@@ -70,6 +87,7 @@ class OpenIdSREGExtension extends OpenIdExtension
     public function parseRequest(OpenIdRequest $request, RequestContext $context)
     {
         try {
+
             $simple_reg_request = new OpenIdSREGRequest($request->getMessage());
 
             if (!$simple_reg_request->isValid()) return;
@@ -91,6 +109,12 @@ class OpenIdSREGExtension extends OpenIdExtension
         }
     }
 
+    /**
+     * @param OpenIdRequest $request
+     * @param OpenIdResponse $response
+     * @param ResponseContext $context
+     * @return void
+     */
     public function prepareResponse(OpenIdRequest $request, OpenIdResponse $response, ResponseContext $context)
     {
         try {
@@ -125,30 +149,47 @@ class OpenIdSREGExtension extends OpenIdExtension
         }
     }
 
+    /**
+     * @param string $separator
+     * @return string
+     */
     public static function paramNamespace($separator = '.')
     {
         return OpenIdProtocol::OpenIdPrefix . $separator . OpenIdProtocol::OpenIDProtocol_NS . $separator . self::Prefix;
     }
 
+    /**
+     * @param $param
+     * @param string $separator
+     * @return string
+     */
     public static function param($param, $separator = '.')
     {
         return OpenIdProtocol::OpenIdPrefix . $separator . self::Prefix . $separator . $param;
     }
 
+    /**
+     * @param OpenIdRequest $request
+     * @return array
+     */
     public function getTrustedData(OpenIdRequest $request)
     {
         $data = array();
         try {
             $simple_reg_request = new OpenIdSREGRequest($request->getMessage());
+
             if ($simple_reg_request->isValid()) {
-                $attributes = $simple_reg_request->getRequiredAttributes();
+
+                $attributes     = $simple_reg_request->getRequiredAttributes();
                 $opt_attributes = $simple_reg_request->getOptionalAttributes();
-                $attributes = array_merge($attributes, $opt_attributes);
+                $attributes     = array_merge($attributes, $opt_attributes);
+
                 foreach ($attributes as $key => $value) {
                     array_push($data, $key);
                 }
             }
         } catch (Exception $ex) {
+            $this->log_service->debug_msg($request->__toString());
             $this->log_service->error($ex);
         }
         return $data;
diff --git a/app/libs/openid/extensions/implementations/OpenIdSREGRequest.php b/app/libs/OpenId/Extensions/Implementations/OpenIdSREGRequest.php
similarity index 63%
rename from app/libs/openid/extensions/implementations/OpenIdSREGRequest.php
rename to app/libs/OpenId/Extensions/Implementations/OpenIdSREGRequest.php
index c62d84cc..ebfb1e34 100644
--- a/app/libs/openid/extensions/implementations/OpenIdSREGRequest.php
+++ b/app/libs/OpenId/Extensions/Implementations/OpenIdSREGRequest.php
@@ -1,37 +1,62 @@
-<?php
-
-namespace openid\extensions\implementations;
-
+<?php namespace OpenId\Extensions\Implementations;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 use Exception;
-use openid\OpenIdMessage;
-use openid\requests\OpenIdRequest;
-use openid\exceptions\InvalidOpenIdMessageException;
-
+use OpenId\OpenIdMessage;
+use OpenId\Requests\OpenIdRequest;
+use OpenId\Exceptions\InvalidOpenIdMessageException;
+use Utils\Http\HttpMessage;
 /**
  * Class OpenIdSREGRequest
- * Implements http://openid.net/specs/openid-simple-registration-extension-1_0.html
- * @package openid\extensions\implementations
+ * Implements @see http://openid.net/specs/openid-simple-registration-extension-1_0.html
+ * @package OpenId\Extensions\Implementations
  */
 class OpenIdSREGRequest extends OpenIdRequest
 {
-
+    /**
+     * @var array
+     */
     private $attributes;
+    /**
+     * @var array
+     */
     private $optional_attributes;
+    /**
+     * @var string
+     */
     private $policy_url;
 
+    /**
+     * OpenIdSREGRequest constructor.
+     * @param OpenIdMessage $message
+     */
     public function __construct(OpenIdMessage $message)
     {
         parent::__construct($message);
-        $this->attributes = array();
+        $this->attributes          = array();
         $this->optional_attributes = array();
     }
 
+    /**
+     * @return bool
+     * @throws Exception
+     */
     public function isValid()
     {
         try {
             //check identifier
-            if (isset($this->message[OpenIdSREGExtension::paramNamespace('_')])
-                && $this->message[OpenIdSREGExtension::paramNamespace('_')] == OpenIdSREGExtension::NamespaceUrl
+            if (isset($this->message[OpenIdSREGExtension::paramNamespace(HttpMessage::PHP_REQUEST_VAR_SEPARATOR)])
+                && $this->message[OpenIdSREGExtension::paramNamespace(HttpMessage::PHP_REQUEST_VAR_SEPARATOR)] == OpenIdSREGExtension::NamespaceUrl
             ) {
 
                 /*
@@ -52,50 +77,43 @@ class OpenIdSREGRequest extends OpenIdRequest
 
                 //check required fields
 
-                if( !isset($this->message[OpenIdSREGExtension::param(OpenIdSREGExtension::Required, '_')]) &&
-                    !isset($this->message[OpenIdSREGExtension::param(OpenIdSREGExtension::Optional, '_')]))
+                if (
+                    !isset($this->message[OpenIdSREGExtension::param(OpenIdSREGExtension::Required, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)]) &&
+                    !isset($this->message[OpenIdSREGExtension::param(OpenIdSREGExtension::Optional, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)])
+                )
                     throw new InvalidOpenIdMessageException("SREG: at least one of \"openid.sreg.required\" or \"openid.sreg.optional\" MUST be specified in the request.");
 
-                //get attributes
-                if (isset($this->message[OpenIdSREGExtension::param(OpenIdSREGExtension::Required, '_')])) {
-
-                    $attributes = $this->message[OpenIdSREGExtension::param(OpenIdSREGExtension::Required, '_')];
+                //get required attributes
+                if (isset($this->message[OpenIdSREGExtension::param(OpenIdSREGExtension::Required, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)])) {
+                    $attributes = $this->message[OpenIdSREGExtension::param(OpenIdSREGExtension::Required, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)];
                     $attributes = explode(",", $attributes);
 
                     foreach ($attributes as $attr) {
                         $attr = trim($attr);
-
                         if (!isset(OpenIdSREGExtension::$available_properties[$attr]))
                             continue;
-
                         $this->attributes[$attr] = $attr;
                     }
                 }
 
                 //get optional attributes
-                if (isset($this->message[OpenIdSREGExtension::param(OpenIdSREGExtension::Optional, '_')])) {
-
-                    $opt_attributes = $this->message[OpenIdSREGExtension::param(OpenIdSREGExtension::Optional, '_')];
+                if (isset($this->message[OpenIdSREGExtension::param(OpenIdSREGExtension::Optional, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)])) {
+                    $opt_attributes = $this->message[OpenIdSREGExtension::param(OpenIdSREGExtension::Optional, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)];
                     $opt_attributes = explode(",", $opt_attributes);
-
                     foreach ($opt_attributes as $opt_attr) {
                         $opt_attr = trim($opt_attr);
-
                         if (!isset(OpenIdSREGExtension::$available_properties[$opt_attr]))
                             continue;
-
                         if (isset($this->attributes[$opt_attr]))
                             throw new InvalidOpenIdMessageException(sprintf("SREG: optional attribute %s is already set as required one!", $opt_attr));
-
                         $this->optional_attributes[$opt_attr] = $opt_attr;
                     }
                 }
 
                 //check policy url..
-                if (isset($this->message[OpenIdSREGExtension::param(OpenIdSREGExtension::PolicyUrl, '_')])) {
-                    $this->policy_url = $this->message[OpenIdSREGExtension::param(OpenIdSREGExtension::PolicyUrl, '_')];
+                if (isset($this->message[OpenIdSREGExtension::param(OpenIdSREGExtension::PolicyUrl, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)])) {
+                    $this->policy_url = $this->message[OpenIdSREGExtension::param(OpenIdSREGExtension::PolicyUrl, HttpMessage::PHP_REQUEST_VAR_SEPARATOR)];
                 }
-
                 return true;
             }
         } catch (Exception $ex) {
@@ -104,16 +122,25 @@ class OpenIdSREGRequest extends OpenIdRequest
         return false;
     }
 
+    /**
+     * @return array
+     */
     public function getRequiredAttributes()
     {
         return $this->attributes;
     }
 
+    /**
+     * @return array
+     */
     public function getOptionalAttributes()
     {
         return $this->optional_attributes;
     }
 
+    /**
+     * @return string
+     */
     public function getPolicyUrl()
     {
         return $this->policy_url;
diff --git a/app/libs/openid/extensions/OpenIdAuthenticationExtension.php b/app/libs/OpenId/Extensions/OpenIdAuthenticationExtension.php
similarity index 68%
rename from app/libs/openid/extensions/OpenIdAuthenticationExtension.php
rename to app/libs/OpenId/Extensions/OpenIdAuthenticationExtension.php
index b47dacfd..4ac3d6f4 100644
--- a/app/libs/openid/extensions/OpenIdAuthenticationExtension.php
+++ b/app/libs/OpenId/Extensions/OpenIdAuthenticationExtension.php
@@ -1,20 +1,28 @@
-<?php
-
-namespace openid\extensions;
-
-use auth\exceptions\AuthenticationException;
-use auth\IAuthenticationExtension;
-use auth\User;
-use openid\helpers\OpenIdErrorMessages;
-use openid\OpenIdMessage;
-use openid\requests\OpenIdAuthenticationRequest;
-use openid\services\IMementoOpenIdSerializerService;
-use openid\services\IServerConfigurationService;
+<?php namespace OpenId\Extensions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Auth\Exceptions\AuthenticationException;
+use Auth\IAuthenticationExtension;
+use Auth\User;
+use OpenId\Helpers\OpenIdErrorMessages;
+use OpenId\OpenIdMessage;
+use OpenId\Requests\OpenIdAuthenticationRequest;
+use OpenId\Services\IMementoOpenIdSerializerService;
+use OpenId\Services\IServerConfigurationService;
 use Log;
-
 /**
  * Class OpenIdAuthenticationExtension
- * @package openid\extensions
+ * @package OpenId\Extensions
  */
 class OpenIdAuthenticationExtension implements IAuthenticationExtension
 {
@@ -40,6 +48,11 @@ class OpenIdAuthenticationExtension implements IAuthenticationExtension
         $this->memento_service      = $memento_service;
     }
 
+    /**
+     * @param User $user
+     * @return void
+     * @throws AuthenticationException
+     */
     public function process(User $user)
     {
         if(!$this->memento_service->exists()) return;
diff --git a/app/libs/openid/extensions/OpenIdExtension.php b/app/libs/OpenId/Extensions/OpenIdExtension.php
similarity index 52%
rename from app/libs/openid/extensions/OpenIdExtension.php
rename to app/libs/OpenId/Extensions/OpenIdExtension.php
index f69d497b..9d67b485 100644
--- a/app/libs/openid/extensions/OpenIdExtension.php
+++ b/app/libs/OpenId/Extensions/OpenIdExtension.php
@@ -1,34 +1,57 @@
-<?php
-
-namespace openid\extensions;
-
-use openid\requests\contexts\RequestContext;
-use openid\requests\OpenIdRequest;
-use openid\responses\contexts\ResponseContext;
-use openid\responses\OpenIdResponse;
-use utils\services\ILogService;
-use openid\Exceptions\InvalidOpenIdMessageException;
+<?php namespace OpenId\Extensions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Requests\contexts\RequestContext;
+use OpenId\Requests\OpenIdRequest;
+use OpenId\Responses\Contexts\ResponseContext;
+use OpenId\Responses\OpenIdResponse;
+use Utils\Services\ILogService;
+use OpenId\Exceptions\InvalidOpenIdMessageException;
 /**
  * Class OpenIdExtension
  * Abstract implementation of OpenId Extensions
- * http://openid.net/specs/openid-authentication-2_0.html#extensions
- * @package openid\extensions
+ * @see http://openid.net/specs/openid-authentication-2_0.html#extensions
+ * @package OpenId\Extensions
  */
 abstract class OpenIdExtension
 {
-
+    /**
+     * @var string
+     */
     protected $namespace;
+    /**
+     * @var string
+     */
     protected $name;
+    /**
+     * @var string
+     */
     protected $description;
+    /**
+     * @var string
+     */
     protected $view;
 
+    /**
+     * @var ILogService
+     */
     protected $log_service;
 
 	/**
-	 * @param             $name
-	 * @param             $namespace
-	 * @param             $view_name
-	 * @param             $description
+	 * @param string      $name
+	 * @param string      $namespace
+	 * @param string      $view_name
+	 * @param string      $description
 	 * @param ILogService $log_service
 	 */
 	public function __construct($name, $namespace, $view_name, $description, ILogService $log_service)
@@ -40,6 +63,9 @@ abstract class OpenIdExtension
         $this->log_service = $log_service;
     }
 
+    /**
+     * @return string
+     */
     public function getNamespace()
     {
         return $this->namespace;
diff --git a/app/libs/openid/handlers/factories/SessionAssociationRequestFactory.php b/app/libs/OpenId/Handlers/Factories/SessionAssociationRequestFactory.php
similarity index 54%
rename from app/libs/openid/handlers/factories/SessionAssociationRequestFactory.php
rename to app/libs/OpenId/Handlers/Factories/SessionAssociationRequestFactory.php
index 5a025a36..6cb8988a 100644
--- a/app/libs/openid/handlers/factories/SessionAssociationRequestFactory.php
+++ b/app/libs/OpenId/Handlers/Factories/SessionAssociationRequestFactory.php
@@ -1,23 +1,36 @@
-<?php
-
-namespace openid\handlers\factories;
-
-use openid\handlers\strategies\implementations\SessionAssociationDHStrategy;
-use openid\handlers\strategies\implementations\SessionAssociationUnencryptedStrategy;
-use openid\OpenIdMessage;
-use openid\requests\OpenIdAssociationSessionRequest;
-use openid\requests\OpenIdDHAssociationSessionRequest;
-use openid\services\OpenIdServiceCatalog;
-use utils\services\ServiceLocator;
-use utils\services\UtilsServiceCatalog;
-
+<?php namespace OpenId\Handlers\Factories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Handlers\Strategies\Implementations\SessionAssociationDHStrategy;
+use OpenId\Handlers\Strategies\Implementations\SessionAssociationUnencryptedStrategy;
+use OpenId\OpenIdMessage;
+use OpenId\Requests\OpenIdAssociationSessionRequest;
+use OpenId\Requests\OpenIdDHAssociationSessionRequest;
+use OpenId\Requests\OpenIdRequest;
+use OpenId\Responses\OpenIdResponse;
+use OpenId\Services\OpenIdServiceCatalog;
+use Utils\Services\ServiceLocator;
+use Utils\Services\UtilsServiceCatalog;
 /**
  * Class SessionAssociationRequestFactory
- * @package openid\handlers\factories
+ * @package OpenId\Handlers\Factories
  */
 final class SessionAssociationRequestFactory
 {
-
+    /**
+     * @param OpenIdMessage $message
+     * @return OpenIdRequest
+     */
     public static function buildRequest(OpenIdMessage $message)
     {
         if (OpenIdDHAssociationSessionRequest::IsOpenIdDHAssociationSessionRequest($message))
@@ -27,7 +40,7 @@ final class SessionAssociationRequestFactory
 
     /**
      * @param OpenIdMessage $message
-     * @return null|SessionAssociationDHStrategy|SessionAssociationUnencryptedStrategy
+     * @return OpenIdResponse
      */
     public static function buildSessionAssociationStrategy(OpenIdMessage $message) {
 
diff --git a/app/libs/OpenId/Handlers/IOpenIdAuthenticationStrategy.php b/app/libs/OpenId/Handlers/IOpenIdAuthenticationStrategy.php
new file mode 100644
index 00000000..4b8fc509
--- /dev/null
+++ b/app/libs/OpenId/Handlers/IOpenIdAuthenticationStrategy.php
@@ -0,0 +1,38 @@
+<?php namespace OpenId\Handlers;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Requests\OpenIdAuthenticationRequest;
+use OpenId\Requests\Contexts\RequestContext;
+/**
+ * Interface IOpenIdAuthenticationStrategy
+ * declares the contract to connect UI with OpenId protocol
+ * @package OpenId\Handlers
+ */
+interface IOpenIdAuthenticationStrategy {
+
+    /**
+     * Redirects to Login UI
+     * @param OpenIdAuthenticationRequest $request
+     * @param RequestContext $context
+     * @return mixed
+     */
+    public function doLogin(OpenIdAuthenticationRequest $request,RequestContext $context);
+
+    /**
+     * Redirects to Consent UI
+     * @param OpenIdAuthenticationRequest $request
+     * @param RequestContext $context
+     * @return mixed
+     */
+    public function doConsent(OpenIdAuthenticationRequest $request,RequestContext $context);
+}
\ No newline at end of file
diff --git a/app/libs/openid/handlers/OpenIdAuthenticationRequestHandler.php b/app/libs/OpenId/Handlers/OpenIdAuthenticationRequestHandler.php
similarity index 87%
rename from app/libs/openid/handlers/OpenIdAuthenticationRequestHandler.php
rename to app/libs/OpenId/Handlers/OpenIdAuthenticationRequestHandler.php
index a55041ae..16876f59 100644
--- a/app/libs/openid/handlers/OpenIdAuthenticationRequestHandler.php
+++ b/app/libs/OpenId/Handlers/OpenIdAuthenticationRequestHandler.php
@@ -1,42 +1,51 @@
-<?php
-
-namespace openid\handlers;
-
+<?php namespace OpenId\Handlers;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 use Exception;
-use openid\exceptions\InvalidAssociationTypeException;
-use openid\exceptions\InvalidOpenIdAuthenticationRequestMode;
-use openid\exceptions\InvalidOpenIdMessageException;
-use openid\exceptions\OpenIdInvalidRealmException;
-use openid\exceptions\ReplayAttackException;
-use openid\helpers\AssociationFactory;
-use openid\helpers\OpenIdErrorMessages;
-use openid\helpers\OpenIdSignatureBuilder;
-use openid\model\IAssociation;
-use openid\OpenIdMessage;
-use openid\OpenIdProtocol;
-use openid\requests\contexts\RequestContext;
-use openid\requests\OpenIdAuthenticationRequest;
-use openid\responses\contexts\ResponseContext;
-use openid\responses\OpenIdImmediateNegativeAssertion;
-use openid\responses\OpenIdIndirectGenericErrorResponse;
-use openid\responses\OpenIdNonImmediateNegativeAssertion;
-use openid\responses\OpenIdPositiveAssertionResponse;
-use openid\services\IAssociationService;
-use openid\services\IMementoOpenIdSerializerService;
-use openid\services\INonceService;
-use openid\services\IServerConfigurationService;
-use openid\services\IServerExtensionsService;
-use openid\services\ITrustedSitesService;
-use utils\services\IAuthService;
-use utils\services\ICheckPointService;
-use utils\services\ILogService;
-
+use OpenId\Exceptions\InvalidAssociationTypeException;
+use OpenId\Exceptions\InvalidOpenIdAuthenticationRequestMode;
+use OpenId\Exceptions\InvalidOpenIdMessageException;
+use OpenId\Exceptions\OpenIdInvalidRealmException;
+use OpenId\Exceptions\ReplayAttackException;
+use OpenId\Helpers\AssociationFactory;
+use OpenId\Helpers\OpenIdErrorMessages;
+use OpenId\Helpers\OpenIdSignatureBuilder;
+use OpenId\Models\IAssociation;
+use OpenId\OpenIdMessage;
+use OpenId\OpenIdProtocol;
+use OpenId\Requests\Contexts\RequestContext;
+use OpenId\Responses\Contexts\ResponseContext;
+use OpenId\Requests\OpenIdAuthenticationRequest;
+use OpenId\Responses\OpenIdImmediateNegativeAssertion;
+use OpenId\Responses\OpenIdIndirectGenericErrorResponse;
+use OpenId\Responses\OpenIdNonImmediateNegativeAssertion;
+use OpenId\Responses\OpenIdPositiveAssertionResponse;
+use OpenId\Responses\OpenIdResponse;
+use OpenId\Services\IAssociationService;
+use OpenId\Services\IMementoOpenIdSerializerService;
+use OpenId\Services\INonceService;
+use OpenId\Services\IServerConfigurationService;
+use OpenId\Services\IServerExtensionsService;
+use OpenId\Services\ITrustedSitesService;
+use Utils\Services\IAuthService;
+use Utils\Services\ICheckPointService;
+use Utils\Services\ILogService;
 /**
  * Class OpenIdAuthenticationRequestHandler
  * Implements
- * http://openid.net/specs/openid-authentication-2_0.html#requesting_authentication
- * http://openid.net/specs/openid-authentication-2_0.html#responding_to_authentication
- * @package openid\handlers
+ * @see http://openid.net/specs/openid-authentication-2_0.html#requesting_authentication
+ * @see http://openid.net/specs/openid-authentication-2_0.html#responding_to_authentication
+ * @package OpenId\Handlers
  */
 final class OpenIdAuthenticationRequestHandler extends OpenIdMessageHandler
 {
@@ -122,8 +131,8 @@ final class OpenIdAuthenticationRequestHandler extends OpenIdMessageHandler
 
     /**
      * @param OpenIdMessage $message
-     * @return OpenIdImmediateNegativeAssertion|OpenIdIndirectGenericErrorResponse|OpenIdNonImmediateNegativeAssertion|OpenIdPositiveAssertionResponse
-     * @throws \openid\exceptions\InvalidOpenIdAuthenticationRequestMode
+     * @return OpenIdResponse
+     * @throws InvalidOpenIdAuthenticationRequestMode
      */
     protected function internalHandle(OpenIdMessage $message)
     {
@@ -196,8 +205,8 @@ final class OpenIdAuthenticationRequestHandler extends OpenIdMessageHandler
     }
 
     /**
-     * @return OpenIdIndirectGenericErrorResponse|OpenIdNonImmediateNegativeAssertion|OpenIdPositiveAssertionResponse
-     * @throws \Exception
+     * @return OpenIdResponse
+     * @throws Exception
      */
     private function doSetupMode()
     {
@@ -304,7 +313,7 @@ final class OpenIdAuthenticationRequestHandler extends OpenIdMessageHandler
 
     /**
      * Create Positive Identity Assertion
-     * implements http://openid.net/specs/openid-authentication-2_0.html#positive_assertions
+     * implements @see http://openid.net/specs/openid-authentication-2_0.html#positive_assertions
      * @return OpenIdPositiveAssertionResponse
      * @throws InvalidAssociationTypeException
      */
@@ -339,9 +348,17 @@ final class OpenIdAuthenticationRequestHandler extends OpenIdMessageHandler
 
         if (is_null($assoc_handle = $this->current_request->getAssocHandle()) || is_null($association = $this->association_service->getAssociation($assoc_handle))) {
             //create private association ...
-            $association = $this->association_service->addAssociation(AssociationFactory::getInstance()->buildPrivateAssociation($realm,
-                $this->server_configuration_service->getConfigValue("Private.Association.Lifetime")));
+            $association = $this->association_service->addAssociation
+            (
+                AssociationFactory::getInstance()->buildPrivateAssociation
+                (
+                    $realm,
+                    $this->server_configuration_service->getConfigValue("Private.Association.Lifetime")
+                )
+            );
+
             $response->setAssocHandle($association->getHandle());
+
             if (!empty($assoc_handle)) {
                 $response->setInvalidateHandle($assoc_handle);
             }
@@ -385,8 +402,8 @@ final class OpenIdAuthenticationRequestHandler extends OpenIdMessageHandler
 
     /**
      * @param $authorization_response
-     * @return OpenIdNonImmediateNegativeAssertion|OpenIdPositiveAssertionResponse
-     * @throws \Exception
+     * @return OpenIdResponse
+     * @throws Exception
      */
     private function checkAuthorizationResponse($authorization_response)
     {
diff --git a/app/libs/openid/handlers/OpenIdCheckAuthenticationRequestHandler.php b/app/libs/OpenId/Handlers/OpenIdCheckAuthenticationRequestHandler.php
similarity index 73%
rename from app/libs/openid/handlers/OpenIdCheckAuthenticationRequestHandler.php
rename to app/libs/OpenId/Handlers/OpenIdCheckAuthenticationRequestHandler.php
index 86718b27..6bc8ad75 100644
--- a/app/libs/openid/handlers/OpenIdCheckAuthenticationRequestHandler.php
+++ b/app/libs/OpenId/Handlers/OpenIdCheckAuthenticationRequestHandler.php
@@ -1,27 +1,35 @@
-<?php
-
-namespace openid\handlers;
-
+<?php namespace OpenId\Handlers;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 use Exception;
-use openid\exceptions\InvalidAssociationTypeException;
-use openid\exceptions\InvalidNonce;
-use openid\exceptions\InvalidOpenIdMessageException;
-use openid\exceptions\ReplayAttackException;
-use openid\helpers\OpenIdErrorMessages;
-use openid\helpers\OpenIdSignatureBuilder;
-use openid\model\IAssociation;
-use openid\model\OpenIdNonce;
-use openid\OpenIdMessage;
-use openid\requests\OpenIdCheckAuthenticationRequest;
-use openid\responses\OpenIdCheckAuthenticationResponse;
-use openid\responses\OpenIdDirectGenericErrorResponse;
-use openid\services\IAssociationService;
-use openid\services\INonceService;
-use openid\services\IServerConfigurationService as IOpenIdServerConfigurationService;
-use utils\services\ILogService;
-use utils\services\ICheckPointService;
-use utils\services\IServerConfigurationService;
-
+use OpenId\Exceptions\InvalidAssociationTypeException;
+use OpenId\Exceptions\InvalidNonce;
+use OpenId\Exceptions\InvalidOpenIdMessageException;
+use OpenId\Exceptions\ReplayAttackException;
+use OpenId\Helpers\OpenIdErrorMessages;
+use OpenId\Helpers\OpenIdSignatureBuilder;
+use OpenId\Models\IAssociation;
+use OpenId\Models\OpenIdNonce;
+use OpenId\OpenIdMessage;
+use OpenId\Requests\OpenIdCheckAuthenticationRequest;
+use OpenId\Responses\OpenIdCheckAuthenticationResponse;
+use OpenId\Responses\OpenIdDirectGenericErrorResponse;
+use OpenId\Services\IAssociationService;
+use OpenId\Services\INonceService;
+use OpenId\services\IServerConfigurationService as IOpenIdServerConfigurationService;
+use Utils\Services\ILogService;
+use Utils\Services\ICheckPointService;
+use Utils\Services\IServerConfigurationService;
 /**
  * Class OpenIdCheckAuthenticationRequestHandler
  * Implements http://openid.net/specs/openid-authentication-2_0.html#check_auth
@@ -29,14 +37,25 @@ use utils\services\IServerConfigurationService;
  * To have the signature verification performed by the OP, the Relying Party sends a direct request to the OP.
  * To verify the signature, the OP uses a private association that was generated when it issued
  * the positive assertion.
- * @package openid\handlers
+ * @package OpenId\Handlers
  */
 final class OpenIdCheckAuthenticationRequestHandler extends OpenIdMessageHandler
 {
-
+    /**
+     * @var IAssociationService
+     */
     private $association_service;
+    /**
+     * @var INonceService
+     */
     private $nonce_service;
+    /**
+     * @var IServerConfigurationService
+     */
 	private $configuration_service;
+    /**
+     * @var IOpenIdServerConfigurationService
+     */
 	private $openid_configuration_service;
 
 	/**
@@ -64,15 +83,25 @@ final class OpenIdCheckAuthenticationRequestHandler extends OpenIdMessageHandler
 	    $this->openid_configuration_service = $openid_configuration_service;
     }
 
+    /**
+     * @param OpenIdMessage $message
+     * @return OpenIdCheckAuthenticationResponse|OpenIdDirectGenericErrorResponse
+     */
     protected function internalHandle(OpenIdMessage $message)
     {
         $this->current_request = null;
         try {
 
-            $this->current_request = new OpenIdCheckAuthenticationRequest($message,$this->openid_configuration_service->getOPEndpointURL());
-            if (!$this->current_request->isValid())
-                throw new InvalidOpenIdMessageException(OpenIdErrorMessages::InvalidOpenIdCheckAuthenticationRequestMessage);
+            $this->current_request = new OpenIdCheckAuthenticationRequest
+            (
+                $message,$this->openid_configuration_service->getOPEndpointURL()
+            );
 
+            if (!$this->current_request->isValid())
+                throw new InvalidOpenIdMessageException
+                (
+                    OpenIdErrorMessages::InvalidOpenIdCheckAuthenticationRequestMessage
+                );
 
             /**
              *  For verifying signatures an OP MUST only use private associations and MUST NOT
@@ -111,7 +140,14 @@ final class OpenIdCheckAuthenticationRequestHandler extends OpenIdMessageHandler
 
             $this->nonce_service->markNonceAsInvalid($claimed_nonce, $claimed_sig, $claimed_realm);
 
-            $res = OpenIdSignatureBuilder::verify($this->current_request, $stored_assoc->getMacFunction(), $stored_assoc->getSecret(), $claimed_sig);
+            $res = OpenIdSignatureBuilder::verify
+            (
+                $this->current_request,
+                $stored_assoc->getMacFunction(),
+                $stored_assoc->getSecret(),
+                $claimed_sig
+            );
+
             //delete association
             $this->association_service->deleteAssociation($claimed_assoc);
             $is_valid = $res ? 'true':'false';
@@ -154,9 +190,12 @@ final class OpenIdCheckAuthenticationRequestHandler extends OpenIdMessageHandler
         }
     }
 
+    /**
+     * @param OpenIdMessage $message
+     * @return bool
+     */
     protected function canHandle(OpenIdMessage $message)
     {
-        $res = OpenIdCheckAuthenticationRequest::IsOpenIdCheckAuthenticationRequest($message);
-        return $res;
+        return OpenIdCheckAuthenticationRequest::IsOpenIdCheckAuthenticationRequest($message);
     }
 }
\ No newline at end of file
diff --git a/app/libs/openid/handlers/OpenIdMessageHandler.php b/app/libs/OpenId/Handlers/OpenIdMessageHandler.php
similarity index 70%
rename from app/libs/openid/handlers/OpenIdMessageHandler.php
rename to app/libs/OpenId/Handlers/OpenIdMessageHandler.php
index 586d60df..498b2c2c 100644
--- a/app/libs/openid/handlers/OpenIdMessageHandler.php
+++ b/app/libs/OpenId/Handlers/OpenIdMessageHandler.php
@@ -1,23 +1,30 @@
-<?php
-
-namespace openid\handlers;
-
-use openid\helpers\OpenIdErrorMessages;
-use openid\OpenIdMessage;
-use utils\services\ILogService;
-use utils\services\ICheckPointService;
-use openid\exceptions\InvalidOpenIdMessageException;
-use openid\requests\OpenIdAuthenticationRequest;
-
+<?php namespace OpenId\Handlers;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Helpers\OpenIdErrorMessages;
+use OpenId\OpenIdMessage;
+use OpenId\Exceptions\InvalidOpenIdMessageException;
+use OpenId\Requests\OpenIdAuthenticationRequest;
+use Utils\Services\ILogService;
+use Utils\Services\ICheckPointService;
 /**
  * Class OpenIdMessageHandler
  * Abstract OpenId Message Handler
  * Implements Chain of Responsibility Pattern
- * @package openid\handlers
+ * @package OpenId\Handlers
  */
 abstract class OpenIdMessageHandler
 {
-
 	/**
 	 * @var OpenIdMessageHandler
 	 */
diff --git a/app/libs/openid/handlers/OpenIdSessionAssociationRequestHandler.php b/app/libs/OpenId/Handlers/OpenIdSessionAssociationRequestHandler.php
similarity index 59%
rename from app/libs/openid/handlers/OpenIdSessionAssociationRequestHandler.php
rename to app/libs/OpenId/Handlers/OpenIdSessionAssociationRequestHandler.php
index baeec7c9..0a92c63f 100644
--- a/app/libs/openid/handlers/OpenIdSessionAssociationRequestHandler.php
+++ b/app/libs/OpenId/Handlers/OpenIdSessionAssociationRequestHandler.php
@@ -1,34 +1,58 @@
-<?php
-
-namespace openid\handlers;
+<?php namespace OpenId\Handlers;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
 use Exception;
-use openid\exceptions\InvalidAssociationTypeException;
-use openid\exceptions\InvalidOpenIdMessageException;
-use openid\exceptions\InvalidSessionTypeException;
-use openid\handlers\factories\SessionAssociationRequestFactory;
-use openid\helpers\OpenIdErrorMessages;
-use openid\OpenIdMessage;
-use openid\requests\OpenIdAssociationSessionRequest;
-use openid\responses\OpenIdAssociationSessionUnsuccessfulResponse;
-use openid\responses\OpenIdDirectGenericErrorResponse;
-use utils\services\ILogService;
-use utils\services\ICheckPointService;
+use OpenId\Exceptions\InvalidAssociationTypeException;
+use OpenId\Exceptions\InvalidOpenIdMessageException;
+use OpenId\Exceptions\InvalidSessionTypeException;
+use OpenId\Handlers\Factories\SessionAssociationRequestFactory;
+use OpenId\Helpers\OpenIdErrorMessages;
+use OpenId\OpenIdMessage;
+use OpenId\Requests\OpenIdAssociationSessionRequest;
+use OpenId\Responses\OpenIdAssociationSessionUnsuccessfulResponse;
+use OpenId\Responses\OpenIdDirectGenericErrorResponse;
+use Utils\Services\ILogService;
+use Utils\Services\ICheckPointService;
+
 /**
  * Class OpenIdSessionAssociationRequestHandler
- * Implements http://openid.net/specs/openid-authentication-2_0.html#associations
- * @package openid\handlers
+ * Implements @see http://openid.net/specs/openid-authentication-2_0.html#associations
+ * @package OpenId\Handlers
  */
 final class OpenIdSessionAssociationRequestHandler extends OpenIdMessageHandler
 {
 
-    public function __construct(ILogService $log,
-                                ICheckPointService $checkpoint_service,
-                                $successor)
+    /**
+     * OpenIdSessionAssociationRequestHandler constructor.
+     * @param ILogService $log
+     * @param ICheckPointService $checkpoint_service
+     * @param ICheckPointService $successor
+     */
+    public function __construct
+    (
+        ILogService $log,
+        ICheckPointService $checkpoint_service,
+        $successor
+    )
     {
         parent::__construct($successor, $log,$checkpoint_service);
     }
 
+    /**
+     * @param OpenIdMessage $message
+     * @return OpenIdAssociationSessionUnsuccessfulResponse|OpenIdDirectGenericErrorResponse
+     */
     protected function internalHandle(OpenIdMessage $message)
     {
         $this->current_request = null;
@@ -77,7 +101,6 @@ final class OpenIdSessionAssociationRequestHandler extends OpenIdMessageHandler
      * @return bool
      */
     protected function canHandle(OpenIdMessage $message) {
-        $res = OpenIdAssociationSessionRequest::IsOpenIdAssociationSessionRequest($message);
-        return $res;
+        return OpenIdAssociationSessionRequest::IsOpenIdAssociationSessionRequest($message);
     }
 }
\ No newline at end of file
diff --git a/app/libs/OpenId/Handlers/Strategies/SessionAssociation/ISessionAssociationStrategy.php b/app/libs/OpenId/Handlers/Strategies/SessionAssociation/ISessionAssociationStrategy.php
new file mode 100644
index 00000000..1f9fa384
--- /dev/null
+++ b/app/libs/OpenId/Handlers/Strategies/SessionAssociation/ISessionAssociationStrategy.php
@@ -0,0 +1,28 @@
+<?php namespace OpenId\Handlers\Strategies;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Responses\OpenIdAssociationSessionResponse;
+use OpenId\Exceptions\InvalidDHParam;
+use Zend\Crypt\Exception\InvalidArgumentException;
+use Zend\Crypt\Exception\RuntimeException;
+/**
+ * Interface ISessionAssociationStrategy
+ * @package OpenId\Handlers\Strategies;
+ */
+interface ISessionAssociationStrategy {
+    /**
+     * @throws InvalidDHParam|RuntimeException|InvalidArgumentException
+     * @return OpenIdAssociationSessionResponse
+     */
+    public function handle();
+} 
\ No newline at end of file
diff --git a/app/libs/openid/handlers/strategies/session_association/implementations/SessionAssociationDHStrategy.php b/app/libs/OpenId/Handlers/Strategies/SessionAssociation/Implementations/SessionAssociationDHStrategy.php
similarity index 64%
rename from app/libs/openid/handlers/strategies/session_association/implementations/SessionAssociationDHStrategy.php
rename to app/libs/OpenId/Handlers/Strategies/SessionAssociation/Implementations/SessionAssociationDHStrategy.php
index ee876f88..5c33f098 100644
--- a/app/libs/openid/handlers/strategies/session_association/implementations/SessionAssociationDHStrategy.php
+++ b/app/libs/OpenId/Handlers/Strategies/SessionAssociation/Implementations/SessionAssociationDHStrategy.php
@@ -1,29 +1,54 @@
-<?php
-
-namespace openid\handlers\strategies\implementations;
-
-use openid\handlers\strategies\ISessionAssociationStrategy;
-use openid\helpers\OpenIdCryptoHelper;
-use openid\requests\OpenIdDHAssociationSessionRequest;
-use openid\responses\OpenIdDiffieHellmanAssociationSessionResponse;
-use openid\responses\OpenIdDirectGenericErrorResponse;
+<?php namespace OpenId\Handlers\Strategies\Implementations;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Handlers\Strategies\ISessionAssociationStrategy;
+use OpenId\Helpers\OpenIdCryptoHelper;
+use OpenId\Requests\OpenIdDHAssociationSessionRequest;
+use OpenId\Responses\OpenIdDiffieHellmanAssociationSessionResponse;
+use OpenId\Responses\OpenIdDirectGenericErrorResponse;
+use OpenId\Responses\OpenIdResponse;
 use Zend\Crypt\PublicKey\DiffieHellman;
 //services
-use openid\services\IAssociationService;
-use openid\services\IServerConfigurationService;
-use utils\services\ILogService;
-use openid\helpers\AssociationFactory;
-
-use openid\Exceptions\InvalidDHParam;
+use OpenId\Services\IAssociationService;
+use OpenId\Services\IServerConfigurationService;
+use Utils\Services\ILogService;
+use OpenId\Helpers\AssociationFactory;
+use OpenId\Exceptions\InvalidDHParam;
 use Zend\Crypt\Exception\InvalidArgumentException;
 use Zend\Crypt\Exception\RuntimeException;
 
+/**
+ * Class SessionAssociationDHStrategy
+ * @package OpenId\Handlers\Strategies\Implementations
+ */
 class SessionAssociationDHStrategy implements ISessionAssociationStrategy
 {
 
+    /**
+     * @var IAssociationService
+     */
     private $association_service;
+    /**
+     * @var IServerConfigurationService
+     */
     private $server_configuration_service;
+    /**
+     * @var OpenIdDHAssociationSessionRequest
+     */
     private $current_request;
+    /**
+     * @var ILogService
+     */
     private $log_service;
 
 	/**
@@ -44,7 +69,7 @@ class SessionAssociationDHStrategy implements ISessionAssociationStrategy
     }
 
     /**
-     * @return null|OpenIdDirectGenericErrorResponse|\openid\responses\OpenIdAssociationSessionResponse|OpenIdDiffieHellmanAssociationSessionResponse
+     * @return OpenIdResponse
      */
     public function handle()
     {
@@ -58,7 +83,14 @@ class SessionAssociationDHStrategy implements ISessionAssociationStrategy
             //get (g ^ xa mod p) where xa is rp secret key
             $rp_public_key    = $this->current_request->getDHConsumerPublic();
 	        //create association
-	        $association      = $this->association_service->addAssociation(AssociationFactory::getInstance()->buildSessionAssociation($assoc_type, $this->server_configuration_service->getConfigValue("Session.Association.Lifetime")));
+	        $association      = $this->association_service->addAssociation(AssociationFactory::getInstance()
+                ->buildSessionAssociation
+                (
+                    $assoc_type,
+                    $this->server_configuration_service->getConfigValue("Session.Association.Lifetime")
+                )
+            );
+
 	        $dh               = new DiffieHellman($public_prime, $public_generator);
 	        $dh->generateKeys();
 	        //server public key (g ^ xb mod p ), where xb is server private key
@@ -76,7 +108,6 @@ class SessionAssociationDHStrategy implements ISessionAssociationStrategy
         } catch (InvalidArgumentException $exDH1) {
             $response = new OpenIdDirectGenericErrorResponse($exDH1->getMessage());
             $this->log_service->error($exDH1);
-
         } catch (RuntimeException $exDH2) {
             $response = new OpenIdDirectGenericErrorResponse($exDH2->getMessage());
             $this->log_service->error($exDH2);
diff --git a/app/libs/OpenId/Handlers/Strategies/SessionAssociation/Implementations/SessionAssociationUnencryptedStrategy.php b/app/libs/OpenId/Handlers/Strategies/SessionAssociation/Implementations/SessionAssociationUnencryptedStrategy.php
new file mode 100644
index 00000000..e40a3a06
--- /dev/null
+++ b/app/libs/OpenId/Handlers/Strategies/SessionAssociation/Implementations/SessionAssociationUnencryptedStrategy.php
@@ -0,0 +1,112 @@
+<?php namespace OpenId\Handlers\Strategies\Implementations;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+use OpenId\Exceptions\InvalidDHParam;
+use OpenId\Handlers\Strategies\ISessionAssociationStrategy;
+use OpenId\Requests\OpenIdAssociationSessionRequest;
+use OpenId\Responses\OpenIdDirectGenericErrorResponse;
+use OpenId\Responses\OpenIdUnencryptedAssociationSessionResponse;
+use Zend\Crypt\Exception\InvalidArgumentException;
+use Zend\Crypt\Exception\RuntimeException;
+//services
+use OpenId\Services\IAssociationService;
+use OpenId\Services\IServerConfigurationService;
+use Utils\Services\ILogService;
+use OpenId\Helpers\AssociationFactory;
+
+/**
+ * Class SessionAssociationUnencryptedStrategy
+ * @package OpenId\Handlers\Strategies\Implementations
+ */
+class SessionAssociationUnencryptedStrategy implements ISessionAssociationStrategy {
+
+    /**
+     * @var IAssociationService
+     */
+    private $association_service;
+    /**
+     * @var IServerConfigurationService
+     */
+    private $server_configuration_service;
+    /**
+     * @var OpenIdAssociationSessionRequest
+     */
+    private $current_request;
+    /**
+     * @var ILogService
+     */
+    private $log_service;
+
+    /**
+     * SessionAssociationUnencryptedStrategy constructor.
+     * @param OpenIdAssociationSessionRequest $request
+     * @param IAssociationService $association_service
+     * @param IServerConfigurationService $server_configuration_service
+     * @param ILogService $log_service
+     */
+    public function __construct
+    (
+        OpenIdAssociationSessionRequest $request,
+        IAssociationService $association_service,
+        IServerConfigurationService $server_configuration_service,
+        ILogService $log_service
+    )
+    {
+        $this->current_request               = $request;
+        $this->association_service           = $association_service;
+        $this->server_configuration_service  = $server_configuration_service;
+        $this->log_service                   = $log_service;
+    }
+
+    /**
+     * @return OpenIdDirectGenericErrorResponse
+     */
+    public function handle()
+    {
+        $response = null;
+        try {
+            $assoc_type   = $this->current_request->getAssocType();
+            $session_type = $this->current_request->getSessionType();
+			$association  = $this->association_service->addAssociation
+            (
+                AssociationFactory::getInstance()->buildSessionAssociation
+                (
+                    $assoc_type,
+                    $this->server_configuration_service->getConfigValue("Session.Association.Lifetime")
+                )
+            );
+
+	        $response     = new OpenIdUnencryptedAssociationSessionResponse
+            (
+                $association->getHandle(),
+                $session_type,
+                $assoc_type,
+                $association->getLifetime(),
+                $association->getSecret()
+            );
+
+        } catch (InvalidDHParam $exDH) {
+            $response = new OpenIdDirectGenericErrorResponse($exDH->getMessage());
+            $this->log_service->error($exDH);
+        } catch (InvalidArgumentException $exDH1) {
+            $response = new OpenIdDirectGenericErrorResponse($exDH1->getMessage());
+            $this->log_service->error($exDH1);
+
+        } catch (RuntimeException $exDH2) {
+            $response = new OpenIdDirectGenericErrorResponse($exDH2->getMessage());
+            $this->log_service->error($exDH2);
+        }
+        return $response;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Helpers/AssocHandleGenerator.php b/app/libs/OpenId/Helpers/AssocHandleGenerator.php
new file mode 100644
index 00000000..0bbe5f8f
--- /dev/null
+++ b/app/libs/OpenId/Helpers/AssocHandleGenerator.php
@@ -0,0 +1,40 @@
+<?php namespace OpenId\Helpers;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Zend\Math\Rand;
+use InvalidArgumentException;
+/**
+ * Class AssocHandleGenerator
+ * The association handle is used as a key to refer to this association in subsequent messages.
+ * A string 255 characters or less in length. It MUST consist only of ASCII characters in the
+ * range 33-126 inclusive (printable non-whitespace characters).
+ * @package OpenId\Helpers
+ */
+final class AssocHandleGenerator
+{
+
+    const PrintableNonWhitespaceCharacters = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_~';
+
+    /**
+     * @param int $len
+     * @return string
+     * @throws InvalidArgumentException
+     */
+    public static function generate($len = 32)
+    {
+        if ($len > 255)
+            throw new InvalidArgumentException(sprintf("assoc handle len must be lower or equal to 255(%d)", $len));
+        $new_assoc_handle = Rand::getString($len, self::PrintableNonWhitespaceCharacters, true);
+        return $new_assoc_handle;
+    }
+} 
\ No newline at end of file
diff --git a/app/libs/OpenId/Helpers/AssociationFactory.php b/app/libs/OpenId/Helpers/AssociationFactory.php
new file mode 100644
index 00000000..9b8f7668
--- /dev/null
+++ b/app/libs/OpenId/Helpers/AssociationFactory.php
@@ -0,0 +1,83 @@
+<?php namespace OpenId\Helpers;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Models\Association;
+use OpenId\Models\IAssociation;
+use OpenId\OpenIdProtocol;
+/**
+ * Class AssociationFactory
+ * Singleton Factory that creates OpenId Associations
+ * @package OpenId\Helpers
+ */
+final class AssociationFactory
+{
+
+    /**
+     * @var AssociationFactory
+     */
+    private static $instance = null;
+
+    private function __construct(){}
+
+    /**
+     * @return null|AssociationFactory
+     */
+    public static function getInstance()
+    {
+        if (self::$instance == null) {
+            self::$instance = new AssociationFactory();
+        }
+        return self::$instance;
+    }
+
+    /**
+     * @param $realm
+     * @param $lifetime
+     * @return IAssociation
+     */
+    public function buildPrivateAssociation($realm, $lifetime)
+    {
+        return $this->buildAssociation(IAssociation::TypePrivate, OpenIdProtocol::SignatureAlgorithmHMAC_SHA256, $lifetime, $realm);
+    }
+
+    /**
+     * @param $mac_function
+     * @param $lifetime
+     * @return IAssociation
+     */
+    public function buildSessionAssociation($mac_function, $lifetime)
+    {
+        return $this->buildAssociation(IAssociation::TypeSession, $mac_function, $lifetime, null);
+    }
+
+    /**
+     * @param string $type
+     * @param string $mac_function
+     * @param int $lifetime
+     * @param string $realm
+     * @return IAssociation
+     */
+    private function buildAssociation($type, $mac_function, $lifetime, $realm)
+    {
+        $new_secret = OpenIdCryptoHelper::generateSecret($mac_function);
+        $new_handle = AssocHandleGenerator::generate();
+        $expires_in = intval($lifetime);
+        $issued     = gmdate("Y-m-d H:i:s", time());
+
+        return new Association($new_handle, $new_secret, $mac_function, $expires_in, $issued, $type, $realm);
+    }
+
+    private function __clone()
+    {
+    }
+} 
\ No newline at end of file
diff --git a/app/libs/openid/helpers/OpenIdCryptoHelper.php b/app/libs/OpenId/Helpers/OpenIdCryptoHelper.php
similarity index 80%
rename from app/libs/openid/helpers/OpenIdCryptoHelper.php
rename to app/libs/OpenId/Helpers/OpenIdCryptoHelper.php
index 65c0fe37..07f36af3 100644
--- a/app/libs/openid/helpers/OpenIdCryptoHelper.php
+++ b/app/libs/OpenId/Helpers/OpenIdCryptoHelper.php
@@ -1,31 +1,50 @@
-<?php
-
-namespace openid\helpers;
-
-use openid\exceptions\OpenIdCryptoException;
-use openid\OpenIdProtocol;
+<?php namespace OpenId\Helpers;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Exceptions\OpenIdCryptoException;
+use OpenId\OpenIdProtocol;
 use Zend\Crypt\PublicKey\DiffieHellman;
 use Zend\Math\Rand;
 use Zend\Math;
-
+use Zend\Math\BigInteger\BigInteger;
+use Exception;
 /**
  * Class OpenIdCryptoHelper
- * @package openid\helpers
+ * @package OpenId\Helpers
  */
 final class OpenIdCryptoHelper
 {
 
-
-    private static $signature_algorithms = array(
-        OpenIdProtocol::SignatureAlgorithmHMAC_SHA1 => "sha1",
-        OpenIdProtocol::AssociationSessionTypeDHSHA1 => "sha1",
-        OpenIdProtocol::SignatureAlgorithmHMAC_SHA256 => "sha256",
+    /**
+     * @var array
+     */
+    private static $signature_algorithms = array
+    (
+        OpenIdProtocol::SignatureAlgorithmHMAC_SHA1    => "sha1",
+        OpenIdProtocol::AssociationSessionTypeDHSHA1   => "sha1",
+        OpenIdProtocol::SignatureAlgorithmHMAC_SHA256  => "sha256",
         OpenIdProtocol::AssociationSessionTypeDHSHA256 => "sha256",
     );
 
+    /**
+     * @param $number
+     * @param string $inputFormat
+     * @param string $outputFormat
+     * @return string
+     */
     public static function convert($number, $inputFormat = DiffieHellman::FORMAT_NUMBER, $outputFormat = DiffieHellman::FORMAT_BINARY)
     {
-        $math = Math\BigInteger\BigInteger::factory();
+        $math = BigInteger::factory();
         if ($inputFormat == $outputFormat) {
             return $number;
         }
@@ -56,6 +75,10 @@ final class OpenIdCryptoHelper
         }
     }
 
+    /**
+     * @param $func
+     * @return string
+     */
     public static function generateSecret($func)
     {
         if ($func == OpenIdProtocol::SignatureAlgorithmHMAC_SHA1) {
@@ -85,7 +108,7 @@ final class OpenIdCryptoHelper
      * @param $data
      * @param $secret
      * @return string
-     * @throws \openid\exceptions\OpenIdCryptoException
+     * @throws OpenIdCryptoException
      */
     static public function computeHMAC($macFunc, $data, $secret)
     {
@@ -135,7 +158,7 @@ final class OpenIdCryptoHelper
      * @param string $func digest algorithm
      * @param string $data data to sign
      * @return string RAW digital signature
-     * @throws \Exception
+     * @throws Exception
      */
     static public function digest($func, $data)
     {
diff --git a/app/libs/openid/helpers/OpenIdErrorMessages.php b/app/libs/OpenId/Helpers/OpenIdErrorMessages.php
similarity index 96%
rename from app/libs/openid/helpers/OpenIdErrorMessages.php
rename to app/libs/OpenId/Helpers/OpenIdErrorMessages.php
index aae9d2c3..18a2a750 100644
--- a/app/libs/openid/helpers/OpenIdErrorMessages.php
+++ b/app/libs/OpenId/Helpers/OpenIdErrorMessages.php
@@ -1,10 +1,7 @@
-<?php
-
-namespace openid\helpers;
-
+<?php namespace OpenId\Helpers;
 /**
  * Class OpenIdErrorMessages
- * @package openid\helpers
+ * @package OpenId\Helpers
  */
 final class OpenIdErrorMessages
 {
@@ -20,7 +17,7 @@ final class OpenIdErrorMessages
     const InvalidOpenIdAuthenticationRequestMessage      = 'OpenId Authentication Request is Invalid!';
     const AXInvalidModeMessage                           = 'AX: not set or invalid mode';
     const AXInvalidRequiredAttributesMessage             = 'AX: not set required attributes!';
-    const AXInvalidNamespaceMessage                      = 'AX: invalid ns for attribute %s';
+    const AXInvalidNamespaceMessage                      = 'AX: invalid ns %s for attribute %s';
     const InvalidOpenIdCheckAuthenticationRequestMessage = 'OpenId Check Authentication Request is Invalid!';
     const ReplayAttackNonceAlreadyUsed                   = 'Nonce %s already used on a formed request!';
     const ReplayAttackNonceAlreadyEmittedForAnotherRealm = "Nonce %s was not emit for Realm!";
diff --git a/app/libs/openid/helpers/OpenIdSignatureBuilder.php b/app/libs/OpenId/Helpers/OpenIdSignatureBuilder.php
similarity index 67%
rename from app/libs/openid/helpers/OpenIdSignatureBuilder.php
rename to app/libs/OpenId/Helpers/OpenIdSignatureBuilder.php
index 5fc38ef3..4fc705d5 100644
--- a/app/libs/openid/helpers/OpenIdSignatureBuilder.php
+++ b/app/libs/OpenId/Helpers/OpenIdSignatureBuilder.php
@@ -1,14 +1,23 @@
-<?php
-
-namespace openid\helpers;
-
-use openid\requests\OpenIdCheckAuthenticationRequest;
-use openid\responses\contexts\ResponseContext;
-use openid\responses\OpenIdPositiveAssertionResponse;
-
+<?php namespace OpenId\Helpers;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Requests\OpenIdCheckAuthenticationRequest;
+use OpenId\Responses\Contexts\ResponseContext;
+use OpenId\Responses\OpenIdPositiveAssertionResponse;
+use Utils\Http\HttpMessage;
 /**
  * Class OpenIdSignatureBuilder
- * @package openid\helpers
+ * @package OpenId\Helpers;
  */
 final class OpenIdSignatureBuilder
 {
@@ -29,7 +38,7 @@ final class OpenIdSignatureBuilder
         ksort($claimed_signed);
         $data = '';
         foreach ($claimed_signed as $key) {
-            $key_php = str_ireplace('.', '_', $key);
+            $key_php = str_ireplace('.', HttpMessage::PHP_REQUEST_VAR_SEPARATOR, $key);
             $val = $request->getParam($key_php);
             $data .= $key . ':' . $val . "\n";
         }
diff --git a/app/libs/openid/helpers/OpenIdUriHelper.php b/app/libs/OpenId/Helpers/OpenIdUriHelper.php
similarity index 94%
rename from app/libs/openid/helpers/OpenIdUriHelper.php
rename to app/libs/OpenId/Helpers/OpenIdUriHelper.php
index 748eeb0c..1cfc95a0 100644
--- a/app/libs/openid/helpers/OpenIdUriHelper.php
+++ b/app/libs/OpenId/Helpers/OpenIdUriHelper.php
@@ -1,8 +1,17 @@
-<?php
-
-namespace openid\helpers;
-
-use openid\exceptions\InvalidTLDException;
+<?php namespace OpenId\Helpers;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Exceptions\InvalidTLDException;
 
 define('OpenIdUriHelper_TLDs',
     '/\.(ac|ad|ae|aero|af|ag|ai|al|am|an|ao|aq|ar|arpa|as|asia' .
@@ -28,20 +37,20 @@ define('OpenIdUriHelper_HostSegmentRe', "/^(?:[-a-zA-Z0-9!$&'\\(\\)\\*+,;=._~]|%
 
 /**
  * Class OpenIdUriHelper
- * @package openid\helpers
+ * @package OpenId\Helpers
  */
 final class OpenIdUriHelper
 {
 
     const AuthorityPattern = "/^([^@]*@)?([^:]*)(:.*)?/";
-    const URIPattern = "&^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?&";
-    const EncodedPattern = "/%([0-9A-Fa-f]{2})/";
+    const URIPattern       = "&^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?&";
+    const EncodedPattern   = "/%([0-9A-Fa-f]{2})/";
     const URLIllegalCharRE = "/([^-A-Za-z0-9:\/\?#\[\]@\!\$&'\(\)\*\+,;=\._~\%])/";
 
     /**
      * Returns an absolute URL for the given one
      *
-     * @param string $url absilute or relative URL
+     * @param string $url absolute or relative URL
      * @return string
      */
     public static function absoluteUrl($url)
@@ -337,7 +346,7 @@ final class OpenIdUriHelper
      *
      * @static
      * @param string $trust_root The trust root to check
-     * @throws \openid\exceptions\InvalidTLDException
+     * @throws InvalidTLDException
      * @return bool $sanity Whether the trust root looks OK
      */
     private static function _isSane($trust_root)
@@ -396,6 +405,10 @@ final class OpenIdUriHelper
         return true;
     }
 
+    /**
+     * @param $trust_root
+     * @return bool|mixed
+     */
     private static function _parse($trust_root)
     {
         $trust_root = self::urinorm($trust_root);
@@ -478,6 +491,10 @@ final class OpenIdUriHelper
         return $parts;
     }
 
+    /**
+     * @param $uri
+     * @return string
+     */
     private static function urinorm($uri)
     {
         $uri_matches = array();
@@ -599,6 +616,9 @@ final class OpenIdUriHelper
         return $scheme . '://' . $authority . $path . $query . $fragment;
     }
 
+    /**
+     * @return array
+     */
     public static function getUnreserved()
     {
         $_unreserved = array();
@@ -626,6 +646,10 @@ final class OpenIdUriHelper
         return $_unreserved;
     }
 
+    /**
+     * @param $path
+     * @return string
+     */
     private static function remove_dot_segments($path)
     {
         $result_segments = array();
@@ -670,11 +694,20 @@ final class OpenIdUriHelper
         return implode('', $result_segments);
     }
 
+    /**
+     * @param $s
+     * @param $stuff
+     * @return bool
+     */
     private static function startswith($s, $stuff)
     {
         return strpos($s, $stuff) === 0;
     }
 
+    /**
+     * @param $return_to
+     * @return bool
+     */
     public static function checkReturnTo($return_to)
     {
         if (!filter_var($return_to, FILTER_VALIDATE_URL)) return false;
@@ -685,6 +718,10 @@ final class OpenIdUriHelper
         return true;
     }
 
+    /**
+     * @param $url
+     * @return mixed
+     */
     public static function isValidUrl($url)
     {
         return filter_var($url, FILTER_VALIDATE_URL);
diff --git a/app/libs/openid/IOpenIdProtocol.php b/app/libs/OpenId/IOpenIdProtocol.php
similarity index 94%
rename from app/libs/openid/IOpenIdProtocol.php
rename to app/libs/OpenId/IOpenIdProtocol.php
index 71b1dea1..40423921 100644
--- a/app/libs/openid/IOpenIdProtocol.php
+++ b/app/libs/OpenId/IOpenIdProtocol.php
@@ -1,10 +1,8 @@
-<?php
-
-namespace openid;
+<?php namespace OpenId;
 
 /**
  * Interface IOpenIdProtocol
- * @package openid
+ * @package OpenId
  */
 interface IOpenIdProtocol
 {
diff --git a/app/libs/OpenId/Models/Association.php b/app/libs/OpenId/Models/Association.php
new file mode 100644
index 00000000..9a8d3776
--- /dev/null
+++ b/app/libs/OpenId/Models/Association.php
@@ -0,0 +1,149 @@
+<?php namespace OpenId\Models;
+
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Model\BaseModelEloquent;
+
+/**
+ * Class Association
+ * @package OpenId\Models
+ */
+class Association extends BaseModelEloquent implements IAssociation
+{
+
+    /**
+     * @var string
+     */
+    private $handle;
+    /**
+     * @var string
+     */
+    private $secret;
+    /**
+     * @var string
+     */
+    private $mac_function;
+    /**
+     * @var int
+     */
+    private $lifetime;
+    /**
+     * @var
+     */
+    private $issued;
+    /**
+     * @var string
+     */
+    private $type;
+    /**
+     * @var string
+     */
+    private $realm;
+
+    /**
+     * Association constructor.
+     * @param string $handle
+     * @param string $secret
+     * @param string $mac_function
+     * @param int $lifetime
+     * @param $issued
+     * @param string $type
+     * @param string $realm
+     */
+    public function __construct($handle, $secret, $mac_function, $lifetime, $issued, $type, $realm)
+    {
+        $this->handle = $handle;
+        $this->secret = $secret;
+        $this->mac_function = $mac_function;
+        $this->lifetime = $lifetime;
+        $this->issued = $issued;
+        $this->type = $type;
+        $this->realm = $realm;
+    }
+
+    public function getMacFunction()
+    {
+        return $this->mac_function;
+    }
+
+    public function setMacFunction($mac_function)
+    {
+        // TODO: Implement setMacFunction() method.
+    }
+
+    public function getSecret()
+    {
+        return $this->secret;
+    }
+
+    public function setSecret($secret)
+    {
+        // TODO: Implement setSecret() method.
+    }
+
+    public function getLifetime()
+    {
+        return intval($this->lifetime);
+    }
+
+    public function setLifetime($lifetime)
+    {
+        // TODO: Implement setLifetime() method.
+    }
+
+    public function getIssued()
+    {
+        return $this->issued;
+    }
+
+    public function setIssued($issued)
+    {
+        // TODO: Implement setIssued() method.
+    }
+
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    public function setType($type)
+    {
+        // TODO: Implement setType() method.
+    }
+
+    public function getRealm()
+    {
+        return $this->realm;
+    }
+
+    public function setRealm($realm)
+    {
+        // TODO: Implement setRealm() method.
+    }
+
+    public function IsExpired()
+    {
+        // TODO: Implement IsExpired() method.
+    }
+
+    public function getRemainingLifetime()
+    {
+        // TODO: Implement getRemainingLifetime() method.
+    }
+
+    public function getHandle()
+    {
+        return $this->handle;
+    }
+
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Models/IAssociation.php b/app/libs/OpenId/Models/IAssociation.php
new file mode 100644
index 00000000..a4a877e6
--- /dev/null
+++ b/app/libs/OpenId/Models/IAssociation.php
@@ -0,0 +1,92 @@
+<?php namespace OpenId\Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Model\IEntity;
+/**
+ * Interface IAssociation
+ * @package OpenId\Models
+ */
+interface IAssociation extends IEntity {
+
+    const TypePrivate = 1;
+    const TypeSession = 2;
+
+    /**
+     * @return string
+     */
+    public function getMacFunction();
+
+    /**
+     * @param string $mac_function
+     * @return $this
+     */
+    public function setMacFunction($mac_function);
+
+    /**
+     * @return string
+     */
+    public function getSecret();
+
+    /**
+     * @param string $secret
+     * @return $this
+     */
+    public function setSecret($secret);
+
+    /**
+     * @return int
+     */
+    public function getLifetime();
+
+    /**
+     * @param int $lifetime
+     * @return $this
+     */
+    public function setLifetime($lifetime);
+
+    public function getIssued();
+
+    public function setIssued($issued);
+
+    /**
+     * @return string
+     */
+    public function getType();
+
+    /**
+     * @param string $type
+     * @return $this
+     */
+    public function setType($type);
+
+    /**
+     * @return string
+     */
+    public function getRealm();
+
+    /**
+     * @param string $realm
+     * @return $this
+     */
+    public function setRealm($realm);
+
+    /**
+     * @return bool
+     */
+    public function IsExpired();
+
+    public function getRemainingLifetime();
+
+	public function getHandle();
+
+}
\ No newline at end of file
diff --git a/app/libs/openid/model/IOpenIdUser.php b/app/libs/OpenId/Models/IOpenIdUser.php
similarity index 92%
rename from app/libs/openid/model/IOpenIdUser.php
rename to app/libs/OpenId/Models/IOpenIdUser.php
index 38a8d331..59ede4b0 100644
--- a/app/libs/openid/model/IOpenIdUser.php
+++ b/app/libs/OpenId/Models/IOpenIdUser.php
@@ -1,17 +1,11 @@
-<?php
-
-namespace openid\model;
-
+<?php namespace OpenId\Models;
 /**
  * Interface IOpenIdUser
- * @package openid\model
+ * @package OpenId\Models
  */
 interface IOpenIdUser
 {
-    /**
-     *
-     */
-    const OpenstackIdServerAdminGroup = 'openstackid-server-admin';
+    const OpenStackIdServerAdminGroup = 'openstackid-server-admin';
 
     /**
      * @return bool
diff --git a/app/libs/openid/model/ITrustedSite.php b/app/libs/OpenId/Models/ITrustedSite.php
similarity index 79%
rename from app/libs/openid/model/ITrustedSite.php
rename to app/libs/OpenId/Models/ITrustedSite.php
index 14f73502..4ce7c215 100644
--- a/app/libs/openid/model/ITrustedSite.php
+++ b/app/libs/OpenId/Models/ITrustedSite.php
@@ -1,12 +1,12 @@
-<?php
-
-namespace openid\model;
-
+<?php namespace OpenId\Models;
 /**
  * Interface ITrustedSite
  * @package openid\model
  */
 interface ITrustedSite {
+    /**
+     * @return string
+     */
     public function getRealm();
 
     public function getData();
diff --git a/app/libs/openid/model/OpenIdNonce.php b/app/libs/OpenId/Models/OpenIdNonce.php
similarity index 71%
rename from app/libs/openid/model/OpenIdNonce.php
rename to app/libs/OpenId/Models/OpenIdNonce.php
index 44afc284..db8af1e3 100644
--- a/app/libs/openid/model/OpenIdNonce.php
+++ b/app/libs/OpenId/Models/OpenIdNonce.php
@@ -1,20 +1,35 @@
-<?php
-namespace openid\model;
-
-use openid\exceptions\InvalidNonce;
-use openid\helpers\OpenIdErrorMessages;
-use utils\model\Identifier;
-
+<?php namespace OpenId\Models;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Exceptions\InvalidNonce;
+use OpenId\Helpers\OpenIdErrorMessages;
+use Utils\Model\Identifier;
 /**
  * Class OpenIdNonce
- * @package openid\model
+ * @package OpenId\Models
  */
 final class OpenIdNonce extends Identifier
 {
     const NonceRegexFormat = '/(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)Z(.*)/';
-    const NonceTimeFormat = '%Y-%m-%dT%H:%M:%SZ';
+    const NonceTimeFormat  = '%Y-%m-%dT%H:%M:%SZ';
 
+    /**
+     * @var string
+     */
     private $timestamp;
+    /**
+     * @var string
+     */
     private $unique_id;
 
 
@@ -27,19 +42,28 @@ final class OpenIdNonce extends Identifier
         parent::__construct($len, $lifetime);
     }
 
+    /**
+     * @return string
+     */
     public function getRawFormat()
     {
         return $this->value;
     }
 
+    /**
+     * @return string
+     */
     public function getTimestamp()
     {
         return $this->timestamp;
     }
 
+    /**
+     * @return string
+     */
     public function getUniqueId()
     {
-        return $this->$unique_id;
+        return $this->unique_id;
     }
 
     /**
@@ -100,6 +124,11 @@ final class OpenIdNonce extends Identifier
         return parent::setValue($value);
     }
 
+    /**
+     * @param string $value
+     * @return OpenIdNonce
+     * @throws InvalidNonce
+     */
     static public function fromValue($value)
     {
         $nonce = new OpenIdNonce(255);
diff --git a/app/libs/openid/OpenIdMessage.php b/app/libs/OpenId/OpenIdMessage.php
similarity index 67%
rename from app/libs/openid/OpenIdMessage.php
rename to app/libs/OpenId/OpenIdMessage.php
index aa4df14e..ae78ba42 100644
--- a/app/libs/openid/OpenIdMessage.php
+++ b/app/libs/OpenId/OpenIdMessage.php
@@ -1,16 +1,24 @@
-<?php
-
-namespace openid;
-
-use openid\exceptions\InvalidOpenIdMessageMode;
-use openid\helpers\OpenIdErrorMessages;
-use utils\http\HttpMessage;
-use openid\requests\OpenIdMessageMemento;
-
+<?php namespace OpenId;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Exceptions\InvalidOpenIdMessageMode;
+use OpenId\Helpers\OpenIdErrorMessages;
+use OpenId\Requests\OpenIdMessageMemento;
+use Utils\Http\HttpMessage;
 /**
  * Class OpenIdMessage
  * Implements a base OpenId Message
- * @package openid
+ * @package OpenId
  */
 class OpenIdMessage extends HttpMessage
 {
@@ -23,6 +31,9 @@ class OpenIdMessage extends HttpMessage
         parent::__construct($values);
     }
 
+    /**
+     * @return string
+     */
     public function getMode()
     {
         return $this->getParam(OpenIdProtocol::OpenIDProtocol_Mode);
@@ -46,6 +57,9 @@ class OpenIdMessage extends HttpMessage
         return null;
     }
 
+    /**
+     * @return bool
+     */
     public function isValid()
     {
         $ns   = $this->getParam(OpenIdProtocol::OpenIDProtocol_NS);
@@ -59,12 +73,17 @@ class OpenIdMessage extends HttpMessage
         return false;
     }
 
-
+    /**
+     * @param string $mode
+     * @return $this
+     * @throws InvalidOpenIdMessageMode
+     */
     protected function setMode($mode)
     {
         if (!OpenIdProtocol::isValidMode($mode))
             throw new InvalidOpenIdMessageMode(sprintf(OpenIdErrorMessages::InvalidOpenIdMessageModeMessage, $mode));
-        $this->container[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_Mode)] = $mode;;
+        $this->container[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_Mode)] = $mode;
+        return $this;
     }
 
     /**
diff --git a/app/libs/openid/OpenIdProtocol.php b/app/libs/OpenId/OpenIdProtocol.php
similarity index 87%
rename from app/libs/openid/OpenIdProtocol.php
rename to app/libs/OpenId/OpenIdProtocol.php
index 51bfeef4..bf5510b3 100644
--- a/app/libs/openid/OpenIdProtocol.php
+++ b/app/libs/OpenId/OpenIdProtocol.php
@@ -1,28 +1,36 @@
-<?php
-
-namespace openid;
-
-use openid\handlers\IOpenIdAuthenticationStrategy;
-use openid\handlers\OpenIdAuthenticationRequestHandler;
-use openid\handlers\OpenIdCheckAuthenticationRequestHandler;
-use openid\handlers\OpenIdSessionAssociationRequestHandler;
-use openid\services\IAssociationService;
-use openid\services\IMementoOpenIdSerializerService;
-use openid\services\INonceService;
-use openid\services\IServerConfigurationService;
-use openid\services\IServerExtensionsService;
-use openid\services\ITrustedSitesService;
-use openid\XRDS\XRDSDocumentBuilder;
-use openid\XRDS\XRDSService;
-use utils\services\IAuthService;
-use utils\services\ICheckPointService;
-use utils\services\ILogService;
-use utils\services\IServerConfigurationService as IUtilsServerConfigurationService;
-
+<?php namespace OpenId;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Handlers\IOpenIdAuthenticationStrategy;
+use OpenId\Handlers\OpenIdAuthenticationRequestHandler;
+use OpenId\Handlers\OpenIdCheckAuthenticationRequestHandler;
+use OpenId\Handlers\OpenIdSessionAssociationRequestHandler;
+use OpenId\Services\IAssociationService;
+use OpenId\Services\IMementoOpenIdSerializerService;
+use OpenId\Services\INonceService;
+use OpenId\Services\IServerConfigurationService;
+use OpenId\Services\IServerExtensionsService;
+use OpenId\Services\ITrustedSitesService;
+use OpenId\Xrds\XRDSDocumentBuilder;
+use OpenId\Xrds\XRDSService;
+use Utils\Services\IAuthService;
+use Utils\Services\ICheckPointService;
+use Utils\Services\ILogService;
+use Utils\Services\IServerConfigurationService as IUtilsServerConfigurationService;
 /**
  * Class OpenIdProtocol
  * OpenId Protocol Implementation
- * @package openid
+ * @package OpenId
  */
 class OpenIdProtocol implements IOpenIdProtocol
 {
diff --git a/app/libs/OpenId/OpenIdServiceProvider.php b/app/libs/OpenId/OpenIdServiceProvider.php
new file mode 100644
index 00000000..30819aa1
--- /dev/null
+++ b/app/libs/OpenId/OpenIdServiceProvider.php
@@ -0,0 +1,59 @@
+<?php namespace OpenId;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Support\ServiceProvider;
+use OpenId\Extensions\OpenIdAuthenticationExtension;
+use OpenId\Services\OpenIdServiceCatalog;
+use Utils\Services\UtilsServiceCatalog;
+use Illuminate\Support\Facades\App;
+/**
+ * Class OpenIdServiceProvider
+ * Register dependencies with IOC container for package openid
+ * @package OpenId
+ */
+class OpenIdServiceProvider extends ServiceProvider {
+
+    protected $defer = true;
+
+    public function boot(){
+    }
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+	    App::singleton(\OpenId\IOpenIdProtocol::class, \OpenId\OpenIdProtocol::class);
+
+        $auth_extension_service = App::make('Auth\\IAuthenticationExtensionService');
+
+        if(!is_null($auth_extension_service)){
+            $memento_service              = App::make(OpenIdServiceCatalog::MementoSerializerService);
+            $server_configuration_service = App::make(UtilsServiceCatalog::ServerConfigurationService);
+
+            $auth_extension_service->addExtension(
+                    new OpenIdAuthenticationExtension(
+                        $memento_service,
+                        $server_configuration_service
+                    )
+            );
+        }
+    }
+
+    public function provides()
+    {
+        return [\OpenId\IOpenIdProtocol::class];
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Repositories/IOpenIdAssociationRepository.php b/app/libs/OpenId/Repositories/IOpenIdAssociationRepository.php
new file mode 100644
index 00000000..17259ed1
--- /dev/null
+++ b/app/libs/OpenId/Repositories/IOpenIdAssociationRepository.php
@@ -0,0 +1,33 @@
+<?php namespace OpenId\Repositories;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Models\IAssociation;
+use Utils\Db\IBaseRepository;
+/**
+ * Interface IOpenIdAssociationRepository
+ * @package OpenId\Repositories
+ */
+interface IOpenIdAssociationRepository extends IBaseRepository {
+
+	/**
+	 * @param int $id
+	 * @return bool
+	 */
+	public function deleteById($id);
+
+    /**
+     * @param string $handle
+     * @return IAssociation
+     */
+	public function getByHandle($handle);
+} 
\ No newline at end of file
diff --git a/app/libs/OpenId/Repositories/IOpenIdTrustedSiteRepository.php b/app/libs/OpenId/Repositories/IOpenIdTrustedSiteRepository.php
new file mode 100644
index 00000000..e8ac0de5
--- /dev/null
+++ b/app/libs/OpenId/Repositories/IOpenIdTrustedSiteRepository.php
@@ -0,0 +1,37 @@
+<?php namespace OpenId\Repositories;
+
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Db\IBaseRepository;
+/**
+ * Interface IOpenIdTrustedSiteRepository
+ * @package OpenId\Repositories
+ */
+interface IOpenIdTrustedSiteRepository extends IBaseRepository
+{
+
+    /**
+     * @param int $id
+     * @return bool
+     */
+    public function deleteById($id);
+
+    /**
+     * @param int $user_id
+     * @param array $sub_domains
+     * @param array $data
+     * @return array
+     */
+    public function getMatchingOnesByUserId($user_id, array $sub_domains, array $data);
+
+} 
\ No newline at end of file
diff --git a/app/libs/openid/requests/contexts/PartialView.php b/app/libs/OpenId/Requests/Contexts/PartialView.php
similarity index 52%
rename from app/libs/openid/requests/contexts/PartialView.php
rename to app/libs/OpenId/Requests/Contexts/PartialView.php
index 4e025a4b..3bb5deec 100644
--- a/app/libs/openid/requests/contexts/PartialView.php
+++ b/app/libs/OpenId/Requests/Contexts/PartialView.php
@@ -1,28 +1,41 @@
-<?php
-
-namespace openid\requests\contexts;
-
+<?php namespace OpenId\Requests\Contexts;
 /**
  * Class PartialView
- * @package openid\requests\contexts
+ * @package OpenId\Requests\Contexts
  */
 final class PartialView
 {
-
+    /**
+     * @var string`
+     */
     private $name;
+    /**
+     * @var array
+     */
     private $data;
 
+    /**
+     * PartialView constructor.
+     * @param string $name
+     * @param array|null $data
+     */
     public function __construct($name, array $data = null)
     {
         $this->name = $name;
         $this->data = $data;
     }
 
+    /**
+     * @return array|null
+     */
     public function getData()
     {
         return $this->data;
     }
 
+    /**
+     * @return string
+     */
     public function getName()
     {
         return $this->name;
diff --git a/app/libs/openid/requests/contexts/RequestContext.php b/app/libs/OpenId/Requests/Contexts/RequestContext.php
similarity index 67%
rename from app/libs/openid/requests/contexts/RequestContext.php
rename to app/libs/OpenId/Requests/Contexts/RequestContext.php
index 813a3641..1efe9b75 100644
--- a/app/libs/openid/requests/contexts/RequestContext.php
+++ b/app/libs/OpenId/Requests/Contexts/RequestContext.php
@@ -1,14 +1,17 @@
-<?php
-
-namespace openid\requests\contexts;
-
+<?php namespace OpenId\Requests\Contexts;
 /**
  * Class RequestContext
- * @package openid\requests\contexts
+ * @package OpenId\Requests\Contexts
  */
 class RequestContext
 {
+    /**
+     * @var array
+     */
     private $trusted_data;
+    /**
+     * @var array
+     */
     private $partial_views;
 
     public function __construct()
@@ -17,11 +20,19 @@ class RequestContext
         $this->trusted_data  = array();
     }
 
+    /**
+     * @param PartialView $partial_view
+     * @return $this
+     */
     public function addPartialView(PartialView $partial_view)
     {
         $this->partial_views[$partial_view->getName()] = $partial_view;
+        return $this;
     }
 
+    /**
+     * @return array
+     */
     public function getPartials()
     {
         return $this->partial_views;
@@ -36,12 +47,21 @@ class RequestContext
         return $this->trusted_data;
     }
 
+    /**
+     * @return $this
+     */
     public function cleanTrustedData(){
         $this->trusted_data = array();
+        return $this;
     }
 
+    /**
+     * @param $trusted_data
+     * @return $this
+     */
     public function setTrustedData($trusted_data)
     {
         $this->trusted_data = array_merge($this->trusted_data, $trusted_data);
+        return $this;
     }
 }
\ No newline at end of file
diff --git a/app/libs/openid/requests/OpenIdAssociationSessionRequest.php b/app/libs/OpenId/Requests/OpenIdAssociationSessionRequest.php
similarity index 56%
rename from app/libs/openid/requests/OpenIdAssociationSessionRequest.php
rename to app/libs/OpenId/Requests/OpenIdAssociationSessionRequest.php
index 01f310c8..f75fd2c1 100644
--- a/app/libs/openid/requests/OpenIdAssociationSessionRequest.php
+++ b/app/libs/OpenId/Requests/OpenIdAssociationSessionRequest.php
@@ -1,25 +1,40 @@
-<?php
-
-namespace openid\requests;
-
-use openid\exceptions\InvalidAssociationTypeException;
-use openid\exceptions\InvalidSessionTypeException;
-use openid\helpers\OpenIdErrorMessages;
-use openid\OpenIdMessage;
-use openid\OpenIdProtocol;
-
+<?php namespace OpenId\Requests;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Exceptions\InvalidAssociationTypeException;
+use OpenId\Exceptions\InvalidSessionTypeException;
+use OpenId\Helpers\OpenIdErrorMessages;
+use OpenId\OpenIdMessage;
+use OpenId\OpenIdProtocol;
 /**
  * Class OpenIdAssociationSessionRequest
- * @package openid\requests
+ * @package OpenId\Requests
  */
 class OpenIdAssociationSessionRequest extends OpenIdRequest {
 
-
+    /**
+     * OpenIdAssociationSessionRequest constructor.
+     * @param OpenIdMessage $message
+     */
     public function __construct(OpenIdMessage $message)
     {
         parent::__construct($message);
     }
 
+    /**
+     * @param OpenIdMessage $message
+     * @return bool
+     */
     public static function IsOpenIdAssociationSessionRequest(OpenIdMessage $message)
     {
         $mode = $message->getMode();
@@ -29,8 +44,8 @@ class OpenIdAssociationSessionRequest extends OpenIdRequest {
 
     /**
      * @return bool
-     * @throws \openid\exceptions\InvalidSessionTypeException
-     * @throws \openid\exceptions\InvalidAssociationTypeException
+     * @throws InvalidSessionTypeException
+     * @throws InvalidAssociationTypeException
      */
     public function isValid()
     {
@@ -57,11 +72,17 @@ class OpenIdAssociationSessionRequest extends OpenIdRequest {
         return true;
     }
 
+    /**
+     * @return string
+     */
     public function getAssocType()
     {
         return $this->getParam(OpenIdProtocol::OpenIDProtocol_AssocType);
     }
 
+    /**
+     * @return string
+     */
     public function getSessionType()
     {
         return $this->getParam(OpenIdProtocol::OpenIDProtocol_SessionType);
diff --git a/app/libs/openid/requests/OpenIdAuthenticationRequest.php b/app/libs/OpenId/Requests/OpenIdAuthenticationRequest.php
similarity index 86%
rename from app/libs/openid/requests/OpenIdAuthenticationRequest.php
rename to app/libs/OpenId/Requests/OpenIdAuthenticationRequest.php
index 1feef7d9..213148ed 100644
--- a/app/libs/openid/requests/OpenIdAuthenticationRequest.php
+++ b/app/libs/OpenId/Requests/OpenIdAuthenticationRequest.php
@@ -1,15 +1,23 @@
-<?php
-
-namespace openid\requests;
-
-use openid\exceptions\InvalidOpenIdMessageException;
-use openid\helpers\OpenIdUriHelper;
-use openid\OpenIdMessage;
-use openid\OpenIdProtocol;
-
+<?php namespace OpenId\Requests;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Exceptions\InvalidOpenIdMessageException;
+use OpenId\Helpers\OpenIdUriHelper;
+use OpenId\OpenIdMessage;
+use OpenId\OpenIdProtocol;
 /**
  * Class OpenIdAuthenticationRequest
- * @package openid\requests
+ * @package OpenId\Requests
  */
 class OpenIdAuthenticationRequest extends OpenIdRequest
 {
@@ -151,7 +159,7 @@ class OpenIdAuthenticationRequest extends OpenIdRequest
      * @param $claimed_id
      * @param $identity
      * @return bool
-     * @throws \openid\exceptions\InvalidOpenIdMessageException
+     * @throws InvalidOpenIdMessageException
      */
     private function isValidIdentifier($claimed_id, $identity)
     {
diff --git a/app/libs/openid/requests/OpenIdCheckAuthenticationRequest.php b/app/libs/OpenId/Requests/OpenIdCheckAuthenticationRequest.php
similarity index 61%
rename from app/libs/openid/requests/OpenIdCheckAuthenticationRequest.php
rename to app/libs/OpenId/Requests/OpenIdCheckAuthenticationRequest.php
index 2f26cc1b..d2d68e47 100644
--- a/app/libs/openid/requests/OpenIdCheckAuthenticationRequest.php
+++ b/app/libs/OpenId/Requests/OpenIdCheckAuthenticationRequest.php
@@ -1,23 +1,35 @@
-<?php
-
-namespace openid\requests;
-
-use openid\helpers\OpenIdUriHelper;
-use openid\OpenIdMessage;
-use openid\OpenIdProtocol;
-
+<?php namespace OpenId\Requests;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Helpers\OpenIdUriHelper;
+use OpenId\OpenIdMessage;
+use OpenId\OpenIdProtocol;
+use OpenId\Exceptions\InvalidOpenIdMessageException;
 /**
  * Class OpenIdCheckAuthenticationRequest
- * @package openid\requests
+ * @package OpenId\Requests
  */
 class OpenIdCheckAuthenticationRequest extends OpenIdAuthenticationRequest
 {
 
+    /**
+     * @var null|string
+     */
     private $op_endpoint_url;
 
     /**
      * @param OpenIdMessage $message
-     * @param               $op_endpoint_url
+     * @param string        $op_endpoint_url
      */
     public function __construct(OpenIdMessage $message, $op_endpoint_url)
     {
@@ -25,29 +37,35 @@ class OpenIdCheckAuthenticationRequest extends OpenIdAuthenticationRequest
         $this->op_endpoint_url = $op_endpoint_url;
     }
 
+    /**
+     * @param OpenIdMessage $message
+     * @return bool
+     */
     public static function IsOpenIdCheckAuthenticationRequest(OpenIdMessage $message)
     {
         $mode = $message->getMode();
         if ($mode == OpenIdProtocol::CheckAuthenticationMode) {
             return true;
         }
-
         return false;
     }
 
+    /**
+     * @return bool
+     * @throws InvalidOpenIdMessageException
+     */
     public function isValid()
     {
-        $mode = $this->getMode();
-        $claimed_assoc = $this->getAssocHandle();
-        $claimed_nonce = $this->getNonce();
-        $claimed_sig = $this->getSig();
+        $mode                = $this->getMode();
+        $claimed_assoc       = $this->getAssocHandle();
+        $claimed_nonce       = $this->getNonce();
+        $claimed_sig         = $this->getSig();
         $claimed_op_endpoint = $this->getOPEndpoint();
-        $claimed_identity = $this->getClaimedId();
-        $claimed_realm = $this->getRealm();
-        $claimed_returnTo = $this->getReturnTo();
-        $signed = $this->getSigned();
-
-        $valid_realm = OpenIdUriHelper::checkRealm($claimed_realm, $claimed_returnTo);
+        $claimed_identity    = $this->getClaimedId();
+        $claimed_realm       = $this->getRealm();
+        $claimed_returnTo    = $this->getReturnTo();
+        $signed              = $this->getSigned();
+        $valid_realm         = OpenIdUriHelper::checkRealm($claimed_realm, $claimed_returnTo);
 
         $res = !is_null($mode) && !empty($mode) && $mode == OpenIdProtocol::CheckAuthenticationMode
             && !is_null($claimed_returnTo) && !empty($claimed_returnTo) && OpenIdUriHelper::checkReturnTo($claimed_returnTo)
@@ -58,7 +76,9 @@ class OpenIdCheckAuthenticationRequest extends OpenIdAuthenticationRequest
             && !is_null($claimed_nonce) && !empty($claimed_nonce)
             && !is_null($claimed_op_endpoint) && !empty($claimed_op_endpoint) && $claimed_op_endpoint == $this->op_endpoint_url
             && !is_null($claimed_identity) && !empty($claimed_identity) && OpenIdUriHelper::isValidUrl($claimed_identity);
-        if (!$res) {
+
+        if (!$res)
+        {
             $msg = sprintf("return_to is empty? %b.", empty($claimed_returnTo)) . PHP_EOL;
             $msg = $msg . sprintf("realm is empty? %b.", empty($claimed_realm)) . PHP_EOL;
             $msg = $msg . sprintf("claimed_id is empty? %b.", empty($claimed_id)) . PHP_EOL;
@@ -71,26 +91,41 @@ class OpenIdCheckAuthenticationRequest extends OpenIdAuthenticationRequest
         return $res;
     }
 
+    /**
+     * @return string
+     */
     public function getNonce()
     {
         return $this->getParam(OpenIdProtocol::OpenIDProtocol_Nonce);
     }
 
+    /**
+     * @return string
+     */
     public function getSig()
     {
         return $this->getParam(OpenIdProtocol::OpenIDProtocol_Sig);
     }
 
+    /**
+     * @return string
+     */
     public function getOPEndpoint()
     {
         return $this->getParam(OpenIdProtocol::OpenIDProtocol_OpEndpoint);
     }
 
+    /**
+     * @return string
+     */
     public function getSigned()
     {
         return $this->getParam(OpenIdProtocol::OpenIDProtocol_Signed);
     }
 
+    /**
+     * @return string
+     */
     public function getInvalidateHandle()
     {
         return $this->getParam(OpenIdProtocol::OpenIDProtocol_InvalidateHandle);
diff --git a/app/libs/openid/requests/OpenIdDHAssociationSessionRequest.php b/app/libs/OpenId/Requests/OpenIdDHAssociationSessionRequest.php
similarity index 76%
rename from app/libs/openid/requests/OpenIdDHAssociationSessionRequest.php
rename to app/libs/OpenId/Requests/OpenIdDHAssociationSessionRequest.php
index 901ad32d..918069b3 100644
--- a/app/libs/openid/requests/OpenIdDHAssociationSessionRequest.php
+++ b/app/libs/OpenId/Requests/OpenIdDHAssociationSessionRequest.php
@@ -1,17 +1,27 @@
-<?php
-
-namespace openid\requests;
-
-use openid\exceptions\InvalidDHParam;
-use openid\helpers\OpenIdCryptoHelper;
-use openid\helpers\OpenIdErrorMessages;
-use openid\OpenIdMessage;
-use openid\OpenIdProtocol;
+<?php namespace OpenId\Requests;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Helpers\OpenIdCryptoHelper;
+use OpenId\Helpers\OpenIdErrorMessages;
+use OpenId\OpenIdMessage;
+use OpenId\OpenIdProtocol;
+use OpenId\Exceptions\InvalidAssociationTypeException;
+use OpenId\Exceptions\InvalidSessionTypeException;
+use OpenId\Exceptions\InvalidDHParam;
 use Zend\Crypt\PublicKey\DiffieHellman;
-
 /**
  * Class OpenIdDHAssociationSessionRequest
- * @package openid\requests
+ * @package OpenId\Requests
  */
 class OpenIdDHAssociationSessionRequest extends OpenIdAssociationSessionRequest
 {
@@ -25,6 +35,10 @@ class OpenIdDHAssociationSessionRequest extends OpenIdAssociationSessionRequest
     private $g_number;
     private $rp_pub_key;
 
+    /**
+     * OpenIdDHAssociationSessionRequest constructor.
+     * @param OpenIdMessage $message
+     */
     public function __construct(OpenIdMessage $message)
     {
         parent::__construct($message);
@@ -47,7 +61,12 @@ class OpenIdDHAssociationSessionRequest extends OpenIdAssociationSessionRequest
         return false;
     }
 
-
+    /**
+     * @return bool
+     * @throws InvalidDHParam
+     * @throws InvalidAssociationTypeException
+     * @throws InvalidSessionTypeException
+     */
     public function isValid()
     {
         $res = parent::isValid();
@@ -72,7 +91,7 @@ class OpenIdDHAssociationSessionRequest extends OpenIdAssociationSessionRequest
 
     /**
      * @return null|string
-     * @throws \openid\exceptions\InvalidDHParam
+     * @throws InvalidDHParam
      */
     public function getDHModulus()
     {
@@ -88,7 +107,7 @@ class OpenIdDHAssociationSessionRequest extends OpenIdAssociationSessionRequest
 
     /**
      * @return null|string
-     * @throws \openid\exceptions\InvalidDHParam
+     * @throws InvalidDHParam
      */
     public function getDHGen()
     {
@@ -104,7 +123,7 @@ class OpenIdDHAssociationSessionRequest extends OpenIdAssociationSessionRequest
 
     /**
      * @return null|string
-     * @throws \openid\exceptions\InvalidDHParam
+     * @throws InvalidDHParam
      */
     public function getDHConsumerPublic()
     {
diff --git a/app/libs/openid/requests/OpenIdMessageMemento.php b/app/libs/OpenId/Requests/OpenIdMessageMemento.php
similarity index 94%
rename from app/libs/openid/requests/OpenIdMessageMemento.php
rename to app/libs/OpenId/Requests/OpenIdMessageMemento.php
index 7d43b004..9c4362fb 100644
--- a/app/libs/openid/requests/OpenIdMessageMemento.php
+++ b/app/libs/OpenId/Requests/OpenIdMessageMemento.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace OpenId\Requests;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,16 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace openid\requests;
-
+use OpenId\OpenIdMessage;
 use ReflectionObject;
-
-use openid\OpenIdMessage;
-
 /**
  * Class OpenIdMessageMemento
- * @package openid\requests
+ * @package OpenId\Requests
  */
 final class OpenIdMessageMemento
 {
@@ -28,6 +23,7 @@ final class OpenIdMessageMemento
      * @var array
      */
     protected $state  = array();
+
     /**
      * @param array $state
      */
diff --git a/app/libs/OpenId/Requests/OpenIdRequest.php b/app/libs/OpenId/Requests/OpenIdRequest.php
new file mode 100644
index 00000000..de411b79
--- /dev/null
+++ b/app/libs/OpenId/Requests/OpenIdRequest.php
@@ -0,0 +1,72 @@
+<?php namespace OpenId\Requests;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+**/
+use OpenId\OpenIdMessage;
+/**
+ * Class OpenIdRequest
+ * @package OpenId\Requests
+ */
+abstract class OpenIdRequest
+{
+    /**
+     * @var OpenIdMessage
+     */
+    protected $message;
+
+    /**
+     * OpenIdRequest constructor.
+     * @param OpenIdMessage $message
+     */
+    public function __construct(OpenIdMessage $message)
+    {
+        $this->message = $message;
+    }
+
+    /**
+     * @return OpenIdMessage
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMode()
+    {
+        return $this->message->getMode();
+    }
+
+    /**
+     * @return bool
+     */
+    abstract public function isValid();
+
+    /**
+     * @param OpenIDProtocol_ * $param
+     * @return string
+     */
+    public function getParam($param)
+    {
+        return $this->message->getParam($param);
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->message->__toString();
+    }
+}
\ No newline at end of file
diff --git a/app/libs/openid/responses/contexts/ResponseContext.php b/app/libs/OpenId/Responses/Contexts/ResponseContext.php
similarity index 61%
rename from app/libs/openid/responses/contexts/ResponseContext.php
rename to app/libs/OpenId/Responses/Contexts/ResponseContext.php
index 5c176fe7..a1e0c2e5 100644
--- a/app/libs/openid/responses/contexts/ResponseContext.php
+++ b/app/libs/OpenId/Responses/Contexts/ResponseContext.php
@@ -1,13 +1,13 @@
-<?php
-
-namespace openid\responses\contexts;
-
+<?php namespace OpenId\Responses\Contexts;
 /**
  * Class ResponseContext
- * @package openid\responses\contexts
+ * @package OpenId\Responses\Contexts
  */
 class ResponseContext {
 
+    /**
+     * @var array
+     */
     private $sign_params;
 
     public function __construct()
@@ -15,11 +15,19 @@ class ResponseContext {
         $this->sign_params = array();
     }
 
+    /**
+     * @param string $param
+     * @return $this
+     */
     public function addSignParam($param)
     {
         array_push($this->sign_params, $param);
+        return $this;
     }
 
+    /**
+     * @return array
+     */
     public function getSignParams()
     {
         ksort($this->sign_params);
diff --git a/app/libs/openid/responses/OpenIdAssociationSessionResponse.php b/app/libs/OpenId/Responses/OpenIdAssociationSessionResponse.php
similarity index 58%
rename from app/libs/openid/responses/OpenIdAssociationSessionResponse.php
rename to app/libs/OpenId/Responses/OpenIdAssociationSessionResponse.php
index 4caf0e22..831af86d 100644
--- a/app/libs/openid/responses/OpenIdAssociationSessionResponse.php
+++ b/app/libs/OpenId/Responses/OpenIdAssociationSessionResponse.php
@@ -1,28 +1,36 @@
-<?php
-
-namespace openid\responses;
-
-use openid\OpenIdProtocol;
-
+<?php namespace OpenId\Responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\OpenIdProtocol;
 /**
  * Class OpenIdAssociationSessionResponse
- * @package openid\responses
+ * @package OpenId\Responses
  */
 abstract class OpenIdAssociationSessionResponse extends OpenIdDirectResponse
 {
 
     /** Common Response Parameters
-     * @param $assoc_handle
+     * @param string $assoc_handle
      *        The association handle is used as a key to refer to this association in subsequent messages.
      *        A string 255 characters or less in length. It MUST consist only of ASCII characters in the
      *        range 33-126 inclusive (printable non-whitespace characters).
-     * @param $session_type
+     * @param string $session_type
      *        The value of the "openid.session_type" parameter from the request. If the OP is unwilling
      *        or unable to support this association type, it MUST return an unsuccessful response.
-     * @param $assoc_type
+     * @param string $assoc_type
      *        The value of the "openid.assoc_type" parameter from the request. If the OP is unwilling or
      *        unable to support this association type, it MUST return an unsuccessful response.
-     * @param $expires_in
+     * @param int $expires_in
      *        The lifetime, in seconds, of this association. The Relying Party MUST NOT use
      *        the association after this time has passed.
      *        An integer, represented in base 10 ASCII.
@@ -32,8 +40,8 @@ abstract class OpenIdAssociationSessionResponse extends OpenIdDirectResponse
         parent::__construct();
         $this[OpenIdProtocol::OpenIDProtocol_AssocHandle] = $assoc_handle;
         $this[OpenIdProtocol::OpenIDProtocol_SessionType] = $session_type;
-        $this[OpenIdProtocol::OpenIDProtocol_AssocType] = $assoc_type;
-        $this[OpenIdProtocol::OpenIdProtocol_ExpiresIn] = $expires_in;
+        $this[OpenIdProtocol::OpenIDProtocol_AssocType]   = $assoc_type;
+        $this[OpenIdProtocol::OpenIdProtocol_ExpiresIn]   = $expires_in;
     }
 
 } 
\ No newline at end of file
diff --git a/app/libs/OpenId/Responses/OpenIdAssociationSessionUnsuccessfulResponse.php b/app/libs/OpenId/Responses/OpenIdAssociationSessionUnsuccessfulResponse.php
new file mode 100644
index 00000000..3c23be3a
--- /dev/null
+++ b/app/libs/OpenId/Responses/OpenIdAssociationSessionUnsuccessfulResponse.php
@@ -0,0 +1,31 @@
+<?php namespace OpenId\Responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\OpenIdProtocol;
+/**
+ * Class OpenIdAssociationSessionUnsuccessfulResponse
+ * @package OpenId\Responses
+ */
+class OpenIdAssociationSessionUnsuccessfulResponse extends OpenIdDirectResponse
+{
+
+    public function __construct($error)
+    {
+        parent::__construct();
+
+        $this[OpenIdProtocol::OpenIDProtocol_Error]       = $error;
+        $this[OpenIdProtocol::OpenIDProtocol_ErrorCode]   = 'unsupported-type';
+        $this[OpenIdProtocol::OpenIDProtocol_SessionType] = OpenIdProtocol::AssociationSessionTypeDHSHA256;
+        $this[OpenIdProtocol::OpenIDProtocol_AssocType]   = OpenIdProtocol::SignatureAlgorithmHMAC_SHA256;
+    }
+} 
\ No newline at end of file
diff --git a/app/libs/openid/responses/OpenIdCheckAuthenticationResponse.php b/app/libs/OpenId/Responses/OpenIdCheckAuthenticationResponse.php
similarity index 66%
rename from app/libs/openid/responses/OpenIdCheckAuthenticationResponse.php
rename to app/libs/OpenId/Responses/OpenIdCheckAuthenticationResponse.php
index eb068917..2baa003e 100644
--- a/app/libs/openid/responses/OpenIdCheckAuthenticationResponse.php
+++ b/app/libs/OpenId/Responses/OpenIdCheckAuthenticationResponse.php
@@ -1,12 +1,20 @@
-<?php
-
-namespace openid\responses;
-
-use openid\OpenIdProtocol;
-
+<?php namespace OpenId\Responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\OpenIdProtocol;
 /**
  * Class OpenIdCheckAuthenticationResponse
- * @package openid\responses
+ * @package OpenId\Responses
  */
 class OpenIdCheckAuthenticationResponse extends OpenIdDirectResponse {
     /**
diff --git a/app/libs/OpenId/Responses/OpenIdDiffieHellmanAssociationSessionResponse.php b/app/libs/OpenId/Responses/OpenIdDiffieHellmanAssociationSessionResponse.php
new file mode 100644
index 00000000..cace3f6b
--- /dev/null
+++ b/app/libs/OpenId/Responses/OpenIdDiffieHellmanAssociationSessionResponse.php
@@ -0,0 +1,36 @@
+<?php namespace OpenId\Responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\OpenIdProtocol;
+/**
+ * Class OpenIdDiffieHellmanAssociationSessionResponse
+ * @package OpenId\Responses
+ */
+class OpenIdDiffieHellmanAssociationSessionResponse extends OpenIdAssociationSessionResponse
+{
+    /**
+     * OpenIdDiffieHellmanAssociationSessionResponse constructor.
+     * @param string $assoc_handle
+     * @param string $session_type
+     * @param string $assoc_type
+     * @param int $expires_in
+     * @param string $server_public
+     * @param string $enc_mac_key
+     */
+    public function __construct($assoc_handle, $session_type, $assoc_type, $expires_in, $server_public, $enc_mac_key)
+    {
+        parent::__construct($assoc_handle, $session_type, $assoc_type, $expires_in);
+        $this[OpenIdProtocol::OpenIdProtocol_DHServerPublic] = $server_public;
+        $this[OpenIdProtocol::OpenIdProtocol_DHEncMacKey] = $enc_mac_key;
+    }
+} 
\ No newline at end of file
diff --git a/app/libs/openid/responses/OpenIdDirectGenericErrorResponse.php b/app/libs/OpenId/Responses/OpenIdDirectGenericErrorResponse.php
similarity index 59%
rename from app/libs/openid/responses/OpenIdDirectGenericErrorResponse.php
rename to app/libs/OpenId/Responses/OpenIdDirectGenericErrorResponse.php
index 1e80a231..a03237c0 100644
--- a/app/libs/openid/responses/OpenIdDirectGenericErrorResponse.php
+++ b/app/libs/OpenId/Responses/OpenIdDirectGenericErrorResponse.php
@@ -1,13 +1,21 @@
-<?php
-
-namespace openid\responses;
-
-use openid\OpenIdProtocol;
-
+<?php namespace OpenId\Responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\OpenIdProtocol;
 /**
  * Class OpenIdDirectGenericErrorResponse
- * implements 5.1.2.2.  Error Responses
- * @package openid\responses
+ * implements 5.1.2.2. Error Responses
+ * @package OpenId\Responses
  */
 class OpenIdDirectGenericErrorResponse extends OpenIdDirectResponse
 {
diff --git a/app/libs/openid/responses/OpenIdDirectResponse.php b/app/libs/OpenId/Responses/OpenIdDirectResponse.php
similarity index 69%
rename from app/libs/openid/responses/OpenIdDirectResponse.php
rename to app/libs/OpenId/Responses/OpenIdDirectResponse.php
index 5023e672..724bf7e3 100644
--- a/app/libs/openid/responses/OpenIdDirectResponse.php
+++ b/app/libs/OpenId/Responses/OpenIdDirectResponse.php
@@ -1,16 +1,24 @@
-<?php
-
-namespace openid\responses;
-
-use openid\exceptions\InvalidKVFormat;
-use openid\helpers\OpenIdErrorMessages;
-use openid\OpenIdProtocol;
-use utils\http\HttpContentType;
-
+<?php namespace OpenId\Responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Exceptions\InvalidKVFormat;
+use OpenId\Helpers\OpenIdErrorMessages;
+use OpenId\OpenIdProtocol;
+use Utils\Http\HttpContentType;
 /**
  * Class OpenIdDirectResponse
  * Implementation of 5.1.2. Direct Response
- * @package openid\responses
+ * @package OpenId\Responses
  */
 class OpenIdDirectResponse extends OpenIdResponse
 {
@@ -33,7 +41,7 @@ class OpenIdDirectResponse extends OpenIdResponse
     /**
      * Implementation of 4.1.1.  Key-Value Form Encoding
      * @return string
-     * @throws \openid\exceptions\InvalidKVFormat
+     * @throws InvalidKVFormat
      */
     public function getContent()
     {
@@ -62,6 +70,9 @@ class OpenIdDirectResponse extends OpenIdResponse
         return $kv_format;
     }
 
+    /**
+     * @return string
+     */
     public function getType()
     {
         return self::OpenIdDirectResponse;
diff --git a/app/libs/OpenId/Responses/OpenIdImmediateNegativeAssertion.php b/app/libs/OpenId/Responses/OpenIdImmediateNegativeAssertion.php
new file mode 100644
index 00000000..a3de1cb1
--- /dev/null
+++ b/app/libs/OpenId/Responses/OpenIdImmediateNegativeAssertion.php
@@ -0,0 +1,37 @@
+<?php namespace OpenId\Responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\OpenIdProtocol;
+/**
+ * Class OpenIdImmediateNegativeAssertion
+ * implements @see http://openid.net/specs/openid-authentication-2_0.html#negative_assertions
+ * Negative Assertions
+ * In Response to Immediate Requests
+ * @package OpenId\Responses
+ */
+class OpenIdImmediateNegativeAssertion extends OpenIdIndirectResponse
+{
+
+    /**
+     * OpenIdImmediateNegativeAssertion constructor.
+     * @param null|string $return_url
+     */
+    public function __construct($return_url = null)
+    {
+        parent::__construct();
+        $this->setMode(OpenIdProtocol::SetupNeededMode);
+        if (!is_null($return_url) && !empty($return_url)) {
+            $this->setReturnTo($return_url);
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Responses/OpenIdIndirectGenericErrorResponse.php b/app/libs/OpenId/Responses/OpenIdIndirectGenericErrorResponse.php
new file mode 100644
index 00000000..f423c01f
--- /dev/null
+++ b/app/libs/OpenId/Responses/OpenIdIndirectGenericErrorResponse.php
@@ -0,0 +1,48 @@
+<?php namespace OpenId\Responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Helpers\OpenIdUriHelper;
+use OpenId\OpenIdProtocol;
+use OpenId\Requests\OpenIdRequest;
+/**
+ * Class OpenIdIndirectGenericErrorResponse
+ * @package OpenId\Responses
+ */
+class OpenIdIndirectGenericErrorResponse extends OpenIdIndirectResponse
+{
+    /**
+     * OpenIdIndirectGenericErrorResponse constructor.
+     * @param $error
+     * @param null $contact
+     * @param null $reference
+     * @param OpenIdRequest|null $request
+     */
+    public function __construct($error, $contact = null, $reference = null, OpenIdRequest $request = null)
+    {
+        parent::__construct();
+        $this->setHttpCode(self::HttpErrorResponse);
+        $this[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_Error)] = $error;
+        //opt values
+        if (!is_null($contact))
+            $this[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_Contact)] = $contact;
+        if (!is_null($reference))
+            $this[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_Reference)] = $reference;
+
+        if (!is_null($request)) {
+            $return_to = $request->getParam(OpenIdProtocol::OpenIDProtocol_ReturnTo);
+            if (!is_null($return_to) && !empty($return_to) && OpenIdUriHelper::checkReturnTo($return_to))
+                $this->setReturnTo($return_to);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/libs/openid/responses/OpenIdIndirectResponse.php b/app/libs/OpenId/Responses/OpenIdIndirectResponse.php
similarity index 64%
rename from app/libs/openid/responses/OpenIdIndirectResponse.php
rename to app/libs/OpenId/Responses/OpenIdIndirectResponse.php
index cb1a5db8..bf2120c7 100644
--- a/app/libs/openid/responses/OpenIdIndirectResponse.php
+++ b/app/libs/OpenId/Responses/OpenIdIndirectResponse.php
@@ -1,18 +1,26 @@
-<?php
-
-namespace openid\responses;
-
-use openid\OpenIdProtocol;
-
+<?php namespace OpenId\Responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\OpenIdProtocol;
 /**
  * Class OpenIdIndirectResponse
- * @package openid\responses
+ * @package OpenId\Responses
  */
 class OpenIdIndirectResponse extends OpenIdResponse
 {
 
     const IndirectResponseContentType = "application/x-www-form-urlencoded";
-    const OpenIdIndirectResponse = "OpenIdIndirectResponse";
+    const OpenIdIndirectResponse      = "OpenIdIndirectResponse";
 
     public function __construct()
     {
@@ -27,6 +35,9 @@ class OpenIdIndirectResponse extends OpenIdResponse
         $this[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_NS)] = OpenIdProtocol::OpenID2MessageType;
     }
 
+    /**
+     * @return string
+     */
     public function getContent()
     {
         $url_encoded_format = "";
@@ -44,16 +55,27 @@ class OpenIdIndirectResponse extends OpenIdResponse
         return $url_encoded_format;
     }
 
+    /**
+     * @return string
+     */
     public function getType()
     {
         return self::OpenIdIndirectResponse;
     }
 
+    /**
+     * @param string $return_to
+     * @return $this
+     */
     public function setReturnTo($return_to)
     {
         $this[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_ReturnTo)] = $return_to;
+        return $this;
     }
 
+    /**
+     * @return string
+     */
     public function getReturnTo()
     {
         return $this[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_ReturnTo)];
diff --git a/app/libs/OpenId/Responses/OpenIdNonImmediateNegativeAssertion.php b/app/libs/OpenId/Responses/OpenIdNonImmediateNegativeAssertion.php
new file mode 100644
index 00000000..d270ba4c
--- /dev/null
+++ b/app/libs/OpenId/Responses/OpenIdNonImmediateNegativeAssertion.php
@@ -0,0 +1,36 @@
+<?php namespace OpenId\Responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\OpenIdProtocol;
+/**
+ * Class OpenIdNonImmediateNegativeAssertion
+ * implements @see http://openid.net/specs/openid-authentication-2_0.html#negative_assertions
+ * Negative Assertions
+ * In Response to Non-Immediate Requests
+ * @package OpenId\Responses
+ */
+class OpenIdNonImmediateNegativeAssertion extends OpenIdIndirectResponse
+{
+    /**
+     * OpenIdNonImmediateNegativeAssertion constructor.
+     * @param null|string $return_url
+     */
+    public function __construct($return_url = null)
+    {
+        parent::__construct();
+        $this->setMode(OpenIdProtocol::CancelMode);
+        if (!is_null($return_url) && !empty($return_url)) {
+            $this->setReturnTo($return_url);
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/libs/openid/responses/OpenIdPositiveAssertionResponse.php b/app/libs/OpenId/Responses/OpenIdPositiveAssertionResponse.php
similarity index 52%
rename from app/libs/openid/responses/OpenIdPositiveAssertionResponse.php
rename to app/libs/OpenId/Responses/OpenIdPositiveAssertionResponse.php
index 98d9f2cc..fa126d88 100644
--- a/app/libs/openid/responses/OpenIdPositiveAssertionResponse.php
+++ b/app/libs/OpenId/Responses/OpenIdPositiveAssertionResponse.php
@@ -1,12 +1,33 @@
-<?php
-
-namespace openid\responses;
-
-use openid\OpenIdProtocol;
-
+<?php namespace OpenId\Responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\OpenIdProtocol;
+/**
+ * Class OpenIdPositiveAssertionResponse
+ * @package OpenId\Responses
+ */
 class OpenIdPositiveAssertionResponse extends OpenIdIndirectResponse
 {
 
+    /**
+     * OpenIdPositiveAssertionResponse constructor.
+     * @param string $op_endpoint
+     * @param string $claimed_id
+     * @param string $identity
+     * @param string $return_to
+     * @param string $nonce
+     * @param string $realm
+     */
     public function __construct($op_endpoint, $claimed_id, $identity, $return_to, $nonce, $realm)
     {
         parent::__construct();
@@ -19,29 +40,52 @@ class OpenIdPositiveAssertionResponse extends OpenIdIndirectResponse
         $this[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_Realm)] = $realm;
     }
 
+    /**
+     * @param string $assoc_handle
+     * @return $this
+     */
     public function setAssocHandle($assoc_handle)
     {
         $this[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_AssocHandle)] = $assoc_handle;
+        return $this;
     }
 
+    /**
+     * @param string $signed
+     * @return $this
+     */
     public function setSigned($signed)
     {
         $this[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_Signed)] = $signed;
+        return $this;
     }
 
+    /**
+     * @return null|string
+     */
     public function getSig()
     {
         return $this[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_Sig)];
     }
 
+    /**
+     * @param string $sig
+     * @return $this
+     */
     public function setSig($sig)
     {
         $this[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_Sig)] = $sig;
+        return $this;
     }
 
+    /**
+     * @param string $invalidate_handle
+     * @return $this
+     */
     public function setInvalidateHandle($invalidate_handle)
     {
         $this[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_InvalidateHandle)] = $invalidate_handle;
+        return $this;
     }
 
 }
diff --git a/app/libs/OpenId/Responses/OpenIdResponse.php b/app/libs/OpenId/Responses/OpenIdResponse.php
new file mode 100644
index 00000000..54847449
--- /dev/null
+++ b/app/libs/OpenId/Responses/OpenIdResponse.php
@@ -0,0 +1,46 @@
+<?php namespace OpenId\Responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\OpenIdProtocol;
+use Utils\Http\HttpResponse;
+use OpenId\Exceptions\InvalidOpenIdMessageMode;
+use OpenId\Helpers\OpenIdErrorMessages;
+/**
+ * Class OpenIdResponse
+ * @package OpenId\Responses
+ */
+abstract class OpenIdResponse extends HttpResponse
+{
+
+    /**
+     * OpenIdResponse constructor.
+     * @param int $http_code
+     * @param string $content_type
+     */
+    public function __construct($http_code, $content_type)
+    {
+        parent::__construct($http_code, $content_type);
+    }
+
+    /**
+     * @param string $mode
+     * @throws InvalidOpenIdMessageMode
+     */
+    protected function setMode($mode)
+    {
+        if (!OpenIdProtocol::isValidMode($mode))
+            throw new InvalidOpenIdMessageMode(sprintf(OpenIdErrorMessages::InvalidOpenIdMessageModeMessage, $mode));
+        $this->container[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_Mode)] = $mode;;
+    }
+
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Responses/OpenIdUnencryptedAssociationSessionResponse.php b/app/libs/OpenId/Responses/OpenIdUnencryptedAssociationSessionResponse.php
new file mode 100644
index 00000000..a980d64b
--- /dev/null
+++ b/app/libs/OpenId/Responses/OpenIdUnencryptedAssociationSessionResponse.php
@@ -0,0 +1,34 @@
+<?php namespace OpenId\Responses;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\OpenIdProtocol;
+/**
+ * Class OpenIdUnencryptedAssociationSessionResponse
+ * @package OpenId\Responses
+ */
+class OpenIdUnencryptedAssociationSessionResponse extends OpenIdAssociationSessionResponse
+{
+
+    /**
+     * @param string $assoc_handle
+     * @param string $session_type
+     * @param string $assoc_type
+     * @param int $expires_in
+     * @param string $secret
+     */
+    public function __construct($assoc_handle, $session_type, $assoc_type, $expires_in, $secret)
+    {
+        parent::__construct($assoc_handle, $session_type, $assoc_type, $expires_in);
+        $this[OpenIdProtocol::OpenIdProtocol_MacKey] = base64_encode($secret);
+    }
+} 
\ No newline at end of file
diff --git a/app/libs/OpenId/Services/IAssociationService.php b/app/libs/OpenId/Services/IAssociationService.php
new file mode 100644
index 00000000..d00ec21a
--- /dev/null
+++ b/app/libs/OpenId/Services/IAssociationService.php
@@ -0,0 +1,46 @@
+<?php namespace OpenId\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Models\IAssociation;
+use OpenId\Exceptions\ReplayAttackException;
+use OpenId\Exceptions\OpenIdInvalidRealmException;
+/**
+ * Interface IAssociationService
+ * @package OpenId\Services
+ */
+interface IAssociationService
+{
+    /** gets a given association by handle, and if association exists and its type is private, then lock it
+     *  to prevent subsequent usage ( private association could be used once)
+     * @param $handle
+     * @param null $realm
+     * @return null|IAssociation
+     * @throws ReplayAttackException
+     * @throws OpenIdInvalidRealmException
+     */
+    public function getAssociation($handle, $realm = null);
+
+	/**
+	 * @param IAssociation $association
+	 * @return IAssociation
+	 * @throws ReplayAttackException
+	 */
+	public function addAssociation(IAssociation $association);
+
+    /**
+     * @param $handle
+     * @return bool
+     */
+    public function deleteAssociation($handle);
+
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Services/IMementoOpenIdSerializerService.php b/app/libs/OpenId/Services/IMementoOpenIdSerializerService.php
new file mode 100644
index 00000000..207e10fb
--- /dev/null
+++ b/app/libs/OpenId/Services/IMementoOpenIdSerializerService.php
@@ -0,0 +1,41 @@
+<?php namespace OpenId\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Requests\OpenIdMessageMemento;
+/**
+ * Interface IMementoOpenIdSerializerService
+ * @package OpenId\Services
+ */
+interface IMementoOpenIdSerializerService {
+
+    /**
+     * @param OpenIdMessageMemento $memento
+     * @return void
+     */
+    public function serialize(OpenIdMessageMemento $memento);
+
+    /**
+     * @return OpenIdMessageMemento
+     */
+    public function load();
+
+    /**
+     * @return void
+     */
+    public function forget();
+
+    /**
+     * @return bool
+     */
+    public function exists();
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Services/INonceService.php b/app/libs/OpenId/Services/INonceService.php
new file mode 100644
index 00000000..06c4143b
--- /dev/null
+++ b/app/libs/OpenId/Services/INonceService.php
@@ -0,0 +1,56 @@
+<?php namespace OpenId\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Models\OpenIdNonce;
+/**
+ * Interface INonceService
+ * @package OpenId\Services
+ */
+interface INonceService {
+
+    /**
+     * @return OpenIdNonce
+     */
+    public function generateNonce();
+
+    /**
+     * @param OpenIdNonce $nonce
+     * @return $this
+     */
+    public function lockNonce(OpenIdNonce $nonce);
+
+    /**
+     * @param OpenIdNonce $nonce
+     * @return $this
+     */
+    public function unlockNonce(OpenIdNonce $nonce);
+
+    /**
+     * @param OpenIdNonce $nonce
+     * @param string $signature
+     * @param string $realm
+     * @return $this
+     */
+    public function associateNonce(OpenIdNonce $nonce, $signature, $realm);
+
+    /**
+     * To prevent replay attacks, the OP MUST NOT issue more than one verification response
+     * for each authentication response it had previously issued. An authentication response
+     * and its matching verification request may be identified by their "openid.response_nonce" values.
+     * @param OpenIdNonce $nonce
+     * @param string $signature
+     * @param string $realm
+     * @return $this
+     */
+    public function markNonceAsInvalid(OpenIdNonce $nonce, $signature, $realm);
+} 
\ No newline at end of file
diff --git a/app/libs/openid/services/IServerConfigurationService.php b/app/libs/OpenId/Services/IServerConfigurationService.php
similarity index 62%
rename from app/libs/openid/services/IServerConfigurationService.php
rename to app/libs/OpenId/Services/IServerConfigurationService.php
index 9ae5b721..ca0a9387 100644
--- a/app/libs/openid/services/IServerConfigurationService.php
+++ b/app/libs/OpenId/Services/IServerConfigurationService.php
@@ -1,21 +1,18 @@
-<?php
-
-namespace openid\services;
-
+<?php namespace OpenId\Services;
 /**
  * Interface IServerConfigurationService
- * @package openid\services
+ * @package OpenId\Services
  */
 interface IServerConfigurationService {
     /**
      *
-     * @return mixed
+     * @return string
      */
     public function getOPEndpointURL();
 
     /**
-     * @param $identifier
-     * @return mixed
+     * @param string $identifier
+     * @return string
      */
     public function getUserIdentityEndpointURL($identifier);
 
diff --git a/app/libs/openid/services/IServerExtensionsService.php b/app/libs/OpenId/Services/IServerExtensionsService.php
similarity index 56%
rename from app/libs/openid/services/IServerExtensionsService.php
rename to app/libs/OpenId/Services/IServerExtensionsService.php
index 876bf12f..028eeeef 100644
--- a/app/libs/openid/services/IServerExtensionsService.php
+++ b/app/libs/OpenId/Services/IServerExtensionsService.php
@@ -1,11 +1,11 @@
-<?php
-
-namespace openid\services;
-
+<?php namespace OpenId\Services;
 /**
  * Interface IServerExtensionsService
- * @package openid\services
+ * @package OpenId\Services
  */
 interface IServerExtensionsService {
+    /**
+     * @return mixed
+     */
     public function getAllActiveExtensions();
 }
\ No newline at end of file
diff --git a/app/libs/OpenId/Services/ITrustedSitesService.php b/app/libs/OpenId/Services/ITrustedSitesService.php
new file mode 100644
index 00000000..2837143b
--- /dev/null
+++ b/app/libs/OpenId/Services/ITrustedSitesService.php
@@ -0,0 +1,47 @@
+<?php namespace OpenId\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+use OpenId\Models\IOpenIdUser;
+use OpenId\Models\ITrustedSite;
+/**
+ * Interface ITrustedSitesService
+ * @package OpenId\Services
+ */
+interface ITrustedSitesService
+{
+    /**
+     * @param IOpenIdUser $user
+     * @param string $realm
+     * @param $policy
+     * @param array $data
+     * @return bool|ITrustedSite
+     * @throws Exception
+     */
+    public function addTrustedSite(IOpenIdUser $user, $realm, $policy, $data = array());
+
+    /**
+     * @param $id
+     * @return bool
+     */
+    public function delTrustedSite($id);
+
+    /**
+     * @param IOpenIdUser $user
+     * @param $realm
+     * @param array $data
+     * @return mixed
+     */
+    public function getTrustedSites(IOpenIdUser $user, $realm, $data = array());
+
+}
\ No newline at end of file
diff --git a/app/libs/OpenId/Services/IUserService.php b/app/libs/OpenId/Services/IUserService.php
new file mode 100644
index 00000000..21fe1ffb
--- /dev/null
+++ b/app/libs/OpenId/Services/IUserService.php
@@ -0,0 +1,83 @@
+<?php namespace OpenId\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Models\IOpenIdUser;
+use Models\Member;
+use Utils\Exceptions\EntityNotFoundException;
+
+/**
+ * Interface IUserService
+ * @package OpenId\Services
+ */
+interface IUserService
+{
+
+    /**
+     * @param Member $member
+     * @return IOpenIdUser
+     */
+    public function buildUser(Member $member);
+
+    /**
+     * @param int $user_id
+     * @return void
+     * @throws EntityNotFoundException
+     */
+    public function updateLastLoginDate($user_id);
+
+    /**
+     * @param int $user_id
+     * @return void
+     * @throws EntityNotFoundException
+     */
+    public function updateFailedLoginAttempts($user_id);
+
+    /**
+     * @param int $user_id
+     * @return void
+     * @throws EntityNotFoundException
+     */
+    public function lockUser($user_id);
+
+    /**
+     * @param $user_id
+     * @return void
+     * @throws EntityNotFoundException
+     */
+    public function unlockUser($user_id);
+
+    /**
+     * @param int $user_id
+     * @return void
+     * @throws EntityNotFoundException
+     */
+    public function activateUser($user_id);
+
+    /**
+     * @param int $user_id
+     * @return void
+     * @throws EntityNotFoundException
+     */
+    public function deActivateUser($user_id);
+
+    /**
+     * @param int $user_id
+     * @param bool $show_pic
+     * @param bool $show_full_name
+     * @param bool $show_email
+     * @return bool
+     * @throws EntityNotFoundException
+     */
+    public function saveProfileInfo($user_id, $show_pic, $show_full_name, $show_email);
+
+}
\ No newline at end of file
diff --git a/app/libs/openid/services/NonceUniqueIdentifierGenerator.php b/app/libs/OpenId/Services/NonceUniqueIdentifierGenerator.php
similarity index 56%
rename from app/libs/openid/services/NonceUniqueIdentifierGenerator.php
rename to app/libs/OpenId/Services/NonceUniqueIdentifierGenerator.php
index 79b21f39..a1ffd546 100644
--- a/app/libs/openid/services/NonceUniqueIdentifierGenerator.php
+++ b/app/libs/OpenId/Services/NonceUniqueIdentifierGenerator.php
@@ -1,26 +1,22 @@
-<?php
+<?php namespace OpenId\Services;
 /**
-* Copyright 2015 OpenStack Foundation
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-**/
-
-namespace openid\services;
-
-use utils\model\Identifier;
-use utils\services\UniqueIdentifierGenerator;
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Model\Identifier;
+use Utils\Services\UniqueIdentifierGenerator;
 use Zend\Math\Rand;
-
 /**
  * Class NonceUniqueIdentifierGenerator
- * @package openid\services
+ * @package OpenId\Services
  */
 final class NonceUniqueIdentifierGenerator extends UniqueIdentifierGenerator {
 
diff --git a/app/libs/OpenId/Services/OpenIdServiceCatalog.php b/app/libs/OpenId/Services/OpenIdServiceCatalog.php
new file mode 100644
index 00000000..d3eb96da
--- /dev/null
+++ b/app/libs/OpenId/Services/OpenIdServiceCatalog.php
@@ -0,0 +1,16 @@
+<?php namespace OpenId\Services;
+/**
+ * Class OpenIdServiceCatalog
+ * @package OpenId\Services;
+ */
+abstract class OpenIdServiceCatalog
+{
+    const MementoSerializerService   = \OpenId\Services\IMementoOpenIdSerializerService::class;
+    const AuthenticationStrategy     = \OpenId\Handlers\IOpenIdAuthenticationStrategy::class;
+    const ServerExtensionsService    = \OpenId\Services\IServerExtensionsService::class;
+    const AssociationService         = \OpenId\Services\IAssociationService::class;
+    const TrustedSitesService        = \OpenId\Services\ITrustedSitesService::class;
+    const ServerConfigurationService = \OpenId\Services\IServerConfigurationService::class;
+    const UserService                = \OpenId\Services\IUserService::class;
+    const NonceService               = \OpenId\Services\INonceService::class;
+}
\ No newline at end of file
diff --git a/app/libs/openid/strategies/OpenIdResponseStrategyFactoryMethod.php b/app/libs/OpenId/Strategies/OpenIdResponseStrategyFactoryMethod.php
similarity index 50%
rename from app/libs/openid/strategies/OpenIdResponseStrategyFactoryMethod.php
rename to app/libs/OpenId/Strategies/OpenIdResponseStrategyFactoryMethod.php
index e11156bb..53e5c6d0 100644
--- a/app/libs/openid/strategies/OpenIdResponseStrategyFactoryMethod.php
+++ b/app/libs/OpenId/Strategies/OpenIdResponseStrategyFactoryMethod.php
@@ -1,23 +1,32 @@
-<?php
-
-namespace openid\strategies;
-
-use openid\responses\OpenIdDirectResponse;
-use openid\responses\OpenIdIndirectResponse;
-use openid\responses\OpenIdResponse;
-use utils\IHttpResponseStrategy;
-use utils\services\ServiceLocator;
-
+<?php namespace OpenId\Strategies;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OpenId\Responses\OpenIdDirectResponse;
+use OpenId\Responses\OpenIdIndirectResponse;
+use OpenId\Responses\OpenIdResponse;
+use Utils\IHttpResponseStrategy;
+use Utils\Services\ServiceLocator;
+use Exception;
 /**
  * Class OpenIdResponseStrategyFactoryMethod
- * @package openid\strategies
+ * @package OpenId\Strategies
  */
 final class OpenIdResponseStrategyFactoryMethod
 {
     /**
      * @param OpenIdResponse $response
      * @return IHttpResponseStrategy
-     * @throws \Exception
+     * @throws Exception
      */
     public static function buildStrategy(OpenIdResponse $response)
     {
diff --git a/app/libs/openid/XRDS/XRDSDocumentBuilder.php b/app/libs/OpenId/Xrds/XRDSDocumentBuilder.php
similarity index 95%
rename from app/libs/openid/XRDS/XRDSDocumentBuilder.php
rename to app/libs/OpenId/Xrds/XRDSDocumentBuilder.php
index 7fa57e44..f44fe934 100644
--- a/app/libs/openid/XRDS/XRDSDocumentBuilder.php
+++ b/app/libs/OpenId/Xrds/XRDSDocumentBuilder.php
@@ -1,10 +1,8 @@
-<?php
-
-namespace openid\XRDS;
+<?php namespace OpenId\Xrds;
 
 /**
  * Class XRDSDocumentBuilder
- * @package openid\XRDS
+ * @package OpenId\Xrds
  */
 final class XRDSDocumentBuilder
 {
diff --git a/app/libs/openid/XRDS/XRDSService.php b/app/libs/OpenId/Xrds/XRDSService.php
similarity index 95%
rename from app/libs/openid/XRDS/XRDSService.php
rename to app/libs/OpenId/Xrds/XRDSService.php
index 407d2390..59c418c5 100644
--- a/app/libs/openid/XRDS/XRDSService.php
+++ b/app/libs/OpenId/Xrds/XRDSService.php
@@ -1,11 +1,9 @@
-<?php
-
-namespace openid\XRDS;
+<?php namespace OpenId\Xrds;
 
 /**
  * Class XRDSService
  * XRDS Service Element
- * @package openid\XRDS
+ * @package OpenId\Xrds
  */
 final class XRDSService
 {
diff --git a/app/config/packages/greggilbert/recaptcha/production/.gitkeep b/app/libs/Utils/.gitkeep
similarity index 100%
rename from app/config/packages/greggilbert/recaptcha/production/.gitkeep
rename to app/libs/Utils/.gitkeep
diff --git a/app/libs/utils/ArrayUtils.php b/app/libs/Utils/ArrayUtils.php
similarity index 90%
rename from app/libs/utils/ArrayUtils.php
rename to app/libs/Utils/ArrayUtils.php
index 7edcb3d0..f46d073b 100644
--- a/app/libs/utils/ArrayUtils.php
+++ b/app/libs/Utils/ArrayUtils.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Utils;
 /**
 * Copyright 2015 OpenStack Foundation
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,16 +11,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 **/
-
-namespace utils;
-
 /**
  * Class ArrayUtils
- * @package utils
+ * @package Utils
  */
 final class ArrayUtils
 {
-
     /**
      * @param array $single_array
      * @return array
@@ -35,6 +31,10 @@ final class ArrayUtils
         return $multi;
     }
 
+    /**
+     * @param array $single_array
+     * @return string
+     */
     static public function toJson(array $single_array)
     {
         return json_encode($single_array);
diff --git a/app/libs/utils/db/IBaseRepository.php b/app/libs/Utils/Db/IBaseRepository.php
similarity index 85%
rename from app/libs/utils/db/IBaseRepository.php
rename to app/libs/Utils/Db/IBaseRepository.php
index 63ec9d53..b060fd1d 100644
--- a/app/libs/utils/db/IBaseRepository.php
+++ b/app/libs/Utils/Db/IBaseRepository.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace Utils\Db;
 /**
- * Copyright 2015 Openstack Foundation
+ * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,13 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace utils\db;
-
-use utils\model\IEntity;
-
+use Utils\Model\IEntity;
 /**
  * Interface IBaseRepository
+ * @package Utils\Db
  */
 interface IBaseRepository
 {
@@ -28,11 +25,13 @@ interface IBaseRepository
     public function get($id);
 
     /**
-     * @param int $page_size
      * @param int $page_nbr
+     * @param int $page_size
+     * @param array $filters
+     * @param array $fields
      * @return mixed
      */
-    public function getAll($page_nbr = 1, $page_size = 10, array $filters = array(), array $fields = array('*'));
+    public function getAll($page_nbr = 1, $page_size = 10, array $filters = [], array $fields = ['*']);
 
     /**
      * @param IEntity $entity
diff --git a/app/libs/Utils/Db/ITransactionService.php b/app/libs/Utils/Db/ITransactionService.php
new file mode 100644
index 00000000..d555212e
--- /dev/null
+++ b/app/libs/Utils/Db/ITransactionService.php
@@ -0,0 +1,28 @@
+<?php namespace Utils\Db;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Closure;
+use Exception;
+/**
+ * Interface ITransactionService
+ * @package Utils\Db
+ */
+interface ITransactionService {
+	/**
+	 * Execute a Closure within a transaction.
+	 * @param  Closure  $callback
+	 * @return mixed
+	 * @throws Exception
+	 */
+	public function transaction(Closure $callback);
+} 
\ No newline at end of file
diff --git a/app/libs/utils/exceptions/ConfigurationException.php b/app/libs/Utils/Exceptions/ConfigurationException.php
similarity index 91%
rename from app/libs/utils/exceptions/ConfigurationException.php
rename to app/libs/Utils/Exceptions/ConfigurationException.php
index a614589d..45e07c33 100644
--- a/app/libs/utils/exceptions/ConfigurationException.php
+++ b/app/libs/Utils/Exceptions/ConfigurationException.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Utils\Exceptions;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,14 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace utils\exceptions;
-
 use Exception;
-
 /**
  * Class ConfigurationException
- * @package utils\exceptions
+ * @package Utils\Exceptions
  */
 final class ConfigurationException extends Exception
 {
diff --git a/app/libs/utils/exceptions/EntityNotFoundException.php b/app/libs/Utils/Exceptions/EntityNotFoundException.php
similarity index 91%
rename from app/libs/utils/exceptions/EntityNotFoundException.php
rename to app/libs/Utils/Exceptions/EntityNotFoundException.php
index f5ecb977..df1eb9a1 100644
--- a/app/libs/utils/exceptions/EntityNotFoundException.php
+++ b/app/libs/Utils/Exceptions/EntityNotFoundException.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Utils\Exceptions;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,13 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace utils\exceptions;
-
-
 /**
  * Class EntityNotFoundException
- * @package utils\exceptions
+ * @package Utils\Exceptions
  */
 final class EntityNotFoundException extends \Exception
 {
diff --git a/app/libs/Utils/Exceptions/UnacquiredLockException.php b/app/libs/Utils/Exceptions/UnacquiredLockException.php
new file mode 100644
index 00000000..efaf366d
--- /dev/null
+++ b/app/libs/Utils/Exceptions/UnacquiredLockException.php
@@ -0,0 +1,27 @@
+<?php namespace Utils\Exceptions;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+
+/**
+ * Class UnacquiredLockException
+ * @package Utils\Exceptions
+ */
+class UnacquiredLockException extends Exception {
+
+    public function __construct($message = "")
+    {
+        $message = "Unacquired Lock : " . $message;
+        parent::__construct($message, 0, null);
+    }
+}
\ No newline at end of file
diff --git a/app/libs/utils/http/HttpContentType.php b/app/libs/Utils/Http/HttpContentType.php
similarity index 95%
rename from app/libs/utils/http/HttpContentType.php
rename to app/libs/Utils/Http/HttpContentType.php
index fcbddacf..a7ee4105 100644
--- a/app/libs/utils/http/HttpContentType.php
+++ b/app/libs/Utils/Http/HttpContentType.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Utils\Http;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,12 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-namespace utils\http;
-
 /**
  * Class HttpContentType
- * @package utils\http
+ * @package Utils\Http
  */
 abstract class HttpContentType
 {
diff --git a/app/libs/utils/http/HttpMessage.php b/app/libs/Utils/Http/HttpMessage.php
similarity index 56%
rename from app/libs/utils/http/HttpMessage.php
rename to app/libs/Utils/Http/HttpMessage.php
index 3287b12d..d2894ccd 100644
--- a/app/libs/utils/http/HttpMessage.php
+++ b/app/libs/Utils/Http/HttpMessage.php
@@ -1,16 +1,31 @@
-<?php
-
-namespace utils\http;
-
-use utils\IPHelper;
-
+<?php namespace Utils\Http;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\IPHelper;
+use ArrayAccess;
 /**
  * Class HttpMessage
- * @package utils\http
+ * @package Utils\Http
  */
-class HttpMessage implements \ArrayAccess
+class HttpMessage implements ArrayAccess
 {
 
+    /**
+     * http://php.net/manual/en/language.variables.external.php
+     * Dots and spaces in variable names are converted to underscores.
+     * For example <input name="a.b" /> becomes $_REQUEST["a_b"].
+     */
+    const PHP_REQUEST_VAR_SEPARATOR = "_";
     /**
      * @var array
      */
diff --git a/app/libs/utils/http/HttpResponse.php b/app/libs/Utils/Http/HttpResponse.php
similarity index 59%
rename from app/libs/utils/http/HttpResponse.php
rename to app/libs/Utils/Http/HttpResponse.php
index 8e03ba10..509dc576 100644
--- a/app/libs/utils/http/HttpResponse.php
+++ b/app/libs/Utils/Http/HttpResponse.php
@@ -1,19 +1,26 @@
-<?php
-
-namespace utils\http;
-
+<?php namespace Utils\Http;
 /**
  * Class HttpResponse
- * @package utils\http
+ * @package Utils\Http
  */
 abstract class HttpResponse extends HttpMessage
 {
     const HttpOkResponse = 200;
     const HttpErrorResponse = 400;
-
+    /**
+     * @var int
+     */
     protected $http_code;
+    /**
+     * @var string
+     */
     protected $content_type;
 
+    /**
+     * HttpResponse constructor.
+     * @param int $http_code
+     * @param string $content_type
+     */
     public function __construct($http_code, $content_type)
     {
         $this->http_code    = $http_code;
@@ -22,25 +29,45 @@ abstract class HttpResponse extends HttpMessage
 
     abstract public function getContent();
 
+    /**
+     * @return int
+     */
     public function getHttpCode()
     {
         return $this->http_code;
     }
 
+    /**
+     * @param int $http_code
+     * @return $this;
+     */
     protected function setHttpCode($http_code)
     {
         $this->http_code = $http_code;
+        return $this;
     }
 
+    /**
+     * @return string
+     */
     public function getContentType()
     {
         return $this->content_type;
     }
 
+    /**
+     * @return mixed
+     */
     abstract public function getType();
 
+    /**
+     * @param string $name
+     * @param mixed $value
+     * @return $this
+     */
     public function addParam($name, $value)
     {
         $this[$name] = $value;
+        return $this;
     }
 }
\ No newline at end of file
diff --git a/app/libs/utils/http/HttpUtils.php b/app/libs/Utils/Http/HttpUtils.php
similarity index 91%
rename from app/libs/utils/http/HttpUtils.php
rename to app/libs/Utils/Http/HttpUtils.php
index cfb77c40..ce5acc7d 100644
--- a/app/libs/utils/http/HttpUtils.php
+++ b/app/libs/Utils/Http/HttpUtils.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Utils\Http;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,11 +12,9 @@
  * limitations under the License.
  **/
 
-namespace utils\http;
-
 /**
  * Class HttpUtils
- * @package utils\http
+ * @package Utils\Http
  */
 final class HttpUtils
 {
@@ -38,6 +36,10 @@ final class HttpUtils
         return (strtolower($schema) === 'http' || self::isHttpsSchema($schema));
     }
 
+    /**
+     * @param string $schema
+     * @return bool
+     */
     public static function isHttpsSchema($schema){
         return (strtolower($schema) === 'https');
     }
diff --git a/app/libs/oauth2/services/IClienPublicKeyService.php b/app/libs/Utils/IHttpResponseStrategy.php
similarity index 69%
rename from app/libs/oauth2/services/IClienPublicKeyService.php
rename to app/libs/Utils/IHttpResponseStrategy.php
index e63af574..9b371ad7 100644
--- a/app/libs/oauth2/services/IClienPublicKeyService.php
+++ b/app/libs/Utils/IHttpResponseStrategy.php
@@ -1,6 +1,6 @@
-<?php
+<?php namespace Utils;
 /**
-* Copyright 2015 OpenStack Foundation
+* Copyright 2016 OpenStack Foundation
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
@@ -11,16 +11,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 **/
-
-namespace oauth2\services;
-
-use oauth2\models\IClientPublicKey;
-
 /**
- * Interface IClienPublicKeyService
- * @package oauth2\services
+ * Interface IHttpResponseStrategy
+ * Defines an interface to handle http responses
+ * @package Utils
  */
-interface IClienPublicKeyService extends IAssymetricKeyService
+interface IHttpResponseStrategy
 {
-
-}
\ No newline at end of file
+    public function handle($response);
+} 
\ No newline at end of file
diff --git a/app/libs/Utils/IPHelper.php b/app/libs/Utils/IPHelper.php
new file mode 100644
index 00000000..19858dcb
--- /dev/null
+++ b/app/libs/Utils/IPHelper.php
@@ -0,0 +1,30 @@
+<?php namespace Utils;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Request;
+/**
+ * Class IPHelper
+ * @package Utils
+ */
+class IPHelper
+{
+    /**
+     * returns user current ip address
+     * @return string
+     */
+    public static function getUserIp()
+    {
+        $remote_address = Request::server('REMOTE_ADDR');
+        return $remote_address;
+    }
+} 
\ No newline at end of file
diff --git a/app/libs/Utils/JsonUtils.php b/app/libs/Utils/JsonUtils.php
new file mode 100644
index 00000000..b020e7b3
--- /dev/null
+++ b/app/libs/Utils/JsonUtils.php
@@ -0,0 +1,73 @@
+<?php namespace Utils;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+/**
+ * Class JsonUtils
+ * @see http://json.org/
+ * @package Utils
+ */
+abstract class JsonUtils
+{
+    /**
+     * A string is a sequence of zero or more Unicode characters, wrapped in double quotes, using backslash escapes.
+     * A character is represented as a single character string. A string is very much like a C or Java string.
+     * @param string $value
+     * @return string
+     */
+    public static function toJsonString($value)
+    {
+        return $value;
+    }
+
+    /**
+     * @param string $value
+     * @return bool
+     */
+    public static function toJsonBoolean($value)
+    {
+        if(empty($value)) return false;
+        return boolval($value);
+    }
+
+    /**
+     * @param string $value
+     * @return int|null
+     */
+    public static function toJsonInt($value)
+    {
+        if(empty($value)) return null;
+        return intval($value);
+    }
+
+    /**
+     * @param string $value
+     * @return float|null
+     */
+    public static function toJsonFloat($value)
+    {
+        if(empty($value)) return null;
+        return floatval(number_format(floatval($value),2));
+    }
+
+    /**
+     * @param string $value
+     * @return int
+     */
+    public static function toEpoch($value)
+    {
+        if(empty($value)) return 0;
+        $datetime = new \DateTime($value);
+        return $datetime->getTimestamp();
+    }
+}
\ No newline at end of file
diff --git a/app/libs/Utils/MathUtils.php b/app/libs/Utils/MathUtils.php
new file mode 100644
index 00000000..91ce0a6e
--- /dev/null
+++ b/app/libs/Utils/MathUtils.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+namespace Utils;
+/**
+ * Class MathUtils
+ * @package Utils
+ */
+abstract class MathUtils
+{
+    /**
+     * @param $p
+     * @param $size
+     * @return bool
+     *
+     * @see http://docstore.mik.ua/orelly/webprog/pcook/ch04_26.htm
+     *
+     */
+    static public function nextPermutation($p, $size)
+    {
+        // slide down the array looking for where we're smaller than the next guy
+        for ($i = $size - 1; $i >= 0 && $p[$i] >= $p[$i + 1]; --$i) {}
+
+        // if this doesn't occur, we've finished our permutations
+        // the array is reversed: (1, 2, 3, 4) => (4, 3, 2, 1)
+        if ($i == -1)
+        {
+            return false;
+        }
+
+        // slide down the array looking for a bigger number than what we found before
+        for ($j = $size; $p[$j] <= $p[$i]; --$j) {}
+
+        // swap them
+        $tmp   = $p[$i];
+        $p[$i] = $p[$j];
+        $p[$j] = $tmp;
+
+        // now reverse the elements in between by swapping the ends
+        for (++$i, $j = $size; $i < $j; ++$i, --$j)
+        {
+            $tmp = $p[$i];
+            $p[$i] = $p[$j];
+            $p[$j] = $tmp;
+        }
+
+        return $p;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/Utils/Model/BaseModelEloquent.php b/app/libs/Utils/Model/BaseModelEloquent.php
new file mode 100644
index 00000000..0329d934
--- /dev/null
+++ b/app/libs/Utils/Model/BaseModelEloquent.php
@@ -0,0 +1,208 @@
+<?php namespace Utils\Model;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Illuminate\Database\Eloquent\Model;
+use Utils\JsonUtils;
+use ReflectionClass;
+/**
+ * Class BaseModelEloquent
+ * @package Utils\Model
+ */
+class BaseModelEloquent extends Model implements IEntity
+{
+
+    private $class = null;
+
+    protected $array_mappings = array();
+
+    /**
+     * @param $query
+     * @param array $filters
+     * @return mixed
+     */
+    public function scopeFilter($query, array $filters)
+    {
+        foreach ($filters as $filter) {
+            if(isset($filter['raw']))
+                $query = $query->whereRaw($filter['raw']);
+            else
+                $query = $query->where($filter['name'], $filter['op'], $filter['value']);
+        }
+        return $query;
+    }
+
+    public function __construct($attributes = array())
+    {
+        parent::__construct($attributes);
+        $this->class = new ReflectionClass(get_class($this));
+        if ($this->useSti()) {
+            $this->setAttribute($this->stiClassField, $this->class->getShortName());
+        }
+    }
+
+    public function toArray()
+    {
+        $values = parent::toArray();
+
+        if (count($this->array_mappings)) {
+            $new_values = array();
+            foreach ($this->array_mappings as $old_key => $new_key) {
+                $value = isset($values[$old_key])? $values[$old_key] :
+                    (
+                    isset($values['pivot'])? (
+                    isset($values['pivot'][$old_key]) ? $values['pivot'][$old_key] : null
+                    ): null
+                    );
+
+                $new_key = preg_split('/:/',$new_key);
+                if(count($new_key) > 1)
+                {
+                    //we have a formatter ...
+                    switch(strtolower($new_key[1]))
+                    {
+                        case 'datetime_epoch':
+                        {
+                            if(!is_null($value)) {
+                                $datetime = new \DateTime($value);
+                                $value = $datetime->getTimestamp();
+                            }
+                        }
+                            break;
+                        case 'json_string':
+                        {
+                            $value = JsonUtils::toJsonString($value);
+                        }
+                            break;
+                        case 'json_boolean':
+                        {
+                            $value = JsonUtils::toJsonBoolean($value);
+                        }
+                            break;
+                        case 'json_int':
+                        {
+                            $value = JsonUtils::toJsonInt($value);
+                        }
+                            break;
+                        case 'json_float':
+                        {
+                            $value = JsonUtils::toJsonFloat($value);
+                        }
+                            break;
+                    }
+                }
+                $new_values[$new_key[0]] = $value;
+            }
+            $values = $new_values;
+        }
+
+        return $values;
+    }
+
+    private function useSti()
+    {
+        return ($this->stiClassField && $this->stiBaseClass);
+    }
+
+    private function useMti()
+    {
+        return $this->mtiClassType;
+    }
+
+    public function newQuery($excludeDeleted = true)
+    {
+        $builder = parent::newQuery($excludeDeleted);
+        // If I am using STI, and I am not the base class,
+        // then filter on the class name.
+        if ($this->useMti()) {
+            $query              = $builder->getQuery();
+            $class              = $this->class->getName();
+            $parents            = $this->get_class_lineage(new $class);
+            $base_table_set     = false;
+            $current_class_name = null;
+
+            if ($this->mtiClassType === 'concrete') {
+                $current_class_name = $this->class->getShortName();
+                $query = $query->from($current_class_name);
+                $base_table_set = true;
+            }
+
+            foreach ($parents as $parent) {
+
+                if(!$this->isAllowedParent($parent))
+                {
+                    continue;
+                }
+
+                $parent = new $parent;
+                if ($parent->mtiClassType === 'abstract') {
+                    continue;
+                }
+
+                $table_name = $parent->class->getShortName();
+
+                if ($base_table_set === true) {
+                    $query->leftJoin($table_name, $current_class_name . '.ID', '=', $table_name . '.ID');
+                } else {
+                    $query = $query->from($table_name);
+                    $base_table_set = true;
+                    $current_class_name = $table_name;
+                }
+            }
+
+        } else {
+            if ($this->useSti() && $this->stiBaseClass !== get_class($this)) {
+                $builder->where($this->stiClassField, "=", $this->class->getShortName());
+            }
+        }
+
+        return $builder;
+    }
+
+    protected function isAllowedParent($parent_name)
+    {
+        $res = str_contains($parent_name, $this->class->getName()) ||
+            str_contains($parent_name, Model::class) ||
+            str_contains($parent_name, BaseModelEloquent::class);
+        return !$res;
+    }
+
+    private function get_class_lineage($object)
+    {
+        $class_name = get_class($object);
+        $parents = array_values(class_parents($class_name));
+
+        return array_merge(array($class_name), $parents);
+    }
+
+    public function newFromBuilder($attributes = array(), $connection = null)
+    {
+        if ($this->useSti() && $attributes->{$this->stiClassField}) {
+            $class = $this->class->getName();
+            $instance = new $class;
+            $instance->exists = true;
+            $instance->setRawAttributes((array)$attributes, true);
+
+            return $instance;
+        } else {
+            return parent::newFromBuilder($attributes, $connection);
+        }
+    }
+
+    /**
+     * @return int
+     */
+    public function getId()
+    {
+        return (int)$this->id;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/utils/model/IEntity.php b/app/libs/Utils/Model/IEntity.php
similarity index 92%
rename from app/libs/utils/model/IEntity.php
rename to app/libs/Utils/Model/IEntity.php
index bc98fedf..c7017750 100644
--- a/app/libs/utils/model/IEntity.php
+++ b/app/libs/Utils/Model/IEntity.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Utils\Model;
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,11 +12,9 @@
  * limitations under the License.
  **/
 
-namespace utils\model;
-
 /**
  * Interface IEntity
- * @package utils\model
+ * @package Utils\Model
  */
 interface IEntity
 {
@@ -24,5 +22,4 @@ interface IEntity
      * @return int
      */
     public function getId();
-
 }
\ No newline at end of file
diff --git a/app/libs/utils/model/Identifier.php b/app/libs/Utils/Model/Identifier.php
similarity index 94%
rename from app/libs/utils/model/Identifier.php
rename to app/libs/Utils/Model/Identifier.php
index 55b2a2cc..01ca275d 100644
--- a/app/libs/utils/model/Identifier.php
+++ b/app/libs/Utils/Model/Identifier.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Utils\Model;
 /**
 * Copyright 2015 OpenStack Foundation
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,14 +11,10 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 **/
-
-namespace utils\model;
-
-use utils\services\IdentifierGenerator;
-
+use Utils\Services\IdentifierGenerator;
 /**
  * Class Identifier
- * @package utils\model
+ * @package Utils\Model
  */
 abstract class Identifier
 {
diff --git a/app/libs/Utils/Model/SilverStripeBaseModel.php b/app/libs/Utils/Model/SilverStripeBaseModel.php
new file mode 100644
index 00000000..e9bc7caf
--- /dev/null
+++ b/app/libs/Utils/Model/SilverStripeBaseModel.php
@@ -0,0 +1,50 @@
+<?php namespace Utils\Model;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+/**
+ * Class SilverStripeBaseModel
+ * @package Utils\Model
+ */
+class SilverStripeBaseModel extends BaseModelEloquent
+{
+    protected $primaryKey ='ID';
+
+    protected $connection = 'ss';
+
+    protected $stiClassField = 'ClassName';
+
+    const CREATED_AT = 'Created';
+
+    const UPDATED_AT = 'LastEdited';
+
+    protected function isAllowedParent($parent_name)
+    {
+        $res = parent::isAllowedParent($parent_name);
+        if(!$res) return false;
+        return !(str_contains($parent_name, 'SilverstripeBaseModel'));
+    }
+
+    public function __construct($attributes = array())
+    {
+        parent::__construct($attributes);
+        $this->ClassName = $this->table;
+    }
+
+    /**
+     * @return int
+     */
+    public function getId()
+    {
+        return (int)$this->ID;
+    }
+}
\ No newline at end of file
diff --git a/app/libs/utils/services/IAuthService.php b/app/libs/Utils/Services/IAuthService.php
similarity index 74%
rename from app/libs/utils/services/IAuthService.php
rename to app/libs/Utils/Services/IAuthService.php
index c332a3ea..e05ea6a9 100644
--- a/app/libs/utils/services/IAuthService.php
+++ b/app/libs/Utils/Services/IAuthService.php
@@ -1,13 +1,20 @@
-<?php
-
-namespace utils\services;
-
-use oauth2\models\IClient;
-use openid\model\IOpenIdUser;
-
+<?php namespace Utils\Services;
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use OAuth2\Models\IClient;
+use OpenId\Models\IOpenIdUser;
 /**
  * Interface IAuthService
- * @package utils\services
  */
 interface IAuthService
 {
@@ -35,9 +42,9 @@ interface IAuthService
     public function getCurrentUser();
 
     /**
-     * @param $username
-     * @param $password
-     * @param $remember_me
+     * @param string $username
+     * @param string $password
+     * @param bool $remember_me
      * @return mixed
      */
     public function login($username, $password, $remember_me);
diff --git a/app/libs/utils/services/IBannedIPService.php b/app/libs/Utils/Services/IBannedIPService.php
similarity index 84%
rename from app/libs/utils/services/IBannedIPService.php
rename to app/libs/Utils/Services/IBannedIPService.php
index a87bcb4b..2b140510 100644
--- a/app/libs/utils/services/IBannedIPService.php
+++ b/app/libs/Utils/Services/IBannedIPService.php
@@ -1,10 +1,8 @@
-<?php
-
-namespace utils\services;
+<?php namespace Utils\Services;
 
 /**
  * Interface IBannedIPService
- * @package utils\services
+ * @package Utils\Services
  */
 interface IBannedIPService {
 
diff --git a/app/libs/utils/services/ICacheService.php b/app/libs/Utils/Services/ICacheService.php
similarity index 96%
rename from app/libs/utils/services/ICacheService.php
rename to app/libs/Utils/Services/ICacheService.php
index abbb3069..503d949b 100644
--- a/app/libs/utils/services/ICacheService.php
+++ b/app/libs/Utils/Services/ICacheService.php
@@ -1,10 +1,8 @@
-<?php
-
-namespace utils\services;
+<?php namespace Utils\Services;
 
 /**
  * Interface ICacheService
- * @package utils\services
+ * @package Utils\Services
  */
 interface ICacheService {
 
diff --git a/app/libs/Utils/Services/ICheckPointService.php b/app/libs/Utils/Services/ICheckPointService.php
new file mode 100644
index 00000000..cbe8d2a5
--- /dev/null
+++ b/app/libs/Utils/Services/ICheckPointService.php
@@ -0,0 +1,41 @@
+<?php namespace Utils\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Interface ICheckPointService
+ * Defines the contract to implement Checkpoint Pattern
+ * depicted on Architectural Patterns for Enabling Application Security - Yoder/Barcalow
+ * @package Utils\Services
+ */
+interface ICheckPointService {
+
+    /**
+     * Check available securities policies
+     * @return boolean
+     */
+    public function check();
+
+    /**
+     * Keeps track of exceptions
+     * @param Exception $ex
+     * @return mixed
+     */
+    public function trackException(Exception $ex);
+
+    /**
+     * @param ISecurityPolicy $policy
+     * @return $this
+     */
+    public function addPolicy(ISecurityPolicy $policy);
+} 
\ No newline at end of file
diff --git a/app/libs/Utils/Services/ILockManagerService.php b/app/libs/Utils/Services/ILockManagerService.php
new file mode 100644
index 00000000..d9e85f61
--- /dev/null
+++ b/app/libs/Utils/Services/ILockManagerService.php
@@ -0,0 +1,42 @@
+<?php namespace Utils\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Exceptions\UnacquiredLockException;
+use Closure;
+/**
+ * Interface ILockManagerService
+ * @package Utils\Services
+ */
+interface ILockManagerService {
+    /**
+     * @param string $name
+     * @param int $lifetime
+     * @throws UnacquiredLockException
+     * @return mixed
+     */
+    public function acquireLock($name,$lifetime = 3600);
+
+    /**
+     * @param  string $name
+     * @return mixed
+     */
+    public function releaseLock($name);
+
+    /**
+     * @param string $name
+     * @param Closure $callback
+     * @param int $lifetime
+     * @return mixed
+     */
+    public function lock($name, Closure $callback, $lifetime = 3600);
+}
\ No newline at end of file
diff --git a/app/libs/Utils/Services/ILogService.php b/app/libs/Utils/Services/ILogService.php
new file mode 100644
index 00000000..48edfbef
--- /dev/null
+++ b/app/libs/Utils/Services/ILogService.php
@@ -0,0 +1,32 @@
+<?php namespace Utils\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+/**
+ * Interface ILogService
+ * @package Utils\Services
+ */
+interface ILogService {
+
+    public function error(Exception $exception);
+
+    public function warning(Exception $exception);
+
+    public function warning_msg($msg);
+
+    public function error_msg($msg);
+
+    public function info(Exception $exception);
+
+    public function debug_msg($msg);
+}
\ No newline at end of file
diff --git a/app/libs/Utils/Services/ISecurityPolicy.php b/app/libs/Utils/Services/ISecurityPolicy.php
new file mode 100644
index 00000000..4374ec5b
--- /dev/null
+++ b/app/libs/Utils/Services/ISecurityPolicy.php
@@ -0,0 +1,42 @@
+<?php namespace Utils\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Exception;
+
+/**
+ * Interface ISecurityPolicy
+ * implements Checkpoint Pattern
+ * depicted on Architectural Patterns for Enabling Application Security - Yoder/Barcalow
+ * Defines contract for a generic security policy
+ * @package Utils\Services
+ */
+interface ISecurityPolicy {
+    /**
+     * Check if current security policy is meet or not
+     * @return boolean
+     */
+    public function check();
+
+    /**
+     * Apply security policy on a exception
+     * @param Exception $ex
+     * @return $this
+     */
+    public function apply(Exception $ex);
+
+    /**
+     * @param ISecurityPolicyCounterMeasure $counter_measure
+     * @return $this
+     */
+    public function setCounterMeasure(ISecurityPolicyCounterMeasure $counter_measure);
+} 
\ No newline at end of file
diff --git a/app/libs/utils/services/ISecurityPolicyCounterMeasure.php b/app/libs/Utils/Services/ISecurityPolicyCounterMeasure.php
similarity index 72%
rename from app/libs/utils/services/ISecurityPolicyCounterMeasure.php
rename to app/libs/Utils/Services/ISecurityPolicyCounterMeasure.php
index cd059702..b92e622e 100644
--- a/app/libs/utils/services/ISecurityPolicyCounterMeasure.php
+++ b/app/libs/Utils/Services/ISecurityPolicyCounterMeasure.php
@@ -1,15 +1,17 @@
-<?php
-
-namespace utils\services;
+<?php namespace Utils\Services;
 
 /**
  * Interface ISecurityPolicyCounterMeasure
  * implements Checkpoint Pattern
  * depicted on Architectural Patterns for Enabling Application Security - Yoder/Barcalow
  * Defines contract for a custom Security Policy Counter measure
- * @package services
+ * @package Utils\Services
  */
 interface ISecurityPolicyCounterMeasure
 {
+    /**
+     * @param array $params
+     * @return $this
+     */
     public function trigger(array $params = array());
 } 
\ No newline at end of file
diff --git a/app/libs/utils/services/IServerConfigurationService.php b/app/libs/Utils/Services/IServerConfigurationService.php
similarity index 69%
rename from app/libs/utils/services/IServerConfigurationService.php
rename to app/libs/Utils/Services/IServerConfigurationService.php
index 90de6745..980979c8 100644
--- a/app/libs/utils/services/IServerConfigurationService.php
+++ b/app/libs/Utils/Services/IServerConfigurationService.php
@@ -1,10 +1,8 @@
-<?php
-
-namespace utils\services;
+<?php namespace Utils\Services;
 
 /**
  * Interface IServerConfigurationService
- * @package utils\services
+ * @package Utils\Services
  */
 interface IServerConfigurationService {
     /**
@@ -14,8 +12,16 @@ interface IServerConfigurationService {
      */
     public function getConfigValue($key);
 
+    /**
+     * @return mixed
+     */
     public function getAllConfigValues();
 
+    /**
+     * @param $key
+     * @param $value
+     * @return mixed
+     */
     public function saveConfigValue($key,$value);
 
     /**
diff --git a/app/libs/Utils/Services/IdentifierGenerator.php b/app/libs/Utils/Services/IdentifierGenerator.php
new file mode 100644
index 00000000..d0073ac3
--- /dev/null
+++ b/app/libs/Utils/Services/IdentifierGenerator.php
@@ -0,0 +1,26 @@
+<?php namespace Utils\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Model\Identifier;
+/**
+ * Interface IdentifierGenerator
+ * @package Utils\Model
+ */
+interface IdentifierGenerator {
+
+    /**
+     * @param Identifier $identifier
+     * @return Identifier
+     */
+    public function generate(Identifier $identifier);
+}
\ No newline at end of file
diff --git a/app/libs/Utils/Services/ServiceLocator.php b/app/libs/Utils/Services/ServiceLocator.php
new file mode 100644
index 00000000..6bcf4b7f
--- /dev/null
+++ b/app/libs/Utils/Services/ServiceLocator.php
@@ -0,0 +1,57 @@
+<?php namespace Utils\Services;
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use App;
+
+/**
+ * Class ServiceLocator
+ * @package Utils\Services
+ */
+final class ServiceLocator
+{
+    /**
+     * @var ServiceLocator
+     */
+    private static $instance = null;
+
+    private function __construct()
+    {
+    }
+
+    /**
+     * @return null|ServiceLocator
+     */
+    public static function getInstance()
+    {
+        if (self::$instance == null)
+        {
+            self::$instance = new ServiceLocator();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * @param $service_id
+     * @return mixed
+     */
+    public function getService($service_id)
+    {
+        $service =  App::make($service_id);
+        return $service;
+    }
+
+    private function __clone()
+    {
+    }
+}
\ No newline at end of file
diff --git a/app/libs/utils/services/UniqueIdentifierGenerator.php b/app/libs/Utils/Services/UniqueIdentifierGenerator.php
similarity index 58%
rename from app/libs/utils/services/UniqueIdentifierGenerator.php
rename to app/libs/Utils/Services/UniqueIdentifierGenerator.php
index eab6ad3d..d2fbe9e1 100644
--- a/app/libs/utils/services/UniqueIdentifierGenerator.php
+++ b/app/libs/Utils/Services/UniqueIdentifierGenerator.php
@@ -1,25 +1,22 @@
-<?php
+<?php namespace Utils\Services;
 /**
-* Copyright 2015 OpenStack Foundation
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-**/
-
-namespace utils\services;
-
-use utils\model\Identifier;
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Utils\Model\Identifier;
 use Zend\Crypt\Hash;
 
 /**
  * Class UniqueIdentifierGenerator
- * @package utils\services
+ * @package Utils\Services
  */
 abstract class UniqueIdentifierGenerator implements IdentifierGenerator
 {
diff --git a/app/libs/Utils/Services/UtilsServiceCatalog.php b/app/libs/Utils/Services/UtilsServiceCatalog.php
new file mode 100644
index 00000000..7bdd545b
--- /dev/null
+++ b/app/libs/Utils/Services/UtilsServiceCatalog.php
@@ -0,0 +1,16 @@
+<?php namespace Utils\Services;
+
+/**
+ * Class UtilsServiceCatalog
+ * @package Utils\Utils
+ */
+abstract class UtilsServiceCatalog {
+    const CheckPointService          = \Utils\Services\ICheckPointService::class;
+    const LogService                 = \Utils\Services\ILogService::class;
+    const AuthenticationService      = \Utils\Services\IAuthService::class;
+    const LockManagerService         = \Utils\Services\ILockManagerService::class;
+    const ServerConfigurationService = \Utils\Services\IServerConfigurationService::class;
+    const CacheService               = \Utils\Services\ICacheService::class;
+    const BannedIpService            = \Utils\Services\IBannedIPService::class;
+    const TransactionService         = \Utils\Db\ITransactionService::class;
+} 
\ No newline at end of file
diff --git a/app/libs/auth/AuthenticationExtensionService.php b/app/libs/auth/AuthenticationExtensionService.php
deleted file mode 100644
index 933ab5ce..00000000
--- a/app/libs/auth/AuthenticationExtensionService.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace auth;
-
-/**
- * Class AuthenticationExtensionService
- * @package auth
- */
-class AuthenticationExtensionService implements IAuthenticationExtensionService {
-
-    private $extensions;
-
-    public function __construct(){
-        $this->extensions = array();
-    }
-    /**
-     * @return array
-     */
-    public function getExtensions()
-    {
-        return $this->extensions;
-    }
-
-    /**
-     * @param IAuthenticationExtension $extension
-     * @return bool
-     */
-    public function addExtension(IAuthenticationExtension $extension)
-    {
-       array_push($this->extensions, $extension);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/auth/AuthenticationServiceProvider.php b/app/libs/auth/AuthenticationServiceProvider.php
deleted file mode 100644
index 384f5058..00000000
--- a/app/libs/auth/AuthenticationServiceProvider.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace auth;
-
-use App;
-use Illuminate\Support\ServiceProvider;
-use utils\services\UtilsServiceCatalog;
-
-/**
- * Class AuthenticationServiceProvider
- * @package auth
- */
-final class AuthenticationServiceProvider extends ServiceProvider
-{
-
-    public function boot()
-    {
-    }
-
-    public function register()
-    {
-        App::singleton(UtilsServiceCatalog::AuthenticationService, 'auth\\AuthService');
-        App::singleton('auth\\IAuthenticationExtensionService', 'auth\\AuthenticationExtensionService');
-        App::singleton('auth\\IUserNameGeneratorService','auth\\UserNameGeneratorService');
-    }
-
-    public function provides()
-    {
-        return array('Authentication.services');
-    }
-}
\ No newline at end of file
diff --git a/app/libs/auth/IAuthenticationExtension.php b/app/libs/auth/IAuthenticationExtension.php
deleted file mode 100644
index abc892af..00000000
--- a/app/libs/auth/IAuthenticationExtension.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace auth;
-
-
-interface IAuthenticationExtension {
-
-    public function process(User $user);
-} 
\ No newline at end of file
diff --git a/app/libs/auth/IMemberRepository.php b/app/libs/auth/IMemberRepository.php
deleted file mode 100644
index 7e6f68a3..00000000
--- a/app/libs/auth/IMemberRepository.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace auth;
-
-use Member;
-
-/**
- * Interface IMemberRepository
- * @package auth
- */
-interface IMemberRepository
-{
-    /**
-     * @param $id
-     * @return Member
-     */
-    public function get($id);
-
-    /**
-     * @param $email
-     * @return Member
-     */
-    public function getByEmail($email);
-} 
\ No newline at end of file
diff --git a/app/libs/auth/exceptions/AuthenticationException.php b/app/libs/auth/exceptions/AuthenticationException.php
deleted file mode 100644
index 3aab4f64..00000000
--- a/app/libs/auth/exceptions/AuthenticationException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace auth\exceptions;
-
-use Exception;
-
-class AuthenticationException extends Exception
-{
-
-    public function __construct($message = "")
-    {
-        $message = "Authentication Exception : " . $message;
-        parent::__construct($message, 0, null);
-    }
-
-}
\ No newline at end of file
diff --git a/app/libs/auth/exceptions/AuthenticationInvalidPasswordAttemptException.php b/app/libs/auth/exceptions/AuthenticationInvalidPasswordAttemptException.php
deleted file mode 100644
index a4c82563..00000000
--- a/app/libs/auth/exceptions/AuthenticationInvalidPasswordAttemptException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace auth\exceptions;
-
-use Exception;
-
-class AuthenticationInvalidPasswordAttemptException extends Exception
-{
-
-    private $identifier;
-
-    public function __construct($identifier,$message = "")
-    {
-        $message = "Invalid Password Attempt: " . $message;
-        $this->identifier = $identifier;
-        parent::__construct($message, 0, null);
-    }
-
-    public function getIdentifier(){
-        return $this->identifier;
-    }
-
-}
\ No newline at end of file
diff --git a/app/libs/auth/exceptions/AuthenticationLockedUserLoginAttempt.php b/app/libs/auth/exceptions/AuthenticationLockedUserLoginAttempt.php
deleted file mode 100644
index 65368c59..00000000
--- a/app/libs/auth/exceptions/AuthenticationLockedUserLoginAttempt.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace auth\exceptions;
-
-use Exception;
-
-class AuthenticationLockedUserLoginAttempt extends Exception
-{
-
-    private $identifier;
-
-    public function __construct($identifier,$message = "")
-    {
-        $message = "Locked User Login Attempt : " . $message;
-        $this->identifier = $identifier;
-        parent::__construct($message, 0, null);
-    }
-
-    public function getIdentifier(){
-        return $this->identifier;
-    }
-
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/.gitkeep b/app/libs/oauth2/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/libs/oauth2/OAuth2ServiceProvider.php b/app/libs/oauth2/OAuth2ServiceProvider.php
deleted file mode 100644
index 4a988fe7..00000000
--- a/app/libs/oauth2/OAuth2ServiceProvider.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace oauth2;
-
-use Illuminate\Support\ServiceProvider;
-use App;
-
-/**
- * Class OAuth2ServiceProvider
- * @package oauth2
- */
-class OAuth2ServiceProvider extends ServiceProvider
-{
-    public function boot()
-    {
-    }
-
-    public function register()
-    {
-        App::singleton('oauth2\IOAuth2Protocol', 'oauth2\OAuth2Protocol');
-    }
-
-    public function provides()
-    {
-        return array('oauth2');
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/endpoints/.gitkeep b/app/libs/oauth2/endpoints/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/libs/oauth2/endpoints/AuthorizationEndpoint.php b/app/libs/oauth2/endpoints/AuthorizationEndpoint.php
deleted file mode 100644
index b0f66cd7..00000000
--- a/app/libs/oauth2/endpoints/AuthorizationEndpoint.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace oauth2\endpoints;
-
-use oauth2\requests\OAuth2Request;
-use oauth2\exceptions\InvalidOAuth2Request;
-use oauth2\IOAuth2Protocol;
-
-/**
- * Class AuthorizationEndpoint
- * Authorization Endpoint Implementation
- * The authorization endpoint is used to interact with the resource
- * owner and obtain an authorization grant.  The authorization server
- * MUST first verify the identity of the resource owner.  The way in
- * which the authorization server authenticates the resource owner
- * (e.g., username and password login, session cookies) is beyond the
- * scope of this specification.
- * http://tools.ietf.org/html/rfc6749#section-3.1
- * @package oauth2\endpoints
- */
-class AuthorizationEndpoint implements IOAuth2Endpoint
-{
-
-    /**
-     * @var IOAuth2Protocol
-     */
-    private $protocol;
-
-    /**
-     * @param IOAuth2Protocol $protocol
-     */
-    public function __construct(IOAuth2Protocol $protocol)
-    {
-        $this->protocol = $protocol;
-    }
-
-    /**
-     * @param OAuth2Request $request
-     * @return mixed
-     * @throws \oauth2\exceptions\InvalidOAuth2Request
-     * @throws \oauth2\exceptions\InvalidClientException
-     * @throws \oauth2\exceptions\UriNotAllowedException
-     * @throws \oauth2\exceptions\ScopeNotAllowedException
-     * @throws \oauth2\exceptions\UnsupportedResponseTypeException
-     * @throws \oauth2\exceptions\UnAuthorizedClientException
-     * @throws \oauth2\exceptions\AccessDeniedException
-     * @throws \oauth2\exceptions\OAuth2GenericException
-     */
-    public function handle(OAuth2Request $request)
-    {
-        foreach($this->protocol->getAvailableGrants() as $key => $grant){
-            if($grant->canHandle($request))
-                return $grant->handle($request);
-        }
-        throw new InvalidOAuth2Request;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/endpoints/IOAuth2Endpoint.php b/app/libs/oauth2/endpoints/IOAuth2Endpoint.php
deleted file mode 100644
index e485a697..00000000
--- a/app/libs/oauth2/endpoints/IOAuth2Endpoint.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace oauth2\endpoints;
-
-use oauth2\requests\OAuth2Request;
-
-/**
- * Interface IOAuth2Endpoint
- * @package oauth2\endpoints
- */
-interface IOAuth2Endpoint
-{
-    /**
-     * @param OAuth2Request $request
-     * @return mixed
-     */
-    public function handle(OAuth2Request $request);
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/endpoints/TokenIntrospectionEndpoint.php b/app/libs/oauth2/endpoints/TokenIntrospectionEndpoint.php
deleted file mode 100644
index bb20e979..00000000
--- a/app/libs/oauth2/endpoints/TokenIntrospectionEndpoint.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace oauth2\endpoints;
-
-use oauth2\requests\OAuth2Request;
-use oauth2\IOAuth2Protocol;
-use oauth2\services\IClientService;
-use oauth2\services\ITokenService;
-use utils\services\IAuthService;
-use utils\services\ILogService;
-use oauth2\grant_types\ValidateBearerTokenGrantType;
-use oauth2\exceptions\InvalidOAuth2Request;
-
-/**
- * Class TokenIntrospectionEndpoint
- * @package oauth2\endpoints
- */
-class TokenIntrospectionEndpoint implements IOAuth2Endpoint
-{
-
-    /**
-     * @var IOAuth2Protocol
-     */
-    private $protocol;
-    /**
-     * @var ValidateBearerTokenGrantType
-     */
-    private $grant_type;
-
-    /**
-     * @param IOAuth2Protocol $protocol
-     * @param IClientService $client_service
-     * @param ITokenService $token_service
-     * @param IAuthService $auth_service
-     * @param ILogService $log_service
-     */
-    public function __construct
-    (
-        IOAuth2Protocol $protocol,
-        IClientService $client_service,
-        ITokenService $token_service,
-        IAuthService $auth_service,
-        ILogService $log_service
-    )
-    {
-        $this->protocol   = $protocol;
-        $this->grant_type = new ValidateBearerTokenGrantType($client_service, $token_service, $auth_service, $log_service);
-    }
-
-
-    /**
-     * @param OAuth2Request $request
-     * @return mixed|\oauth2\responses\OAuth2AccessTokenValidationResponse|void
-     * @throws InvalidOAuth2Request
-     * @throws \oauth2\exceptions\BearerTokenDisclosureAttemptException
-     * @throws \oauth2\exceptions\ExpiredAccessTokenException
-     * @throws \oauth2\exceptions\InvalidApplicationType
-     * @throws \oauth2\exceptions\InvalidOAuth2Request
-     * @throws \oauth2\exceptions\LockedClientException
-     */
-    public function handle(OAuth2Request $request)
-    {
-        if($this->grant_type->canHandle($request))
-        {
-            return $this->grant_type->completeFlow($request);
-        }
-        throw new InvalidOAuth2Request;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/endpoints/TokenRevocationEndpoint.php b/app/libs/oauth2/endpoints/TokenRevocationEndpoint.php
deleted file mode 100644
index b1ad29fb..00000000
--- a/app/libs/oauth2/endpoints/TokenRevocationEndpoint.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace oauth2\endpoints;
-
-use oauth2\exceptions\InvalidOAuth2Request;
-use oauth2\requests\OAuth2Request;
-use oauth2\IOAuth2Protocol;
-use oauth2\services\IClientService;
-use oauth2\services\ITokenService;
-use utils\services\ILogService;
-use oauth2\grant_types\RevokeBearerTokenGrantType;
-
-/**
- * Class TokenRevocationEndpoint
- * @package oauth2\endpoints
- */
-class TokenRevocationEndpoint implements IOAuth2Endpoint
-{
-
-    /**
-     * @var IOAuth2Protocol
-     */
-    private $protocol;
-    /**
-     * @var RevokeBearerTokenGrantType
-     */
-    private $grant_type;
-
-    /**
-     * @param IOAuth2Protocol $protocol
-     * @param IClientService $client_service
-     * @param ITokenService $token_service
-     * @param ILogService $log_service
-     */
-    public function __construct(
-        IOAuth2Protocol $protocol,
-        IClientService $client_service,
-        ITokenService $token_service,
-        ILogService $log_service
-    )
-    {
-        $this->protocol   = $protocol;
-        $this->grant_type = new RevokeBearerTokenGrantType($client_service, $token_service, $log_service);
-    }
-
-    /**
-     * @param OAuth2Request $request
-     * @return \oauth2\responses\OAuth2TokenRevocationResponse
-     * @throws InvalidOAuth2Request
-     * @throws \Exception
-     * @throws \oauth2\exceptions\BearerTokenDisclosureAttemptException
-     * @throws \oauth2\exceptions\ExpiredAccessTokenException
-     * @throws \oauth2\exceptions\UnAuthorizedClientException
-     */
-    public function handle(OAuth2Request $request)
-    {
-        if($this->grant_type->canHandle($request))
-        {
-            return $this->grant_type->completeFlow($request);
-        }
-        throw new InvalidOAuth2Request;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/AbsentClientException.php b/app/libs/oauth2/exceptions/AbsentClientException.php
deleted file mode 100644
index 693af292..00000000
--- a/app/libs/oauth2/exceptions/AbsentClientException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use Exception;
-
-class AbsentClientException extends Exception
-{
-
-    public function __construct($message = "")
-    {
-        $message = "Absent Client Exception: " . $message;
-        parent::__construct($message, 0, null);
-    }
-
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/AccessDeniedException.php b/app/libs/oauth2/exceptions/AccessDeniedException.php
deleted file mode 100644
index ad3d8a29..00000000
--- a/app/libs/oauth2/exceptions/AccessDeniedException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-/**
- * Class AccessDeniedException
- * @package oauth2\exceptions
- */
-final class AccessDeniedException extends OAuth2BaseException
-{
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_AccessDenied;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/AllowedClientUriAlreadyExistsException.php b/app/libs/oauth2/exceptions/AllowedClientUriAlreadyExistsException.php
deleted file mode 100644
index c11a93dc..00000000
--- a/app/libs/oauth2/exceptions/AllowedClientUriAlreadyExistsException.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-use Exception;
-
-class AllowedClientUriAlreadyExistsException extends Exception
-{
-
-    public function __construct($message = "")
-    {
-        $message = "Allowed Client Uri Already Exists : " . $message;
-        parent::__construct($message, 0, null);
-    }
-
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/BearerTokenDisclosureAttemptException.php b/app/libs/oauth2/exceptions/BearerTokenDisclosureAttemptException.php
deleted file mode 100644
index 69de625e..00000000
--- a/app/libs/oauth2/exceptions/BearerTokenDisclosureAttemptException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-/**
- * Class BearerTokenDisclosureAttemptException
- * @package oauth2\exceptions
- */
-final class BearerTokenDisclosureAttemptException extends OAuth2BaseException
-{
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return  OAuth2Protocol::OAuth2Protocol_Error_InvalidGrant;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/ExpiredAuthorizationCodeException.php b/app/libs/oauth2/exceptions/ExpiredAuthorizationCodeException.php
deleted file mode 100644
index 9dd8742e..00000000
--- a/app/libs/oauth2/exceptions/ExpiredAuthorizationCodeException.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use Exception;
-use oauth2\OAuth2Protocol;
-
-/**
- * Class ExpiredAuthorizationCodeException
- * @package oauth2\exceptions
- */
-final class ExpiredAuthorizationCodeException extends OAuth2BaseException
-{
-
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_InvalidRequest;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidAccessTokenException.php b/app/libs/oauth2/exceptions/InvalidAccessTokenException.php
deleted file mode 100644
index 8afef175..00000000
--- a/app/libs/oauth2/exceptions/InvalidAccessTokenException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-/**
- * Class InvalidAccessTokenException
- * @package oauth2\exceptions
- */
-final class InvalidAccessTokenException extends OAuth2BaseException
-{
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_InvalidGrant;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidAllowedClientUriException.php b/app/libs/oauth2/exceptions/InvalidAllowedClientUriException.php
deleted file mode 100644
index 1bf394bd..00000000
--- a/app/libs/oauth2/exceptions/InvalidAllowedClientUriException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-
-namespace oauth2\exceptions;
-
-use Exception;
-
-class InvalidAllowedClientUriException extends Exception {
-
-    public function __construct($message = "")
-    {
-        $message = "Invalid Allowed Client Uri : " . $message;
-        parent::__construct($message, 0, null);
-    }
-
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidApi.php b/app/libs/oauth2/exceptions/InvalidApi.php
deleted file mode 100644
index 0efcd6d5..00000000
--- a/app/libs/oauth2/exceptions/InvalidApi.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use Exception;
-
-class InvalidApi extends Exception
-{
-
-    public function __construct($message = "")
-    {
-        $message = "Invalid Api : " . $message;
-        parent::__construct($message, 0, null);
-    }
-
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidApiEndpoint.php b/app/libs/oauth2/exceptions/InvalidApiEndpoint.php
deleted file mode 100644
index b7e39966..00000000
--- a/app/libs/oauth2/exceptions/InvalidApiEndpoint.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-namespace oauth2\exceptions;
-
-use Exception;
-
-class InvalidApiEndpoint extends Exception
-{
-
-    public function __construct($message = "")
-    {
-        $message = "Invalid Api Endpoint : " . $message;
-        parent::__construct($message, 0, null);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidApiScope.php b/app/libs/oauth2/exceptions/InvalidApiScope.php
deleted file mode 100644
index 87efb715..00000000
--- a/app/libs/oauth2/exceptions/InvalidApiScope.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use Exception;
-
-class InvalidApiScope extends Exception
-{
-
-    public function __construct($message = "")
-{
-    $message = "Invalid Api Scope : " . $message;
-    parent::__construct($message, 0, null);
-}
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidApplicationType.php b/app/libs/oauth2/exceptions/InvalidApplicationType.php
deleted file mode 100644
index 3127f52c..00000000
--- a/app/libs/oauth2/exceptions/InvalidApplicationType.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-/**
- * Class InvalidApplicationType
- * @package oauth2\exceptions
- */
-final class InvalidApplicationType extends OAuth2BaseException
-{
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-       return OAuth2Protocol::OAuth2Protocol_Error_UnauthorizedClient;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidAuthorizationCodeException.php b/app/libs/oauth2/exceptions/InvalidAuthorizationCodeException.php
deleted file mode 100644
index 39ffdd7e..00000000
--- a/app/libs/oauth2/exceptions/InvalidAuthorizationCodeException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-/**
- * Class InvalidAuthorizationCodeException
- * @package oauth2\exceptions
- */
-final class InvalidAuthorizationCodeException extends OAuth2BaseException
-{
-
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_InvalidGrant;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidAuthorizationRequestException.php b/app/libs/oauth2/exceptions/InvalidAuthorizationRequestException.php
deleted file mode 100644
index 6078e50e..00000000
--- a/app/libs/oauth2/exceptions/InvalidAuthorizationRequestException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use Exception;
-
-class InvalidAuthorizationRequestException extends Exception
-{
-
-    public function __construct($message = "")
-    {
-        $message = "Invalid Authorization Request : " . $message;
-        parent::__construct($message, 0, null);
-    }
-
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidClientCredentials.php b/app/libs/oauth2/exceptions/InvalidClientCredentials.php
deleted file mode 100644
index 63bb078a..00000000
--- a/app/libs/oauth2/exceptions/InvalidClientCredentials.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-/**
- * Class InvalidClientCredentials
- * @package oauth2\exceptions
- */
-final class InvalidClientCredentials extends OAuth2BaseException
-{
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_UnauthorizedClient;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidClientException.php b/app/libs/oauth2/exceptions/InvalidClientException.php
deleted file mode 100644
index 607d5a64..00000000
--- a/app/libs/oauth2/exceptions/InvalidClientException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-/**
- * Class InvalidClientException
- * @package oauth2\exceptions
- */
-final class InvalidClientException extends OAuth2BaseException
-{
-
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_UnauthorizedClient;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidClientType.php b/app/libs/oauth2/exceptions/InvalidClientType.php
deleted file mode 100644
index 2035f61c..00000000
--- a/app/libs/oauth2/exceptions/InvalidClientType.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-/**
- * Class InvalidClientType
- * @package oauth2\exceptions
- */
-final class InvalidClientType extends OAuth2BaseException
-{
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_UnauthorizedClient;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidGrantTypeException.php b/app/libs/oauth2/exceptions/InvalidGrantTypeException.php
deleted file mode 100644
index 79d4c1a2..00000000
--- a/app/libs/oauth2/exceptions/InvalidGrantTypeException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-/**
- * Class InvalidGrantTypeException
- * @package oauth2\exceptions
- */
-final class InvalidGrantTypeException extends OAuth2BaseException
-{
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_InvalidGrant;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidOAuth2Request.php b/app/libs/oauth2/exceptions/InvalidOAuth2Request.php
deleted file mode 100644
index 05be843c..00000000
--- a/app/libs/oauth2/exceptions/InvalidOAuth2Request.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-/**
- * Class InvalidOAuth2Request
- * @package oauth2\exceptions
- */
-final class InvalidOAuth2Request extends OAuth2BaseException
-{
-
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_InvalidRequest;
-    }
-
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidRedeemAuthCodeException.php b/app/libs/oauth2/exceptions/InvalidRedeemAuthCodeException.php
deleted file mode 100644
index 1a983344..00000000
--- a/app/libs/oauth2/exceptions/InvalidRedeemAuthCodeException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-/**
- * Class InvalidRedeemAuthCodeException
- * @package oauth2\exceptions
- */
-final class InvalidRedeemAuthCodeException extends OAuth2BaseException
-{
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_InvalidGrant;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/InvalidResourceServer.php b/app/libs/oauth2/exceptions/InvalidResourceServer.php
deleted file mode 100644
index 6d951fac..00000000
--- a/app/libs/oauth2/exceptions/InvalidResourceServer.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use Exception;
-
-class InvalidResourceServer extends Exception{
-
-    public function __construct($message = "")
-    {
-        $message = "Invalid Resource Server : " . $message;
-        parent::__construct($message, 0, null);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/LockedClientException.php b/app/libs/oauth2/exceptions/LockedClientException.php
deleted file mode 100644
index e1383a81..00000000
--- a/app/libs/oauth2/exceptions/LockedClientException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-/**
- * Class LockedClientException
- * @package oauth2\exceptions
- */
-final class LockedClientException extends OAuth2BaseException
-{
-       /**
-     * @return string
-     */
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_UnauthorizedClient;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/MissingClientAuthorizationInfo.php b/app/libs/oauth2/exceptions/MissingClientAuthorizationInfo.php
deleted file mode 100644
index f4461c78..00000000
--- a/app/libs/oauth2/exceptions/MissingClientAuthorizationInfo.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use Exception;
-use oauth2\OAuth2Protocol;
-
-/**
- * Class MissingClientAuthorizationInfo
- * @package oauth2\exceptions
- */
-final class MissingClientAuthorizationInfo extends OAuth2BaseException
-{
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_UnauthorizedClient;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/MissingClientIdParam.php b/app/libs/oauth2/exceptions/MissingClientIdParam.php
deleted file mode 100644
index a1ac9b88..00000000
--- a/app/libs/oauth2/exceptions/MissingClientIdParam.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use Exception;
-use oauth2\OAuth2Protocol;
-
-/**
- * Class MissingClientIdParam
- * @package oauth2\exceptions
- */
-final class MissingClientIdParam extends OAuth2BaseException
-{
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_UnauthorizedClient;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/OAuth2ClientBaseException.php b/app/libs/oauth2/exceptions/OAuth2ClientBaseException.php
deleted file mode 100644
index 62b7e356..00000000
--- a/app/libs/oauth2/exceptions/OAuth2ClientBaseException.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use Exception;
-
-class OAuth2ClientBaseException  extends Exception
-{
-    protected $client_id;
-
-    public function __construct($client_id, $message = "")
-    {
-        $this->client_id = $client_id;
-        $message = "OAuth2 Client Base Exception : " . $message;
-        parent::__construct($message, 0, null);
-    }
-
-    public function getClientId(){
-        return $this->client_id;
-    }
-
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/OAuth2GenericException.php b/app/libs/oauth2/exceptions/OAuth2GenericException.php
deleted file mode 100644
index ebec91ea..00000000
--- a/app/libs/oauth2/exceptions/OAuth2GenericException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-/**
- * Class OAuth2GenericException
- * @package oauth2\exceptions
- */
-final class OAuth2GenericException extends OAuth2BaseException
-{
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_ServerError;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/OAuth2MissingBearerAccessTokenException.php b/app/libs/oauth2/exceptions/OAuth2MissingBearerAccessTokenException.php
deleted file mode 100644
index d4ab1d5c..00000000
--- a/app/libs/oauth2/exceptions/OAuth2MissingBearerAccessTokenException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use Exception;
-
-class OAuth2MissingBearerAccessTokenException  extends Exception
-{
-    public function __construct($message = "")
-    {
-        $message = "Missing Bearer Access Token : " . $message;
-        parent::__construct($message, 0, null);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/OAuth2ResourceServerException.php b/app/libs/oauth2/exceptions/OAuth2ResourceServerException.php
deleted file mode 100644
index 25085d3a..00000000
--- a/app/libs/oauth2/exceptions/OAuth2ResourceServerException.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use Exception;
-
-/**
- * Class OAuth2ResourceServerException
- * @package oauth2\exceptions
- */
-class OAuth2ResourceServerException  extends Exception
-{
-
-    /**
-     * @var string
-     */
-    private $http_code;
-    /**
-     * @var int
-     */
-    private $error;
-    /**
-     * @var Exception
-     */
-    private $error_description;
-    /**
-     * @var null
-     */
-    private $scope;
-
-    /**
-     * @param string $http_code
-     * @param int $error
-     * @param Exception $error_description
-     * @param null $scope
-     */
-    public function __construct($http_code,$error,$error_description,$scope = null)
-    {
-        $this->http_code = $http_code;
-        $this->error = $error;
-        $this->error_description = $error_description;
-        $this->scope = $scope;
-        $message = "Resource Server Exception : " . sprintf('http code : %s  - error : %s - error description: %s',$http_code,$error, $error_description);
-        parent::__construct($message, 0, null);
-    }
-
-    public function getError()
-    {
-        return $this->error;
-    }
-
-    public function getErrorDescription()
-    {
-        return $this->error_description;
-    }
-
-    public function getScope()
-    {
-        return $this->scope;
-    }
-
-    public function getHttpCode()
-    {
-        return $this->http_code;
-    }
-} 
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/ReplayAttackAuthCodeException.php b/app/libs/oauth2/exceptions/ReplayAttackAuthCodeException.php
deleted file mode 100644
index 4f490c32..00000000
--- a/app/libs/oauth2/exceptions/ReplayAttackAuthCodeException.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace libs\oauth2\exceptions;
-
-use oauth2\exceptions\ReplayAttackException;
-
-/**
- * Class ReplayAttackAuthCodeException
- * @package libs\oauth2\exceptions
- */
-final class ReplayAttackAuthCodeException extends ReplayAttackException
-{
-    /**
-     * ReplayAttackAuthCodeException constructor.
-     * @param null|string $auth_code
-     * @param null $description
-     */
-    public function __construct($auth_code, $description = null)
-    {
-        parent::__construct($auth_code, $description);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/ReplayAttackException.php b/app/libs/oauth2/exceptions/ReplayAttackException.php
deleted file mode 100644
index 9e070f83..00000000
--- a/app/libs/oauth2/exceptions/ReplayAttackException.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-/**
- * Class ReplayAttackException
- * @package oauth2\exceptions
- */
-class ReplayAttackException extends OAuth2BaseException
-{
-
-    /**
-     * ReplayAttackException constructor.
-     * @param null|string $token
-     * @param null $description
-     */
-    public function __construct($token, $description = null)
-    {
-        $this->token = $token;
-        parent::__construct($description);
-    }
-    /**
-     * @var string
-     */
-    private $token;
-
-    /**
-     * @return string
-     */
-    public function getToken()
-    {
-        return $this->token;
-    }
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-       return OAuth2Protocol::OAuth2Protocol_Error_InvalidGrant;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/ReplayAttackRefreshTokenException.php b/app/libs/oauth2/exceptions/ReplayAttackRefreshTokenException.php
deleted file mode 100644
index 5aa307ab..00000000
--- a/app/libs/oauth2/exceptions/ReplayAttackRefreshTokenException.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: smarcet
- * Date: 3/15/16
- * Time: 9:26 AM
- */
-
-namespace libs\oauth2\exceptions;
-
-use oauth2\exceptions\ReplayAttackException;
-
-/**
- * Class ReplayAttackRefreshTokenException
- * @package libs\oauth2\exceptions
- */
-final class ReplayAttackRefreshTokenException extends ReplayAttackException
-{
-    /**
-     * ReplayAttackAuthCodeException constructor.
-     * @param null|string $refresh_token
-     * @param null $description
-     */
-    public function __construct($refresh_token, $description = null)
-    {
-        parent::__construct($refresh_token, $description);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/ScopeNotAllowedException.php b/app/libs/oauth2/exceptions/ScopeNotAllowedException.php
deleted file mode 100644
index a513f4fd..00000000
--- a/app/libs/oauth2/exceptions/ScopeNotAllowedException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-/**
- * Class ScopeNotAllowedException
- * @package oauth2\exceptions
- */
-final class ScopeNotAllowedException extends OAuth2BaseException
-{
-
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_InvalidScope;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/UnAuthorizedClientException.php b/app/libs/oauth2/exceptions/UnAuthorizedClientException.php
deleted file mode 100644
index 59f9fab9..00000000
--- a/app/libs/oauth2/exceptions/UnAuthorizedClientException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-/**
- * Class UnAuthorizedClientException
- * @package oauth2\exceptions
- */
-final class UnAuthorizedClientException extends OAuth2BaseException
-{
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_UnauthorizedClient;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/UnsupportedResponseTypeException.php b/app/libs/oauth2/exceptions/UnsupportedResponseTypeException.php
deleted file mode 100644
index e199f04b..00000000
--- a/app/libs/oauth2/exceptions/UnsupportedResponseTypeException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use oauth2\OAuth2Protocol;
-
-/**
- * Class UnsupportedResponseTypeException
- * @package oauth2\exceptions
- */
-final class UnsupportedResponseTypeException extends OAuth2BaseException
-{
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_UnsupportedResponseType;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/UriNotAllowedException.php b/app/libs/oauth2/exceptions/UriNotAllowedException.php
deleted file mode 100644
index ab2f99bd..00000000
--- a/app/libs/oauth2/exceptions/UriNotAllowedException.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-use Exception;
-use oauth2\OAuth2Protocol;
-
-/**
- * Class UriNotAllowedException
- * @package oauth2\exceptions
- */
-class UriNotAllowedException extends OAuth2BaseException
-{
-
-    public function __construct($redirect_url = "")
-    {
-        $message = sprintf("The redirect URI in the request: %s did not match a registered redirect URI.",$redirect_url);
-        parent::__construct($message, 0, null);
-    }
-
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_RedirectUriMisMatch;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/exceptions/UseRefreshTokenException.php b/app/libs/oauth2/exceptions/UseRefreshTokenException.php
deleted file mode 100644
index 5d79c864..00000000
--- a/app/libs/oauth2/exceptions/UseRefreshTokenException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace oauth2\exceptions;
-
-
-use oauth2\OAuth2Protocol;
-
-/**
- * Class UseRefreshTokenException
- * @package oauth2\exceptions
- */
-class UseRefreshTokenException extends OAuth2BaseException
-{
-
-    public function getError()
-    {
-        return OAuth2Protocol::OAuth2Protocol_Error_InvalidGrant;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/factories/OAuth2AccessTokenResponseFactory.php b/app/libs/oauth2/factories/OAuth2AccessTokenResponseFactory.php
deleted file mode 100644
index 64c6cb4e..00000000
--- a/app/libs/oauth2/factories/OAuth2AccessTokenResponseFactory.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-namespace oauth2\factories;
-
-use oauth2\exceptions\InvalidOAuth2Request;
-use oauth2\models\AccessToken;
-use oauth2\models\AuthorizationCode;
-use oauth2\models\RefreshToken;
-use oauth2\OAuth2Protocol;
-use oauth2\requests\OAuth2AccessTokenRequestAuthCode;
-use oauth2\requests\OAuth2Request;
-use oauth2\responses\OAuth2AccessTokenResponse;
-use oauth2\responses\OAuth2IdTokenResponse;
-use oauth2\services\ITokenService;
-
-/**
- * Class OAuth2AccessTokenResponseFactory
- * @package oauth2\factories
- */
-final class OAuth2AccessTokenResponseFactory
-{
-
-    /**
-     * @param ITokenService $token_service
-     * @param AuthorizationCode $auth_code
-     * @param OAuth2AccessTokenRequestAuthCode $request
-     * @return null|OAuth2AccessTokenResponse
-     */
-    static public function build
-    (
-        ITokenService $token_service,
-        AuthorizationCode $auth_code,
-        OAuth2AccessTokenRequestAuthCode $request
-    )
-    {
-        $response = null;
-
-        if(self::authCodewasIssuedForOIDC($auth_code))
-        {
-
-           $access_token  = null;
-           $id_token      = null;
-           $refresh_token = null;
-           $response_type = explode
-           (
-               OAuth2Protocol::OAuth2Protocol_ResponseType_Delimiter,
-               $auth_code->getResponseType()
-           );
-
-           $is_hybrid_flow = OAuth2Protocol::responseTypeBelongsToFlow
-           (
-               $response_type,
-               OAuth2Protocol::OAuth2Protocol_GrantType_Hybrid
-           );
-
-           if($is_hybrid_flow)
-           {
-
-               if(in_array(OAuth2Protocol::OAuth2Protocol_ResponseType_Token, $response_type))
-               {
-
-                   $access_token = $token_service->createAccessToken($auth_code, $request->getRedirectUri());
-               }
-
-               // check if should emmit id token
-
-               if(in_array(OAuth2Protocol::OAuth2Protocol_ResponseType_IdToken, $response_type))
-               {
-
-                   $id_token = $token_service->createIdToken
-                   (
-                       $auth_code->getNonce(),
-                       $auth_code->getClientId(),
-                       $access_token
-                   );
-               }
-
-               if(is_null($id_token) && is_null($access_token)) throw new InvalidOAuth2Request;
-           }
-           else
-           {
-               $access_token = $token_service->createAccessToken($auth_code, $request->getRedirectUri());
-
-               $id_token     = $token_service->createIdToken
-               (
-                   $auth_code->getNonce(),
-                   $auth_code->getClientId(),
-                   $access_token
-               );
-           }
-
-           if(!is_null($access_token))
-                $refresh_token = $access_token->getRefreshToken();
-
-            $response = new OAuth2IdTokenResponse
-            (
-                is_null($access_token)  ? null : $access_token->getValue(),
-                is_null($access_token)  ? null : $access_token->getLifetime(),
-                is_null($id_token)      ? null : $id_token->toCompactSerialization(),
-                is_null($refresh_token) ? null : $refresh_token->getValue()
-            );
-        }
-        else // normal oauth2.0 code flow
-        {
-            $access_token  = $token_service->createAccessToken($auth_code, $request->getRedirectUri());
-            $refresh_token = $access_token->getRefreshToken();
-
-            $response = new OAuth2AccessTokenResponse
-            (
-                $access_token->getValue(),
-                $access_token->getLifetime(),
-                is_null($refresh_token) ? null : $refresh_token->getValue()
-            );
-        }
-
-        return $response;
-    }
-
-    /**
-     * @param AuthorizationCode $auth_code
-     * @return bool
-     */
-    static public function authCodewasIssuedForOIDC(AuthorizationCode $auth_code)
-    {
-        return str_contains($auth_code->getScope(), OAuth2Protocol::OpenIdConnect_Scope);
-    }
-
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/grant_types/.gitkeep b/app/libs/oauth2/grant_types/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/libs/oauth2/models/.gitkeep b/app/libs/oauth2/models/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/libs/oauth2/models/IApi.php b/app/libs/oauth2/models/IApi.php
deleted file mode 100644
index e61ed543..00000000
--- a/app/libs/oauth2/models/IApi.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace oauth2\models;
-
-
-interface IApi {
-    /**
-     * @return IResourceServer
-     */
-    public function getResourceServer();
-
-    public function getName();
-
-    public function getLogo();
-
-    public function getDescription();
-
-    public function getScope();
-
-    public function isActive();
-
-    public function setName($name);
-
-    public function setDescription($description);
-
-    public function setStatus($active);
-
-} 
\ No newline at end of file
diff --git a/app/libs/oauth2/models/IApiEndpoint.php b/app/libs/oauth2/models/IApiEndpoint.php
deleted file mode 100644
index 7c24c7ab..00000000
--- a/app/libs/oauth2/models/IApiEndpoint.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace oauth2\models;
-
-
-interface IApiEndpoint {
-
-    public function getRoute();
-    public function getHttpMethod();
-    public function getName();
-    public function setRoute($route);
-    public function setHttpMethod($http_method);
-    public function setName($name);
-
-    public function getScope();
-    public function isActive();
-    public function setStatus($active);
-
-    /**
-     * @return bool
-     */
-    public function supportCORS();
-
-    /**
-     * @return IApi
-     */
-    public function getApi();
-
-} 
\ No newline at end of file
diff --git a/app/libs/oauth2/models/IClientPublicKey.php b/app/libs/oauth2/models/IClientPublicKey.php
deleted file mode 100644
index 2c5ff4b0..00000000
--- a/app/libs/oauth2/models/IClientPublicKey.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
-* Copyright 2015 OpenStack Foundation
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-**/
-
-namespace oauth2\models;
-
-/**
- * Interface IClientPublicKey
- * @package oauth2\models
- */
-interface IClientPublicKey extends IAssymetricKey
-{
-
-    /**
-     * @return IClient
-     */
-    public function getOwner();
-
-    /**
-     * @param string $kid
-     * @param string $type
-     * @param string $use
-     * @param string $pem
-     * @param string $alg
-     * @param bool $active
-     * @param \DateTime $valid_from
-     * @param \DateTime $valid_to
-     * @return IClientPublicKey
-     */
-    static public function buildFromPEM($kid, $type, $use, $pem, $alg, $active, \DateTime $valid_from, \DateTime $valid_to);
-
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/models/IResourceServer.php b/app/libs/oauth2/models/IResourceServer.php
deleted file mode 100644
index 01b9d201..00000000
--- a/app/libs/oauth2/models/IResourceServer.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace oauth2\models;
-
-
-interface IResourceServer {
-
-    /**
-     * get resource server host
-     * @return string
-     */
-    public function getHost();
-
-    public function setHost($host);
-
-    /**
-     * tells if resource server is active or not
-     * @return bool
-     */
-    public function isActive();
-
-    /**
-     * @param bool $active
-     * @return void
-     */
-    public function setActive($active);
-
-
-    /**
-     * get resource server friendly name
-     * @return mixed
-     */
-    public function getFriendlyName();
-    public function setFriendlyName($friendly_name);
-
-    /**
-     * @return IClient
-     */
-    public function getClient();
-
-    /**
-     * @param string $ip
-     * @return bool
-     */
-    public function isOwn($ip);
-
-    /**
-     * @return string
-     */
-    public function getIPAddresses();
-} 
\ No newline at end of file
diff --git a/app/libs/oauth2/models/IUserConsent.php b/app/libs/oauth2/models/IUserConsent.php
deleted file mode 100644
index d20e345c..00000000
--- a/app/libs/oauth2/models/IUserConsent.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace oauth2\models;
-/**
- * Interface IUserConsent
- * @package oauth2\models
- */
-interface IUserConsent {
-    public function getScope();
-    public function getClient();
-    public function getUser();
-} 
\ No newline at end of file
diff --git a/app/libs/oauth2/requests/.gitkeep b/app/libs/oauth2/requests/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/libs/oauth2/requests/OAuth2AccessTokenRequestAuthCode.php b/app/libs/oauth2/requests/OAuth2AccessTokenRequestAuthCode.php
deleted file mode 100644
index 7e038e91..00000000
--- a/app/libs/oauth2/requests/OAuth2AccessTokenRequestAuthCode.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace oauth2\requests;
-
-use oauth2\OAuth2Protocol;
-use oauth2\OAuth2Message;
-
-/**
- * Class OAuth2AccessTokenRequest
- * http://tools.ietf.org/html/rfc6749#section-4.1.3
- * @package oauth2\requests
- */
-class OAuth2AccessTokenRequestAuthCode extends OAuth2TokenRequest
-{
-
-
-    public function __construct(OAuth2Message $msg)
-    {
-        parent::__construct($msg);
-    }
-
-    public function isValid()
-    {
-        if (!parent::isValid())
-            return false;
-
-        $redirect_uri = $this->getRedirectUri();
-
-        if (is_null($redirect_uri))
-        {
-            $this->last_validation_error = 'redirect_uri not set';
-            return false;
-        }
-
-        return true;
-    }
-
-    public function getRedirectUri()
-    {
-        return $this->getParam(OAuth2Protocol::OAuth2Protocol_RedirectUri);
-    }
-
-    public function getClientId()
-    {
-        return $this->getParam(OAuth2Protocol::OAuth2Protocol_ClientId);
-    }
-
-    public function getCode()
-    {
-        return $this->getParam(OAuth2Protocol::OAuth2Protocol_ResponseType_Code);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/requests/OAuth2AccessTokenRequestClientCredentials.php b/app/libs/oauth2/requests/OAuth2AccessTokenRequestClientCredentials.php
deleted file mode 100644
index 854a331a..00000000
--- a/app/libs/oauth2/requests/OAuth2AccessTokenRequestClientCredentials.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace oauth2\requests;
-
-use oauth2\OAuth2Protocol;
-use oauth2\OAuth2Message;
-
-/**
- * Class OAuth2AccessTokenRequestClientCredentials
- * http://tools.ietf.org/html/rfc6749#section-4.4.2
- * @package oauth2\requests
- */
-class OAuth2AccessTokenRequestClientCredentials  extends OAuth2TokenRequest {
-
-    public function __construct(OAuth2Message $msg)
-    {
-        parent::__construct($msg);
-    }
-
-    public function isValid()
-    {
-        if (!parent::isValid())
-            return false;
-
-        return true;
-    }
-
-    public function getScope()
-    {
-        return $this->getParam(OAuth2Protocol::OAuth2Protocol_Scope);
-    }
-} 
\ No newline at end of file
diff --git a/app/libs/oauth2/requests/OAuth2AccessTokenValidationRequest.php b/app/libs/oauth2/requests/OAuth2AccessTokenValidationRequest.php
deleted file mode 100644
index a770a000..00000000
--- a/app/libs/oauth2/requests/OAuth2AccessTokenValidationRequest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace oauth2\requests;
-
-use oauth2\OAuth2Protocol;
-use oauth2\OAuth2Message;
-/**
- * Class OAuth2AccessTokenValidationRequest
- * @package oauth2\requests
- */
-
-class OAuth2AccessTokenValidationRequest  extends OAuth2Request {
-
-    public function __construct(OAuth2Message $msg)
-    {
-        parent::__construct($msg);
-    }
-
-    public function isValid()
-    {
-        $this->last_validation_error = '';
-        $token = $this->getToken();
-
-        if(is_null($token)) {
-            $this->last_validation_error = 'token not set';
-            return false;
-        }
-
-        return true;
-    }
-
-    public function getToken(){
-        return $this->getParam(OAuth2Protocol::OAuth2Protocol_Token);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/requests/OAuth2RefreshAccessTokenRequest.php b/app/libs/oauth2/requests/OAuth2RefreshAccessTokenRequest.php
deleted file mode 100644
index 29de1843..00000000
--- a/app/libs/oauth2/requests/OAuth2RefreshAccessTokenRequest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace oauth2\requests;
-
-use oauth2\OAuth2Protocol;
-use oauth2\OAuth2Message;
-
-class OAuth2RefreshAccessTokenRequest extends OAuth2TokenRequest {
-
-    public function __construct(OAuth2Message $msg)
-    {
-        parent::__construct($msg);
-    }
-
-    public function isValid()
-    {
-        if(!parent::isValid())
-            return false;
-
-        $refresh_token = $this->getRefreshToken();
-
-        if(is_null($refresh_token)) {
-            $this->last_validation_error = 'refresh_token not set';
-            return false;
-        }
-
-        return true;
-    }
-
-    public function getRefreshToken(){
-        return $this->getParam(OAuth2Protocol::OAuth2Protocol_RefreshToken);
-    }
-
-    public function getScope(){
-        return $this->getParam(OAuth2Protocol::OAuth2Protocol_Scope);
-    }
-} 
\ No newline at end of file
diff --git a/app/libs/oauth2/requests/OAuth2TokenRequest.php b/app/libs/oauth2/requests/OAuth2TokenRequest.php
deleted file mode 100644
index 61927c85..00000000
--- a/app/libs/oauth2/requests/OAuth2TokenRequest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace oauth2\requests;
-
-use oauth2\OAuth2Message;
-use oauth2\OAuth2Protocol;
-
-/**
- * Class OAuth2TokenRequest
- * Base Token Request
- * @package oauth2\requests
- */
-class OAuth2TokenRequest extends OAuth2Request
-{
-
-    public function __construct(OAuth2Message $msg)
-    {
-        parent::__construct($msg);
-    }
-
-    public function isValid()
-    {
-        $this->last_validation_error = '';
-
-        $grant_type = $this->getGrantType();
-
-        if(is_null($grant_type)) {
-            $this->last_validation_error = 'grant_type not set';
-            return false;
-        }
-
-        return true;
-    }
-
-    public function getGrantType()
-    {
-        return $this->getParam(OAuth2Protocol::OAuth2Protocol_GrantType);
-    }
-} 
\ No newline at end of file
diff --git a/app/libs/oauth2/requests/OAuth2TokenRevocationRequest.php b/app/libs/oauth2/requests/OAuth2TokenRevocationRequest.php
deleted file mode 100644
index d9762777..00000000
--- a/app/libs/oauth2/requests/OAuth2TokenRevocationRequest.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace oauth2\requests;
-
-use oauth2\OAuth2Message;
-use oauth2\OAuth2Protocol;
-
-class OAuth2TokenRevocationRequest extends OAuth2Request {
-
-    public function __construct(OAuth2Message $msg)
-    {
-        parent::__construct($msg);
-    }
-
-    public function isValid()
-    {
-        $this->last_validation_error = '';
-
-        $token = $this->getToken();
-
-        if(is_null($token)) {
-            $this->last_validation_error = 'token not set';
-            return false;
-        }
-
-        return true;
-    }
-
-    public function getToken(){
-        return $this->getParam(OAuth2Protocol::OAuth2Protocol_Token);
-    }
-
-    public function getTokenHint(){
-        return $this->getParam(OAuth2Protocol::OAuth2Protocol_TokenType_Hint);
-    }
-} 
\ No newline at end of file
diff --git a/app/libs/oauth2/resource_server/OAuth2ProtectedService.php b/app/libs/oauth2/resource_server/OAuth2ProtectedService.php
deleted file mode 100644
index 2aa51300..00000000
--- a/app/libs/oauth2/resource_server/OAuth2ProtectedService.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace oauth2\resource_server;
-
-use oauth2\IResourceServerContext;
-use utils\services\ILogService;
-
-/**
- * Class OAuth2ProtectedService
- * Base Class for OAUTH2 protected endpoints
- * @package oauth2\resource_server
- */
-abstract class OAuth2ProtectedService
-{
-
-    /**
-     * @var IResourceServerContext
-     */
-    protected $resource_server_context;
-    /**
-     * @var ILogService
-     */
-    protected $log_service;
-
-    /**
-     * @param IResourceServerContext $resource_server_context
-     * @param ILogService $log_service
-     */
-    public function __construct(IResourceServerContext $resource_server_context, ILogService $log_service)
-    {
-        $this->log_service             = $log_service;
-        $this->resource_server_context = $resource_server_context;
-    }
-} 
\ No newline at end of file
diff --git a/app/libs/oauth2/responses/.gitkeep b/app/libs/oauth2/responses/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/libs/oauth2/responses/OAuth2DirectResponse.php b/app/libs/oauth2/responses/OAuth2DirectResponse.php
deleted file mode 100644
index 52db994f..00000000
--- a/app/libs/oauth2/responses/OAuth2DirectResponse.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace oauth2\responses;
-
-use utils\http\HttpContentType;
-
-class OAuth2DirectResponse extends OAuth2Response
-{
-
-    const OAuth2DirectResponse      = 'OAuth2DirectResponse';
-
-    public function __construct($http_code = self::HttpOkResponse, $content_type = HttpContentType::Json)
-    {
-        // Successful Responses: A server receiving a valid request MUST send a
-        // response with an HTTP status code of 200.
-        parent::__construct($http_code,$content_type );
-    }
-
-    public function getContent()
-    {
-        $json_encoded_format = json_encode($this->container);
-        return $json_encoded_format;
-    }
-
-    public function getType()
-    {
-        return self::OAuth2DirectResponse;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/responses/OAuth2Response.php b/app/libs/oauth2/responses/OAuth2Response.php
deleted file mode 100644
index 6f39f26f..00000000
--- a/app/libs/oauth2/responses/OAuth2Response.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace oauth2\responses;
-
-use utils\http\HttpResponse;
-
-abstract class OAuth2Response extends HttpResponse {
-
-} 
\ No newline at end of file
diff --git a/app/libs/oauth2/services/.gitkeep b/app/libs/oauth2/services/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/libs/oauth2/services/IApiService.php b/app/libs/oauth2/services/IApiService.php
deleted file mode 100644
index ff8ce6f6..00000000
--- a/app/libs/oauth2/services/IApiService.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace oauth2\services;
-
-use oauth2\models\IApi;
-
-/**
- * Interface IApiService
- * @package oauth2\services
- */
-interface IApiService {
-
-    /**
-     * @param $api_id
-     * @return IApi
-     */
-    public function get($api_id);
-
-    /**
-     * @param $api_name
-     * @return IApi
-     */
-    public function getByName($api_name);
-
-    /**
-     * @param $id
-     * @return bool
-     */
-    public function delete($id);
-
-    /**
-     * @param $name
-     * @param $description
-     * @param $active
-     * @param $resource_server_id
-     * @return IApi
-     */
-    public function add($name, $description, $active, $resource_server_id);
-
-
-    /**
-     * @param $id
-     * @param array $params
-     * @throws \oauth2\exceptions\InvalidApi
-     */
-    public function update($id, array $params);
-    /**
-     * @param IApi $api
-     * @return void
-     */
-    public function save(IApi $api);
-
-    /**
-     * @param $id
-     * @param $active
-     * @return bool
-     */
-    public function setStatus($id, $active);
-
-    /**
-     * @param int $page_nbr
-     * @param int $page_size
-     * @param array $filters
-     * @param array $fields
-     * @return mixed
-     */
-    public function getAll($page_nbr=1,$page_size=10,array $filters=array(),array $fields=array('*'));
-
-} 
\ No newline at end of file
diff --git a/app/libs/oauth2/services/IClientService.php b/app/libs/oauth2/services/IClientService.php
deleted file mode 100644
index 0e0394ec..00000000
--- a/app/libs/oauth2/services/IClientService.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-namespace oauth2\services;
-
-use oauth2\exceptions\AbsentClientException;
-use oauth2\exceptions\InvalidClientAuthMethodException;
-use oauth2\exceptions\MissingClientAuthorizationInfo;
-use oauth2\models\ClientAuthenticationContext;
-use oauth2\models\IClient;
-use openid\model\IOpenIdUser;
-/**
- * Interface IClientService
- * @package oauth2\services
- */
-interface IClientService {
-    /**
-     * @param $client_id
-     * @return IClient
-     */
-    public function getClientById($client_id);
-
-    /**
-     * Clients in possession of a client password MAY use the HTTP Basic
-     * authentication scheme as defined in [RFC2617] to authenticate with
-     * the authorization server
-     * Alternatively, the authorization server MAY support including the
-     * client credentials in the request-body using the following
-     * parameters:
-     * implementation of http://tools.ietf.org/html/rfc6749#section-2.3.1
-     * implementation of http://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication
-     * @throws InvalidClientAuthMethodException
-     * @throws MissingClientAuthorizationInfo
-     * @return ClientAuthenticationContext
-     */
-    public function getCurrentClientAuthInfo();
-
-    public function getClientByIdentifier($id);
-
-    /**
-     * @param string $application_type
-     * @param string $app_name
-     * @param string $app_description
-     * @param null|string  $app_url
-     * @param array $admin_users
-     * @param string $app_logo
-     * @return IClient
-     */
-    public function addClient
-    (
-        $application_type,
-        $app_name,
-        $app_description,
-        $app_url = null,
-        array $admin_users = array(),
-        $app_logo = ''
-    );
-
-    /**
-     * @param $id
-     * @param array $params
-     * @throws AbsentClientException
-     * @throws \ValidationException
-     * @return mixed
-     */
-    public function update($id, array $params);
-
-    /**
-     * @param $id
-     * @param $scope_id
-     * @return mixed
-     */
-    public function addClientScope($id, $scope_id);
-
-    /**
-     * @param $id
-     * @param $scope_id
-     * @return mixed
-     */
-    public function deleteClientScope($id, $scope_id);
-
-
-    public function deleteClientByIdentifier($id);
-
-    /**
-     * Regenerates Client Secret
-     * @param $id client id
-     * @return IClient
-     */
-    public function regenerateClientSecret($id);
-
-    /**
-     * Lock a client application by client id
-     * @param $client_id client id
-     * @return mixed
-     */
-    public function lockClient($client_id);
-
-    /**
-     * unLock a client application by client id
-     * @param $client_id client id
-     * @return mixed
-     */
-    public function unlockClient($client_id);
-
-    /**
-     * Activate/Deactivate given client
-     * @param $id
-     * @param $active
-     * @return mixed
-     */
-    public function activateClient($id, $active);
-
-    /**
-     * set/unset refresh token usage for a given client
-     * @param $id
-     * @param $use_refresh_token
-     * @return mixed
-     */
-    public function setRefreshTokenUsage($id, $use_refresh_token);
-
-    /**
-     * set/unset rotate refresh token policy for a given client
-     * @param $id
-     * @param $rotate_refresh_token
-     * @return mixed
-     */
-    public function setRotateRefreshTokenPolicy($id, $rotate_refresh_token);
-
-    /**
-     * Checks if an app name already exists or not
-     * @param $app_name
-     * @return boolean
-     */
-    public function existClientAppName($app_name);
-
-    /**
-     * gets a client by id
-     * @param $id id of client
-     * @return IClient
-     */
-    public function get($id);
-
-    /**
-     * @param int $page_nbr
-     * @param int $page_size
-     * @param array $filters
-     * @param array $fields
-     * @return mixed
-     */
-    public function getAll($page_nbr=1,$page_size=10,array $filters=array(), array $fields=array('*'));
-
-    /**
-     * @param string $origin
-     * @return IClient
-     */
-    public function getByOrigin($origin);
-
-} 
\ No newline at end of file
diff --git a/app/libs/oauth2/services/IMementoOAuth2SerializerService.php b/app/libs/oauth2/services/IMementoOAuth2SerializerService.php
deleted file mode 100644
index 5101b20f..00000000
--- a/app/libs/oauth2/services/IMementoOAuth2SerializerService.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace oauth2\services;
-
-use oauth2\requests\OAuth2AuthorizationRequest;
-use oauth2\requests\OAuth2RequestMemento;
-
-/**
- * Interface IMementoOAuth2SerializerService
- * @package oauth2\services
- */
-interface IMementoOAuth2SerializerService {
-
-    /**
-     * @param OAuth2RequestMemento $memento
-     * @return void
-     */
-    public function serialize(OAuth2RequestMemento $memento);
-
-    /**
-     * @return OAuth2RequestMemento
-     */
-    public function load();
-
-    /**
-     * @return void
-     */
-    public function forget();
-
-    /**
-     * @return bool
-     */
-    public function exists();
-} 
\ No newline at end of file
diff --git a/app/libs/oauth2/services/IResourceServerService.php b/app/libs/oauth2/services/IResourceServerService.php
deleted file mode 100644
index b9793679..00000000
--- a/app/libs/oauth2/services/IResourceServerService.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace oauth2\services;
-
-use oauth2\models\IResourceServer;
-/**
- * Interface IResourceServerService
- * @package oauth2\services
- */
-interface IResourceServerService {
-
-
-    /**
-     * get a resource server by id
-     * @param $id id of resource server
-     * @return IResourceServer
-     */
-    public function get($id);
-
-    /**
-     * @param int $page_size
-     * @param int $page_nbr
-     * @return mixed
-     */
-    public function getAll($page_nbr = 1,$page_size = 10, array $filters = array(), array $fields=array('*'));
-
-    /**
-     * @param IResourceServer $resource_server
-     * @return bool
-     */
-    public function save(IResourceServer $resource_server);
-
-    /**
-     * @param $id
-     * @param array $params
-     * @return bool
-     * @throws \oauth2\exceptions\InvalidResourceServer
-     */
-    public function update($id, array $params);
-
-    /**
-     * sets resource server status (active/deactivated)
-     * @param $id id of resource server
-     * @param bool $status status (active/non active)
-     * @return void
-     */
-    public function setStatus($id,$status);
-
-    /**
-     * deletes a resource server
-     * @param $id id of resource server
-     * @return bool
-     */
-    public function delete($id);
-
-
-    /** Creates a new resource server instance
-     * @param $host
-     * @param $ips
-     * @param $friendly_name
-     * @param bool $active
-     * @return IResourceServer
-     */
-    public function add($host, $ips, $friendly_name, $active);
-
-
-    /**
-     * @param $id resource server id
-     * @return string
-     */
-    public function regenerateClientSecret($id);
-
-    /**
-     * @param string $ip
-     * @return IResourceServer
-     */
-    public function getByIPAddress($ip);
-} 
\ No newline at end of file
diff --git a/app/libs/oauth2/services/IUserConsentService.php b/app/libs/oauth2/services/IUserConsentService.php
deleted file mode 100644
index d9a17298..00000000
--- a/app/libs/oauth2/services/IUserConsentService.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace oauth2\services;
-
-use oauth2\models\IUserConsent;
-
-/**
- * Interface IUserConsentService
- * @package oauth2\services
- */
-interface IUserConsentService
-{
-    /**
-     * @param $user_id
-     * @param $client_id
-     * @param $scopes
-     * @return IUserConsent
-     */
-    public function get($user_id, $client_id, $scopes);
-
-    /**
-     * @param $user_id
-     * @param $client_id
-     * @param $scopes
-     * @return IUserConsent
-     */
-    public function add($user_id, $client_id, $scopes);
-} 
\ No newline at end of file
diff --git a/app/libs/oauth2/services/OAuth2ServiceCatalog.php b/app/libs/oauth2/services/OAuth2ServiceCatalog.php
deleted file mode 100644
index 36a5ea8c..00000000
--- a/app/libs/oauth2/services/OAuth2ServiceCatalog.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace oauth2\services;
-
-/**
- * Class OAuth2ServiceCatalog
- * @package oauth2\services
- */
-abstract class OAuth2ServiceCatalog
-{
-    const TokenService                       = 'oauth2\\services\\ITokenService';
-    const ClientCredentialGenerator          = 'oauth2\\services\\IClientCrendentialGenerator';
-    const ClientService                      = 'oauth2\\services\\IClientService';
-    const ScopeService                       = 'oauth2\\services\\IApiScopeService';
-    const ResourceServerService              = 'oauth2\\services\\IResourceServerService';
-    const ApiService                         = 'oauth2\\services\\IApiService';
-    const ApiEndpointService                 = 'oauth2\\services\\IApiEndpointService';
-    const UserConsentService                 = 'oauth2\\services\\IUserConsentService';
-    const ClienPublicKeyService              = 'oauth2\\services\\IClienPublicKeyService';
-    const ServerPrivateKeyService            = 'oauth2\\services\\IServerPrivateKeyService';
-    const OpenIDProviderConfigurationService = 'oauth2\\discovery\\IOpenIDProviderConfigurationService';
-    const MementoSerializerService           = 'oauth2\\services\\IMementoOAuth2SerializerService';
-    const AuthenticationStrategy             = 'oauth2\\strategies\\IOAuth2AuthenticationStrategy';
-    const PrincipalService                    = 'oauth2\\services\\IPrincipalService';
-    const SecurityContextService              = 'oauth2\\services\\ISecurityContextService';
-}
\ No newline at end of file
diff --git a/app/libs/oauth2/strategies/IOAuth2AuthenticationStrategy.php b/app/libs/oauth2/strategies/IOAuth2AuthenticationStrategy.php
deleted file mode 100644
index 7fddeb0c..00000000
--- a/app/libs/oauth2/strategies/IOAuth2AuthenticationStrategy.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace oauth2\strategies;
-
-use oauth2\requests\OAuth2AuthorizationRequest;
-
-/**
- * Interface IOAuth2AuthenticationStrategy
- * @package oauth2\strategies
- */
-interface IOAuth2AuthenticationStrategy {
-
-    public function doLogin(OAuth2AuthorizationRequest $request);
-
-    public function doConsent(OAuth2AuthorizationRequest $request);
-} 
\ No newline at end of file
diff --git a/app/libs/openid/OpenIdServiceProvider.php b/app/libs/openid/OpenIdServiceProvider.php
deleted file mode 100644
index 7b6229ab..00000000
--- a/app/libs/openid/OpenIdServiceProvider.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace openid;
-
-use Illuminate\Support\ServiceProvider;
-use openid\extensions\OpenIdAuthenticationExtension;
-use openid\services\OpenIdServiceCatalog;
-use utils\services\UtilsServiceCatalog;
-use App;
-
-/**
- * Class OpenIdServiceProvider
- * Register dependencies with IOC container for package openid
- * @package openid
- */
-class OpenIdServiceProvider extends ServiceProvider {
-
-    public function boot(){
-    }
-
-    /**
-     * Register the service provider.
-     *
-     * @return void
-     */
-    public function register()
-    {
-	    App::singleton('openid\IOpenIdProtocol', 'openid\OpenIdProtocol');
-
-        $auth_extension_service = App::make('auth\\IAuthenticationExtensionService');
-
-        if(!is_null($auth_extension_service)){
-            $memento_service              = App::make(OpenIdServiceCatalog::MementoSerializerService);
-            $server_configuration_service = App::make(UtilsServiceCatalog::ServerConfigurationService);
-
-            $auth_extension_service->addExtension(
-                    new OpenIdAuthenticationExtension(
-                        $memento_service,
-                        $server_configuration_service
-                    )
-            );
-        }
-    }
-
-    public function provides()
-    {
-        return array('openid');
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/exceptions/InvalidAssociation.php b/app/libs/openid/exceptions/InvalidAssociation.php
deleted file mode 100644
index 62d18808..00000000
--- a/app/libs/openid/exceptions/InvalidAssociation.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace openid\exceptions;
-
-use Exception;
-
-/**
- * Class InvalidAssociation
- * @package openid\exceptions
- */
-class InvalidAssociation extends Exception {
-
-    public function __construct($message = "")
-    {
-        $message = "Invalid Association: " . $message;
-        parent::__construct($message, 0, null);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/exceptions/InvalidAssociationTypeException.php b/app/libs/openid/exceptions/InvalidAssociationTypeException.php
deleted file mode 100644
index 57737111..00000000
--- a/app/libs/openid/exceptions/InvalidAssociationTypeException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace openid\exceptions;
-
-use Exception;
-
-/**
- * Class InvalidAssociationTypeException
- * @package openid\exceptions
- */
-class InvalidAssociationTypeException extends Exception {
-
-    public function __construct($message = "")
-    {
-        $message = "Invalid Association Type: " . $message;
-        parent::__construct($message, 0, null);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/exceptions/InvalidDHParam.php b/app/libs/openid/exceptions/InvalidDHParam.php
deleted file mode 100644
index 1fd23d07..00000000
--- a/app/libs/openid/exceptions/InvalidDHParam.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace openid\exceptions;
-
-use Exception;
-
-/**
- * Class InvalidDHParam
- * @package openid\exceptions
- */
-class InvalidDHParam extends Exception {
-
-    public function __construct($message = "")
-    {
-        $message = "Invalid Diffie Helman Parameter : " . $message;
-        parent::__construct($message, 0, null);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/exceptions/InvalidKVFormat.php b/app/libs/openid/exceptions/InvalidKVFormat.php
deleted file mode 100644
index 8cc8453f..00000000
--- a/app/libs/openid/exceptions/InvalidKVFormat.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace openid\exceptions;
-
-use Exception;
-
-/**
- * Class InvalidKVFormat
- * @package openid\exceptions
- */
-class InvalidKVFormat extends Exception {
-
-    public function __construct($message = "")
-    {
-        $message = "Invalid Key Value Format : " . $message;
-        parent::__construct($message, 0, null);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/exceptions/InvalidNonce.php b/app/libs/openid/exceptions/InvalidNonce.php
deleted file mode 100644
index 6a3e8528..00000000
--- a/app/libs/openid/exceptions/InvalidNonce.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace openid\exceptions;
-
-use Exception;
-
-/**
- * Class InvalidNonce
- * @package openid\exceptions
- */
-class InvalidNonce extends Exception {
-
-    public function __construct($message = "")
-    {
-        $message = "Invalid Nonce : " . $message;
-        parent::__construct($message, 0, null);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/exceptions/InvalidOpenIdAuthenticationRequestMode.php b/app/libs/openid/exceptions/InvalidOpenIdAuthenticationRequestMode.php
deleted file mode 100644
index 931d81d0..00000000
--- a/app/libs/openid/exceptions/InvalidOpenIdAuthenticationRequestMode.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace openid\exceptions;
-
-use Exception;
-
-/**
- * Class InvalidOpenIdAuthenticationRequestMode
- * @package openid\exceptions
- */
-class InvalidOpenIdAuthenticationRequestMode extends Exception {
-    public function __construct($message = "")
-    {
-        $message = "Invalid OpenId Authentication Request Mode : " . $message;
-        parent::__construct($message, 0, null);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/exceptions/InvalidOpenIdMessageException.php b/app/libs/openid/exceptions/InvalidOpenIdMessageException.php
deleted file mode 100644
index ec73b035..00000000
--- a/app/libs/openid/exceptions/InvalidOpenIdMessageException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace openid\exceptions;
-
-use Exception;
-
-/**
- * Class InvalidOpenIdMessageException
- * @package openid\exceptions
- */
-class InvalidOpenIdMessageException extends Exception {
-
-    public function __construct($message = "")
-    {
-        $message = "Invalid OpenId Message : " . $message;
-        parent::__construct($message, 0, null);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/exceptions/InvalidOpenIdMessageMode.php b/app/libs/openid/exceptions/InvalidOpenIdMessageMode.php
deleted file mode 100644
index 3d5b265e..00000000
--- a/app/libs/openid/exceptions/InvalidOpenIdMessageMode.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace openid\exceptions;
-
-use Exception;
-
-/**
- * Class InvalidOpenIdMessageMode
- * @package openid\exceptions
- */
-class InvalidOpenIdMessageMode extends Exception {
-    public function __construct($message = "")
-    {
-        $message = "Invalid OpenId Message Mode : " . $message;
-        parent::__construct($message, 0, null);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/exceptions/InvalidRequestContextException.php b/app/libs/openid/exceptions/InvalidRequestContextException.php
deleted file mode 100644
index 34f5a79a..00000000
--- a/app/libs/openid/exceptions/InvalidRequestContextException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace openid\exceptions;
-
-use Exception;
-
-/**
- * Class InvalidRequestContextException
- * @package openid\exceptions
- */
-class InvalidRequestContextException extends Exception {
-
-    public function __construct($message = "")
-    {
-        $message = "Invalid Request Context : " . $message;
-        parent::__construct($message, 0, null);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/exceptions/InvalidSessionTypeException.php b/app/libs/openid/exceptions/InvalidSessionTypeException.php
deleted file mode 100644
index c06bf40c..00000000
--- a/app/libs/openid/exceptions/InvalidSessionTypeException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace openid\exceptions;
-
-use Exception;
-
-/**
- * Class InvalidSessionTypeException
- * @package openid\exceptions
- */
-class InvalidSessionTypeException extends Exception {
-
-    public function __construct($message = "")
-    {
-        $message = "Invalid Session Type: " . $message;
-        parent::__construct($message, 0, null);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/exceptions/InvalidTLDException.php b/app/libs/openid/exceptions/InvalidTLDException.php
deleted file mode 100644
index e53f7e77..00000000
--- a/app/libs/openid/exceptions/InvalidTLDException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace openid\exceptions;
-
-use Exception;
-
-/**
- * Class InvalidTLDException
- * @package openid\exceptions
- */
-class InvalidTLDException extends Exception {
-
-    public function __construct($message = "")
-    {
-        $message = "Invalid TDL: " . $message;
-        parent::__construct($message, 0, null);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/exceptions/OpenIdCryptoException.php b/app/libs/openid/exceptions/OpenIdCryptoException.php
deleted file mode 100644
index 72703444..00000000
--- a/app/libs/openid/exceptions/OpenIdCryptoException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace openid\exceptions;
-
-use Exception;
-
-/**
- * Class OpenIdCryptoException
- * @package openid\exceptions
- */
-class OpenIdCryptoException extends Exception {
-
-    public function __construct($message = "")
-    {
-        $message = "OpenId Crypto Error: " . $message;
-        parent::__construct($message, 0, null);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/exceptions/OpenIdInvalidRealmException.php b/app/libs/openid/exceptions/OpenIdInvalidRealmException.php
deleted file mode 100644
index 9e966d90..00000000
--- a/app/libs/openid/exceptions/OpenIdInvalidRealmException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace openid\exceptions;
-
-use Exception;
-
-/**
- * Class OpenIdInvalidRealmException
- * @package openid\exceptions
- */
-class OpenIdInvalidRealmException extends Exception {
-
-    public function __construct($message = "")
-    {
-        $message = "OpenId Invalid Realm : " . $message;
-        parent::__construct($message, 0, null);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/exceptions/ReplayAttackException.php b/app/libs/openid/exceptions/ReplayAttackException.php
deleted file mode 100644
index 1143dddb..00000000
--- a/app/libs/openid/exceptions/ReplayAttackException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace openid\exceptions;
-
-use Exception;
-
-/**
- * Class ReplayAttackException
- * @package openid\exceptions
- */
-class ReplayAttackException extends Exception {
-
-    public function __construct($message = "")
-    {
-        $message = "Possible Replay Attack : " . $message;
-        parent::__construct($message, 0, null);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/extensions/implementations/OpenIdAXRequest.php b/app/libs/openid/extensions/implementations/OpenIdAXRequest.php
deleted file mode 100644
index 6351ba7d..00000000
--- a/app/libs/openid/extensions/implementations/OpenIdAXRequest.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace openid\extensions\implementations;
-
-use openid\exceptions\InvalidOpenIdMessageException;
-use openid\helpers\OpenIdErrorMessages;
-use openid\OpenIdMessage;
-use openid\requests\OpenIdRequest;
-/**
- * Class OpenIdAXRequest
- * Implements http://openid.net/specs/openid-attribute-exchange-1_0.html
- * @package openid\extensions\implementations
- */
-class OpenIdAXRequest extends OpenIdRequest
-{
-
-    private $attributes;
-
-    public function __construct(OpenIdMessage $message)
-    {
-        parent::__construct($message);
-        $this->attributes = array();
-    }
-
-    /**
-     * @return bool
-     * @throws InvalidOpenIdMessageException
-     */
-    public function isValid()
-    {
-
-        //check identifier
-        if (isset($this->message[OpenIdAXExtension::paramNamespace('_')])
-            && $this->message[OpenIdAXExtension::paramNamespace('_')] == OpenIdAXExtension::NamespaceUrl
-        ) {
-
-            //check required fields
-
-            if (!isset($this->message[OpenIdAXExtension::param(OpenIdAXExtension::Mode, '_')])
-                || $this->message[OpenIdAXExtension::param(OpenIdAXExtension::Mode, '_')] != OpenIdAXExtension::FetchRequest
-            )
-                throw new InvalidOpenIdMessageException(OpenIdErrorMessages::AXInvalidModeMessage);
-
-            if (!isset($this->message[OpenIdAXExtension::param(OpenIdAXExtension::RequiredAttributes, '_')]))
-                throw new InvalidOpenIdMessageException(OpenIdErrorMessages::AXInvalidRequiredAttributesMessage);
-
-            //get attributes
-            $attributes = $this->message[OpenIdAXExtension::param(OpenIdAXExtension::RequiredAttributes, '_')];
-            $attributes = explode(",", $attributes);
-
-            foreach ($attributes as $attr) {
-                $attr = trim($attr);
-                if (!isset(OpenIdAXExtension::$available_properties[$attr]))
-                    continue;
-                if (!isset($this->message[OpenIdAXExtension::param(OpenIdAXExtension::Type, '_') . "_" . $attr]))
-                    throw new InvalidOpenIdMessageException(sprintf(OpenIdErrorMessages::AXInvalidNamespaceMessage, $attr));
-                $ns = $this->message[OpenIdAXExtension::param(OpenIdAXExtension::Type, "_") . "_" . $attr];
-                if ($ns != OpenIdAXExtension::$available_properties[$attr])
-                    throw new InvalidOpenIdMessageException(sprintf(OpenIdErrorMessages::AXInvalidNamespaceMessage, $attr));
-                array_push($this->attributes, $attr);
-            }
-            return true;
-        }
-        return false;
-    }
-
-    public function getRequiredAttributes()
-    {
-        return $this->attributes;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/extensions/implementations/OpenIdPAPEExtension.php b/app/libs/openid/extensions/implementations/OpenIdPAPEExtension.php
deleted file mode 100644
index 8232b773..00000000
--- a/app/libs/openid/extensions/implementations/OpenIdPAPEExtension.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-namespace openid\extensions\implementations;
-
-use openid\extensions\OpenIdExtension;
-use openid\OpenIdProtocol;
-use openid\requests\contexts\RequestContext;
-use openid\requests\OpenIdRequest;
-use openid\responses\contexts\ResponseContext;
-use openid\responses\OpenIdResponse;
-use utils\services\ILogService;
-/**
- * Class OpenIdPAPEExtension
- * Implements http://openid.net/specs/openid-provider-authentication-policy-extension-1_0.html
- * @package openid\extensions\implementations
- */
-class OpenIdPAPEExtension extends OpenIdExtension
-{
-
-    const Prefix = "pape";
-
-    public function __construct($name, $namespace, $view, $description, ILogService $log_service)
-    {
-        parent::__construct($name, $namespace, $view, $description,$log_service);
-    }
-
-    public static function param($param, $separator = '.')
-    {
-        return OpenIdProtocol::OpenIdPrefix . $separator . self::Prefix . $separator . $param;
-    }
-
-    public static function paramNamespace($separator = '.')
-    {
-        return OpenIdProtocol::OpenIdPrefix . $separator . OpenIdProtocol::OpenIDProtocol_NS . $separator . self::Prefix;
-    }
-
-    public function parseRequest(OpenIdRequest $request, RequestContext $context)
-    {
-        // TODO: Implement parseRequest() method.
-    }
-
-    public function prepareResponse(OpenIdRequest $request, OpenIdResponse $response, ResponseContext $context)
-    {
-        // TODO: Implement prepareResponse() method.
-    }
-
-    public function getTrustedData(OpenIdRequest $request)
-    {
-
-    }
-
-    protected function populateProperties()
-    {
-        // TODO: Implement populateProperties() method.
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/handlers/IOpenIdAuthenticationStrategy.php b/app/libs/openid/handlers/IOpenIdAuthenticationStrategy.php
deleted file mode 100644
index 5e312d1b..00000000
--- a/app/libs/openid/handlers/IOpenIdAuthenticationStrategy.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace openid\handlers;
-
-use openid\requests\OpenIdAuthenticationRequest;
-use openid\requests\contexts\RequestContext;
-
-/**
- * Interface IOpenIdAuthenticationStrategy
- * declares the contract to connect UI with OpenId protocol
- * @package openid\handlers
- */
-interface IOpenIdAuthenticationStrategy {
-
-    /**
-     * Redirects to Login UI
-     * @param OpenIdAuthenticationRequest $request
-     * @param RequestContext $context
-     * @return mixed
-     */
-    public function doLogin(OpenIdAuthenticationRequest $request,RequestContext $context);
-
-    /**
-     * Redirects to Consent UI
-     * @param OpenIdAuthenticationRequest $request
-     * @param RequestContext $context
-     * @return mixed
-     */
-    public function doConsent(OpenIdAuthenticationRequest $request,RequestContext $context);
-}
\ No newline at end of file
diff --git a/app/libs/openid/handlers/strategies/session_association/ISessionAssociationStrategy.php b/app/libs/openid/handlers/strategies/session_association/ISessionAssociationStrategy.php
deleted file mode 100644
index a85515b9..00000000
--- a/app/libs/openid/handlers/strategies/session_association/ISessionAssociationStrategy.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace openid\handlers\strategies;
-
-use openid\responses\OpenIdAssociationSessionResponse;
-use Zend\Crypt\Exception\InvalidArgumentException;
-use Zend\Crypt\Exception\RuntimeException;
-use openid\exceptions\InvalidDHParam;
-
-/**
- * Interface ISessionAssociationStrategy
- * @package openid\handlers\strategies
- */
-interface ISessionAssociationStrategy {
-    /**
-     * @throws InvalidDHParam|RuntimeException|InvalidArgumentException
-     * @return OpenIdAssociationSessionResponse
-     */
-    public function handle();
-} 
\ No newline at end of file
diff --git a/app/libs/openid/handlers/strategies/session_association/implementations/SessionAssociationUnencryptedStrategy.php b/app/libs/openid/handlers/strategies/session_association/implementations/SessionAssociationUnencryptedStrategy.php
deleted file mode 100644
index 0bf3719c..00000000
--- a/app/libs/openid/handlers/strategies/session_association/implementations/SessionAssociationUnencryptedStrategy.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace openid\handlers\strategies\implementations;
-
-use openid\exceptions\InvalidDHParam;
-use openid\handlers\strategies\ISessionAssociationStrategy;
-use openid\requests\OpenIdAssociationSessionRequest;
-use openid\responses\OpenIdAssociationSessionResponse;
-use openid\responses\OpenIdUnencryptedAssociationSessionResponse;
-use openid\responses\OpenIdDirectGenericErrorResponse;
-use Zend\Crypt\Exception\InvalidArgumentException;
-use Zend\Crypt\Exception\RuntimeException;
-
-//services
-use openid\services\IAssociationService;
-use openid\services\IServerConfigurationService;
-use utils\services\ILogService;
-use openid\helpers\AssociationFactory;
-
-/**
- * Class SessionAssociationUnencryptedStrategy
- * @package openid\handlers\strategies\implementations
- */
-class SessionAssociationUnencryptedStrategy implements ISessionAssociationStrategy {
-
-
-    private $association_service;
-    private $server_configuration_service;
-    private $current_request;
-    private $log_service;
-
-    public function __construct(OpenIdAssociationSessionRequest $request,
-                                IAssociationService $association_service,
-                                IServerConfigurationService $server_configuration_service,
-                                ILogService $log_service)
-    {
-        $this->current_request               = $request;
-        $this->association_service           = $association_service;
-        $this->server_configuration_service  = $server_configuration_service;
-        $this->log_service                   = $log_service;
-    }
-
-    /**
-     * @return null|OpenIdDirectGenericErrorResponse|OpenIdAssociationSessionResponse|OpenIdUnencryptedAssociationSessionResponse
-     */
-    public function handle()
-    {
-        $response = null;
-        try {
-            $assoc_type   = $this->current_request->getAssocType();
-            $session_type = $this->current_request->getSessionType();
-			$association  = $this->association_service->addAssociation(AssociationFactory::getInstance()->buildSessionAssociation($assoc_type,$this->server_configuration_service->getConfigValue("Session.Association.Lifetime")));
-	        $response     = new OpenIdUnencryptedAssociationSessionResponse($association->getHandle() , $session_type, $assoc_type, $association->getLifetime(), $association->getSecret());
-
-        } catch (InvalidDHParam $exDH) {
-            $response = new OpenIdDirectGenericErrorResponse($exDH->getMessage());
-            $this->log_service->error($exDH);
-        } catch (InvalidArgumentException $exDH1) {
-            $response = new OpenIdDirectGenericErrorResponse($exDH1->getMessage());
-            $this->log_service->error($exDH1);
-
-        } catch (RuntimeException $exDH2) {
-            $response = new OpenIdDirectGenericErrorResponse($exDH2->getMessage());
-            $this->log_service->error($exDH2);
-        }
-        return $response;
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/helpers/AssocHandleGenerator.php b/app/libs/openid/helpers/AssocHandleGenerator.php
deleted file mode 100644
index 9e90cb67..00000000
--- a/app/libs/openid/helpers/AssocHandleGenerator.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace openid\helpers;
-
-use Zend\Math\Rand;
-
-/**
- * Class AssocHandleGenerator
- *  The association handle is used as a key to refer to this association in subsequent messages.
- * A string 255 characters or less in length. It MUST consist only of ASCII characters in the
- * range 33-126 inclusive (printable non-whitespace characters).
- * @package openid\helpers
- */
-final class AssocHandleGenerator
-{
-
-    const PrintableNonWhitespaceCharacters = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_~';
-
-    /**
-     * @param int $len
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    public static function generate($len = 32)
-    {
-        if ($len > 255) throw new \InvalidArgumentException(sprintf("assoc handle len must be lower or equal to 255(%d)", $len));
-        $new_assoc_handle = Rand::getString($len, self::PrintableNonWhitespaceCharacters, true);
-        return $new_assoc_handle;
-    }
-} 
\ No newline at end of file
diff --git a/app/libs/openid/helpers/AssociationFactory.php b/app/libs/openid/helpers/AssociationFactory.php
deleted file mode 100644
index 53bd627e..00000000
--- a/app/libs/openid/helpers/AssociationFactory.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-namespace openid\helpers;
-
-use openid\model\Association;
-use openid\model\IAssociation;
-use openid\OpenIdProtocol;
-
-/**
- * Class AssociationFactory
- * Singleton Factory that creates OpenId Associations
- * @package openid\helpers
- */
-final class AssociationFactory {
-
-	private static $instance = null;
-
-	private function __construct(){
-	}
-
-	public static function getInstance()
-	{
-		if (self::$instance == null) {
-			self::$instance = new AssociationFactory();
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * @param $realm
-	 * @param $lifetime
-	 * @return IAssociation
-	 */
-	public function buildPrivateAssociation($realm,$lifetime)
-	{
-		return $this->buildAssociation(IAssociation::TypePrivate,OpenIdProtocol::SignatureAlgorithmHMAC_SHA256,$lifetime,$realm);
-	}
-
-	/**
-	 * @param $mac_function
-	 * @param $lifetime
-	 * @return IAssociation
-	 */
-	public function buildSessionAssociation($mac_function,$lifetime){
-		return $this->buildAssociation(IAssociation::TypeSession,$mac_function,$lifetime,null);
-	}
-
-	/**
-	 * @param $type
-	 * @param $mac_function
-	 * @param $lifetime
-	 * @param $realm
-	 * @return IAssociation
-	 */
-	private function buildAssociation($type,$mac_function,$lifetime,$realm){
-		$new_secret           = OpenIdCryptoHelper::generateSecret($mac_function);
-		$new_handle           = AssocHandleGenerator::generate();
-		$expires_in           = intval($lifetime);
-		$issued               = gmdate("Y-m-d H:i:s", time());
-		return new Association($new_handle, $new_secret, $mac_function, $expires_in, $issued, $type, $realm);
-	}
-
-	private function __clone()
-	{
-	}
-} 
\ No newline at end of file
diff --git a/app/libs/openid/model/Association.php b/app/libs/openid/model/Association.php
deleted file mode 100644
index 97d398dd..00000000
--- a/app/libs/openid/model/Association.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-namespace openid\model;
-
-/**
- * Class Association
- * @package openid\model
- */
-class Association implements IAssociation {
-
-	private $handle;
-	private $secret;
-	private $mac_function;
-	private $lifetime;
-	private $issued;
-	private $type;
-	private $realm;
-
-	public function __construct($handle, $secret, $mac_function, $lifetime, $issued, $type, $realm){
-		$this->handle =	$handle;
-		$this->secret = $secret;
-		$this->mac_function = $mac_function;
-		$this->lifetime = $lifetime;
-		$this->issued =  $issued;
-		$this->type = $type;
-		$this->realm = $realm;
-	}
-
-	public function getMacFunction()
-	{
-		return $this->mac_function;
-	}
-
-	public function setMacFunction($mac_function)
-	{
-		// TODO: Implement setMacFunction() method.
-	}
-
-	public function getSecret()
-	{
-		return $this->secret;
-	}
-
-	public function setSecret($secret)
-	{
-		// TODO: Implement setSecret() method.
-	}
-
-	public function getLifetime()
-	{
-		return intval($this->lifetime);
-	}
-
-	public function setLifetime($lifetime)
-	{
-		// TODO: Implement setLifetime() method.
-	}
-
-	public function getIssued()
-	{
-		return $this->issued;
-	}
-
-	public function setIssued($issued)
-	{
-		// TODO: Implement setIssued() method.
-	}
-
-	public function getType()
-	{
-		return $this->type;
-	}
-
-	public function setType($type)
-	{
-		// TODO: Implement setType() method.
-	}
-
-	public function getRealm()
-	{
-		return $this->realm;
-	}
-
-	public function setRealm($realm)
-	{
-		// TODO: Implement setRealm() method.
-	}
-
-	public function IsExpired()
-	{
-		// TODO: Implement IsExpired() method.
-	}
-
-	public function getRemainingLifetime()
-	{
-		// TODO: Implement getRemainingLifetime() method.
-	}
-
-	public function getHandle()
-	{
-		return $this->handle;
-	}
-}
\ No newline at end of file
diff --git a/app/libs/openid/model/IAssociation.php b/app/libs/openid/model/IAssociation.php
deleted file mode 100644
index 91d19cf5..00000000
--- a/app/libs/openid/model/IAssociation.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace openid\model;
-
-/**
- * Interface IAssociation
- * @package openid\model
- */
-interface IAssociation {
-
-    const TypePrivate = 1;
-    const TypeSession = 2;
-
-    public function getMacFunction();
-
-    public function setMacFunction($mac_function);
-
-    public function getSecret();
-
-    public function setSecret($secret);
-
-    public function getLifetime();
-
-    public function setLifetime($lifetime);
-
-    public function getIssued();
-
-    public function setIssued($issued);
-
-    public function getType();
-
-    public function setType($type);
-
-    public function getRealm();
-
-    public function setRealm($realm);
-
-    public function IsExpired();
-
-    public function getRemainingLifetime();
-
-	public function getHandle();
-
-}
\ No newline at end of file
diff --git a/app/libs/openid/requests/OpenIdRequest.php b/app/libs/openid/requests/OpenIdRequest.php
deleted file mode 100644
index 12e0be9f..00000000
--- a/app/libs/openid/requests/OpenIdRequest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace openid\requests;
-
-use openid\OpenIdMessage;
-
-/**
- * Class OpenIdRequest
- * @package openid\requests
- */
-abstract class OpenIdRequest
-{
-    /**
-     * @var OpenIdMessage
-     */
-    protected $message;
-
-    public function __construct(OpenIdMessage $message)
-    {
-        $this->message = $message;
-    }
-
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-    public function getMode()
-    {
-        return $this->message->getMode();
-    }
-
-    abstract public function isValid();
-
-    /**
-     * @param OpenIDProtocol_ * $param
-     * @return string
-     */
-    public function getParam($param)
-    {
-        return $this->message->getParam($param);
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->message->__toString();
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/responses/OpenIdAssociationSessionUnsuccessfulResponse.php b/app/libs/openid/responses/OpenIdAssociationSessionUnsuccessfulResponse.php
deleted file mode 100644
index 8ba5f20d..00000000
--- a/app/libs/openid/responses/OpenIdAssociationSessionUnsuccessfulResponse.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace openid\responses;
-
-use openid\OpenIdProtocol;
-
-/**
- * Class OpenIdAssociationSessionUnsuccessfulResponse
- * @package openid\responses
- */
-class OpenIdAssociationSessionUnsuccessfulResponse extends OpenIdDirectResponse
-{
-
-    public function __construct($error)
-    {
-        parent::__construct();
-        $this[OpenIdProtocol::OpenIDProtocol_Error] = $error;
-        $this[OpenIdProtocol::OpenIDProtocol_ErrorCode] = 'unsupported-type';
-        $this[OpenIdProtocol::OpenIDProtocol_SessionType] = OpenIdProtocol::AssociationSessionTypeDHSHA256;
-        $this[OpenIdProtocol::OpenIDProtocol_AssocType] = OpenIdProtocol::SignatureAlgorithmHMAC_SHA256;
-    }
-} 
\ No newline at end of file
diff --git a/app/libs/openid/responses/OpenIdDiffieHellmanAssociationSessionResponse.php b/app/libs/openid/responses/OpenIdDiffieHellmanAssociationSessionResponse.php
deleted file mode 100644
index ebde4bc5..00000000
--- a/app/libs/openid/responses/OpenIdDiffieHellmanAssociationSessionResponse.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace openid\responses;
-
-use openid\OpenIdProtocol;
-
-/**
- * Class OpenIdDiffieHellmanAssociationSessionResponse
- * @package openid\responses
- */
-class OpenIdDiffieHellmanAssociationSessionResponse extends OpenIdAssociationSessionResponse
-{
-
-    public function __construct($assoc_handle, $session_type, $assoc_type, $expires_in, $server_public, $enc_mac_key)
-    {
-        parent::__construct($assoc_handle, $session_type, $assoc_type, $expires_in);
-        $this[OpenIdProtocol::OpenIdProtocol_DHServerPublic] = $server_public;
-        $this[OpenIdProtocol::OpenIdProtocol_DHEncMacKey] = $enc_mac_key;
-    }
-} 
\ No newline at end of file
diff --git a/app/libs/openid/responses/OpenIdImmediateNegativeAssertion.php b/app/libs/openid/responses/OpenIdImmediateNegativeAssertion.php
deleted file mode 100644
index fde051d1..00000000
--- a/app/libs/openid/responses/OpenIdImmediateNegativeAssertion.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace openid\responses;
-
-use openid\OpenIdProtocol;
-
-/**
- * Class OpenIdImmediateNegativeAssertion
- * implements http://openid.net/specs/openid-authentication-2_0.html#negative_assertions
- * Negative Assertions
- * In Response to Immediate Requests
- * @package openid\responses
- */
-class OpenIdImmediateNegativeAssertion extends OpenIdIndirectResponse
-{
-
-    public function __construct($return_url = null)
-    {
-        parent::__construct();
-        $this->setMode(OpenIdProtocol::SetupNeededMode);
-        if (!is_null($return_url) && !empty($return_url)) {
-            $this->setReturnTo($return_url);
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/responses/OpenIdIndirectGenericErrorResponse.php b/app/libs/openid/responses/OpenIdIndirectGenericErrorResponse.php
deleted file mode 100644
index d2e06bf7..00000000
--- a/app/libs/openid/responses/OpenIdIndirectGenericErrorResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace openid\responses;
-
-use openid\helpers\OpenIdUriHelper;
-use openid\OpenIdProtocol;
-use openid\requests\OpenIdRequest;
-
-class OpenIdIndirectGenericErrorResponse extends OpenIdIndirectResponse
-{
-
-    public function __construct($error, $contact = null, $reference = null, OpenIdRequest $request = null)
-    {
-        parent::__construct();
-        $this->setHttpCode(self::HttpErrorResponse);
-        $this[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_Error)] = $error;
-        //opt values
-        if (!is_null($contact))
-            $this[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_Contact)] = $contact;
-        if (!is_null($reference))
-            $this[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_Reference)] = $reference;
-
-        if (!is_null($request)) {
-            $return_to = $request->getParam(OpenIdProtocol::OpenIDProtocol_ReturnTo);
-            if (!is_null($return_to) && !empty($return_to) && OpenIdUriHelper::checkReturnTo($return_to))
-                $this->setReturnTo($return_to);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/libs/openid/responses/OpenIdNonImmediateNegativeAssertion.php b/app/libs/openid/responses/OpenIdNonImmediateNegativeAssertion.php
deleted file mode 100644
index 55033792..00000000
--- a/app/libs/openid/responses/OpenIdNonImmediateNegativeAssertion.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace openid\responses;
-
-use openid\OpenIdProtocol;
-
-/**
- * Class OpenIdNonImmediateNegativeAssertion
- * implements http://openid.net/specs/openid-authentication-2_0.html#negative_assertions
- * Negative Assertions
- * In Response to Non-Immediate Requests
- * @package openid\responses
- */
-class OpenIdNonImmediateNegativeAssertion extends OpenIdIndirectResponse
-{
-
-    public function __construct($return_url = null)
-    {
-        parent::__construct();
-        $this->setMode(OpenIdProtocol::CancelMode);
-        if (!is_null($return_url) && !empty($return_url)) {
-            $this->setReturnTo($return_url);
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/libs/openid/responses/OpenIdResponse.php b/app/libs/openid/responses/OpenIdResponse.php
deleted file mode 100644
index a08638f5..00000000
--- a/app/libs/openid/responses/OpenIdResponse.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace openid\responses;
-
-use openid\OpenIdProtocol;
-use utils\http\HttpResponse;
-use openid\exceptions\InvalidOpenIdMessageMode;
-use openid\helpers\OpenIdErrorMessages;
-
-/**
- * Class OpenIdResponse
- * @package openid\responses
- */
-abstract class OpenIdResponse extends HttpResponse
-{
-
-    public function __construct($http_code, $content_type)
-    {
-        parent::__construct($http_code, $content_type);
-    }
-
-    protected function setMode($mode)
-    {
-        if (!OpenIdProtocol::isValidMode($mode))
-            throw new InvalidOpenIdMessageMode(sprintf(OpenIdErrorMessages::InvalidOpenIdMessageModeMessage, $mode));
-        $this->container[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_Mode)] = $mode;;
-    }
-
-}
\ No newline at end of file
diff --git a/app/libs/openid/responses/OpenIdUnencryptedAssociationSessionResponse.php b/app/libs/openid/responses/OpenIdUnencryptedAssociationSessionResponse.php
deleted file mode 100644
index 95b59c80..00000000
--- a/app/libs/openid/responses/OpenIdUnencryptedAssociationSessionResponse.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace openid\responses;
-
-use openid\OpenIdProtocol;
-
-/**
- * Class OpenIdUnencryptedAssociationSessionResponse
- * @package openid\responses
- */
-class OpenIdUnencryptedAssociationSessionResponse extends OpenIdAssociationSessionResponse
-{
-
-    /**
-     * @param $assoc_handle
-     * @param $session_type
-     * @param $assoc_type
-     * @param $expires_in
-     * @param $secret
-     */
-    public function __construct($assoc_handle, $session_type, $assoc_type, $expires_in, $secret)
-    {
-        parent::__construct($assoc_handle, $session_type, $assoc_type, $expires_in);
-        $this[OpenIdProtocol::OpenIdProtocol_MacKey] = base64_encode($secret);
-    }
-} 
\ No newline at end of file
diff --git a/app/libs/openid/services/IAssociationService.php b/app/libs/openid/services/IAssociationService.php
deleted file mode 100644
index f9e81c35..00000000
--- a/app/libs/openid/services/IAssociationService.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace openid\services;
-
-use openid\model\IAssociation;
-
-/**
- * Interface IAssociationService
- * @package openid\services
- */
-interface IAssociationService
-{
-    /** gets a given association by handle, and if association exists and its type is private, then lock it
-     *  to prevent subsequent usage ( private association could be used once)
-     * @param $handle
-     * @param null $realm
-     * @return null|IAssociation
-     * @throws \openid\exceptions\ReplayAttackException
-     * @throws \openid\exceptions\OpenIdInvalidRealmException
-     */
-    public function getAssociation($handle, $realm = null);
-
-
-	/**
-	 * @param IAssociation $association
-	 * @return IAssociation
-	 * @throws \openid\exceptions\ReplayAttackException
-	 */
-	public function addAssociation(IAssociation $association);
-
-    /**
-     * @param $handle
-     * @return bool
-     */
-    public function deleteAssociation($handle);
-
-}
\ No newline at end of file
diff --git a/app/libs/openid/services/IMementoOpenIdSerializerService.php b/app/libs/openid/services/IMementoOpenIdSerializerService.php
deleted file mode 100644
index e931ad97..00000000
--- a/app/libs/openid/services/IMementoOpenIdSerializerService.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace openid\services;
-
-use openid\requests\OpenIdMessageMemento;
-/**
- * Interface IMementoOpenIdSerializerService
- * @package openid\services
- */
-interface IMementoOpenIdSerializerService {
-
-    /**
-     * @param OpenIdMessageMemento $memento
-     * @return void
-     */
-    public function serialize(OpenIdMessageMemento $memento);
-
-    /**
-     * @return OpenIdMessageMemento
-     */
-    public function load();
-
-    /**
-     * @return void
-     */
-    public function forget();
-
-    /**
-     * @return bool
-     */
-    public function exists();
-}
\ No newline at end of file
diff --git a/app/libs/openid/services/INonceService.php b/app/libs/openid/services/INonceService.php
deleted file mode 100644
index 75403cae..00000000
--- a/app/libs/openid/services/INonceService.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace openid\services;
-
-use openid\model\OpenIdNonce;
-
-/**
- * Interface INonceService
- * @package openid\services
- */
-interface INonceService {
-
-    /**
-     * @return OpenIdNonce
-     */
-    public function generateNonce();
-
-    public function lockNonce(OpenIdNonce $nonce);
-
-    public function unlockNonce(OpenIdNonce $nonce);
-
-    public function associateNonce(OpenIdNonce $nonce, $signature, $realm);
-
-    /**
-     * To prevent replay attacks, the OP MUST NOT issue more than one verification response
-     * for each authentication response it had previously issued. An authentication response
-     * and its matching verification request may be identified by their "openid.response_nonce" values.
-     * @param OpenIdNonce $nonce
-     * @param $signature
-     * @param $realm
-     * @return mixed
-     */
-    public function markNonceAsInvalid(OpenIdNonce $nonce, $signature, $realm);
-} 
\ No newline at end of file
diff --git a/app/libs/openid/services/ITrustedSitesService.php b/app/libs/openid/services/ITrustedSitesService.php
deleted file mode 100644
index f96f5bb2..00000000
--- a/app/libs/openid/services/ITrustedSitesService.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace openid\services;
-
-use openid\model\IOpenIdUser;
-use Exception;
-use openid\model\ITrustedSite;
-
-/**
- * Interface ITrustedSitesService
- * @package openid\services
- */
-interface ITrustedSitesService {
-	/**
-	 * @param IOpenIdUser $user
-	 * @param             $realm
-	 * @param             $policy
-	 * @param array       $data
-	 * @return bool|ITrustedSite
-	 * @throws Exception
-	 */
-    public function addTrustedSite(IOpenIdUser $user, $realm, $policy, $data = array());
-
-	/**
-	 * @param $id
-	 * @return bool
-	 */
-	public function delTrustedSite($id);
-
-    /**
-     * @param IOpenIdUser $user
-     * @param $realm
-     * @param array $data
-     * @return mixed
-     */
-    public function getTrustedSites(IOpenIdUser $user, $realm, $data = array());
-
-}
\ No newline at end of file
diff --git a/app/libs/openid/services/IUserService.php b/app/libs/openid/services/IUserService.php
deleted file mode 100644
index 9bba28f6..00000000
--- a/app/libs/openid/services/IUserService.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-namespace openid\services;
-
-use openid\model\IOpenIdUser;
-
-/**
- * Interface IUserService
- * @package openid\services
- */
-interface IUserService
-{
-
-    /**
-     * @param int $id
-     * @return IOpenIdUser
-     */
-    public function get($id);
-
-
-    /**
-     * @param \Member $member
-     * @return IOpenIdUser
-     */
-    public function buildUser(\Member $member);
-
-    /**
-     * @param $identifier
-     * @return mixed
-     */
-    public function updateLastLoginDate($identifier);
-
-    /**
-     * @param $identifier
-     * @return mixed
-     */
-    public function updateFailedLoginAttempts($identifier);
-
-    /**
-     * @param $identifier
-     * @return mixed
-     */
-    public function lockUser($identifier);
-
-    /**
-     * @param $identifier
-     * @return void
-     */
-    public function unlockUser($identifier);
-
-    /**
-     * @param $identifier
-     * @return mixed
-     */
-    public function activateUser($identifier);
-
-    /**
-     * @param $identifier
-     * @return mixed
-     */
-    public function deActivateUser($identifier);
-
-    /**
-     * @param $identifier
-     * @param $show_pic
-     * @param $show_full_name
-     * @param $show_email
-     * @return mixed
-     */
-    public function saveProfileInfo($identifier, $show_pic, $show_full_name, $show_email);
-
-    /**
-     * @param int $page_nbr
-     * @param int $page_size
-     * @param array $filters
-     * @param array $fields
-     * @return mixed
-     */
-    public function getAll($page_nbr = 1, $page_size = 10, array $filters = array(), array $fields = array('*'));
-}
\ No newline at end of file
diff --git a/app/libs/openid/services/OpenIdServiceCatalog.php b/app/libs/openid/services/OpenIdServiceCatalog.php
deleted file mode 100644
index 3bb2b5e4..00000000
--- a/app/libs/openid/services/OpenIdServiceCatalog.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace openid\services;
-
-/**
- * Class OpenIdServiceCatalog
- * @package openid\services
- */
-abstract class OpenIdServiceCatalog
-{
-    const MementoSerializerService = 'openid\\services\\IMementoOpenIdSerializerService';
-    const AuthenticationStrategy = 'openid\\handlers\\IOpenIdAuthenticationStrategy';
-    const ServerExtensionsService = 'openid\\services\\IServerExtensionsService';
-    const AssociationService = 'openid\\services\\IAssociationService';
-    const TrustedSitesService = 'openid\\services\\ITrustedSitesService';
-    const ServerConfigurationService = 'openid\\services\\IServerConfigurationService';
-    const UserService = 'openid\\services\\IUserService';
-    const NonceService = 'openid\\services\\INonceService';
-}
\ No newline at end of file
diff --git a/app/libs/utils/.gitkeep b/app/libs/utils/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/libs/utils/IHttpResponseStrategy.php b/app/libs/utils/IHttpResponseStrategy.php
deleted file mode 100644
index c80e12a2..00000000
--- a/app/libs/utils/IHttpResponseStrategy.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace utils;
-
-/**
- * Interface IHttpResponseStrategy
- * Defines an interface to handle http responses
- * @package utils
- */
-interface IHttpResponseStrategy
-{
-    public function handle($response);
-} 
\ No newline at end of file
diff --git a/app/libs/utils/IPHelper.php b/app/libs/utils/IPHelper.php
deleted file mode 100644
index c2b4a379..00000000
--- a/app/libs/utils/IPHelper.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace utils;
-
-use Request;
-
-/**
- * Class IPHelper
- * @package utils
- */
-class IPHelper
-{
-    /**
-     * returns user current ip address
-     * @return string
-     */
-    public static function getUserIp()
-    {
-        $remote_address = Request::server('REMOTE_ADDR');
-        return $remote_address;
-    }
-} 
\ No newline at end of file
diff --git a/app/libs/utils/db/ITransactionService.php b/app/libs/utils/db/ITransactionService.php
deleted file mode 100644
index 5fbfff3d..00000000
--- a/app/libs/utils/db/ITransactionService.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace utils\db;
-
-use Closure;
-
-/**
- * Interface ITransactionService
- * @package utils\db
- */
-interface ITransactionService {
-	/**
-	 * Execute a Closure within a transaction.
-	 *
-	 * @param  Closure  $callback
-	 * @return mixed
-	 *
-	 * @throws \Exception
-	 */
-	public function transaction(Closure $callback);
-} 
\ No newline at end of file
diff --git a/app/libs/utils/exceptions/UnacquiredLockException.php b/app/libs/utils/exceptions/UnacquiredLockException.php
deleted file mode 100644
index 9c191787..00000000
--- a/app/libs/utils/exceptions/UnacquiredLockException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace utils\exceptions;
-
-use Exception;
-
-/**
- * Class UnacquiredLockException
- * @package utils\exceptions
- */
-class UnacquiredLockException extends Exception {
-
-    public function __construct($message = "")
-    {
-        $message = "Unacquired Lock : " . $message;
-        parent::__construct($message, 0, null);
-    }
-}
\ No newline at end of file
diff --git a/app/libs/utils/model/BaseModelEloquent.php b/app/libs/utils/model/BaseModelEloquent.php
deleted file mode 100644
index 98a31a41..00000000
--- a/app/libs/utils/model/BaseModelEloquent.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace utils\model;
-use Eloquent;
-use ReflectionClass;
-/**
- * Class BaseModelEloquent
- * @package utils\model
- */
-abstract class BaseModelEloquent extends Eloquent {
-
-    private $class = null;
-    /**
-     * @param $query
-     * @param array $filters
-     * @return mixed
-     */
-    public function scopeFilter($query, array $filters){
-        foreach($filters as $filter){
-            $query = $query->where($filter['name'],$filter['op'], $filter['value']);
-        }
-        return $query;
-    }
-
-    public function __construct($attributes = array())
-    {
-        parent::__construct($attributes);
-        $this->class  = new ReflectionClass(get_class($this));
-        if ($this->useSti()) {
-            $this->setAttribute($this->stiClassField, $this->class->getName());
-        }
-    }
-
-    private function useSti() {
-        return ($this->stiClassField && $this->stiBaseClass);
-    }
-
-    public function newQuery($excludeDeleted = true)
-    {
-        $builder = parent::newQuery($excludeDeleted);
-        // If I am using STI, and I am not the base class,
-        // then filter on the class name.
-        if ($this->useSti() && $this->stiBaseClass !== get_class($this)) {
-            $builder->where($this->stiClassField, "=", $this->class->getShortName());
-        }
-        return $builder;
-    }
-
-    public function newFromBuilder($attributes = array())
-    {
-        if ($this->useSti() && property_exists($attributes, $this->stiClassField) ) {
-            $class = $this->class->getName();
-            $instance = new $class;
-            $instance->exists = true;
-            $instance->setRawAttributes((array) $attributes, true);
-            return $instance;
-        } else {
-            return parent::newFromBuilder($attributes);
-        }
-    }
-} 
\ No newline at end of file
diff --git a/app/libs/utils/services/ICheckPointService.php b/app/libs/utils/services/ICheckPointService.php
deleted file mode 100644
index 0c2fc02a..00000000
--- a/app/libs/utils/services/ICheckPointService.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace utils\services;
-use Exception;
-
-/**
- * Interface ICheckPointService
- * Defines the contract to implement Checkpoint Pattern
- * depicted on Architectural Patterns for Enabling Application Security - Yoder/Barcalow
- * @package openid\services
- */
-interface ICheckPointService {
-
-    /**Check available securities policies
-     * @return boolean
-     */
-    public function check();
-
-    /**
-     * Keeps track of exceptions
-     * @param Exception $ex
-     * @return mixed
-     */
-    public function trackException(Exception $ex);
-
-    /**
-     * @param ISecurityPolicy $policy
-     * @return mixed
-     */
-    public function addPolicy(ISecurityPolicy $policy);
-} 
\ No newline at end of file
diff --git a/app/libs/utils/services/ILockManagerService.php b/app/libs/utils/services/ILockManagerService.php
deleted file mode 100644
index 104119fa..00000000
--- a/app/libs/utils/services/ILockManagerService.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace utils\services;
-use utils\exceptions\UnacquiredLockException;
-use Closure;
-/**
- * Interface ILockManagerService
- * @package utils\services
- */
-interface ILockManagerService {
-    /**
-     * @param $name
-     * @param int $lifetime
-     * @throws UnacquiredLockException
-     * @return mixed
-     */
-    public function acquireLock($name,$lifetime = 3600);
-
-    /**
-     * @param $name
-     * @return mixed
-     */
-    public function releaseLock($name);
-
-    /**
-     * @param $name
-     * @param Closure $callback
-     * @param int $lifetime
-     * @return mixed
-     */
-    public function lock($name, Closure $callback, $lifetime = 3600);
-}
\ No newline at end of file
diff --git a/app/libs/utils/services/ILogService.php b/app/libs/utils/services/ILogService.php
deleted file mode 100644
index b741f4b7..00000000
--- a/app/libs/utils/services/ILogService.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace utils\services;
-
-use Exception;
-
-/**
- * Interface ILogService
- * @package utils\services
- */
-interface ILogService {
-
-    public function error(Exception $exception);
-
-    public function warning(Exception $exception);
-
-    public function warning_msg($msg);
-
-    public function error_msg($msg);
-
-    public function info(Exception $exception);
-
-    public function debug_msg($msg);
-}
\ No newline at end of file
diff --git a/app/libs/utils/services/ISecurityPolicy.php b/app/libs/utils/services/ISecurityPolicy.php
deleted file mode 100644
index 3e32a0ff..00000000
--- a/app/libs/utils/services/ISecurityPolicy.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace utils\services;
-
-use Exception;
-
-/**
- * Interface ISecurityPolicy
- * implements Checkpoint Pattern
- * depicted on Architectural Patterns for Enabling Application Security - Yoder/Barcalow
- * Defines contract for a generic security policy
- * @package services
- */
-interface ISecurityPolicy {
-    /**
-     * Check if current security policy is meet or not
-     * @return boolean
-     */
-    public function check();
-
-    /**
-     * Apply security policy on a exception
-     * @param Exception $ex
-     * @return mixed
-     */
-    public function apply(Exception $ex);
-
-    public function setCounterMeasure(ISecurityPolicyCounterMeasure $counter_measure);
-} 
\ No newline at end of file
diff --git a/app/libs/utils/services/IdentifierGenerator.php b/app/libs/utils/services/IdentifierGenerator.php
deleted file mode 100644
index 660df2a2..00000000
--- a/app/libs/utils/services/IdentifierGenerator.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
-* Copyright 2015 OpenStack Foundation
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-**/
-
-namespace utils\services;
-
-use utils\model\Identifier;
-
-/**
- * Interface IdentifierGenerator
- * @package utils\services
- */
-interface IdentifierGenerator {
-
-    /**
-     * @param Identifier $identifier
-     * @return Identifier
-     */
-    public function generate(Identifier $identifier);
-}
\ No newline at end of file
diff --git a/app/libs/utils/services/ServiceLocator.php b/app/libs/utils/services/ServiceLocator.php
deleted file mode 100644
index 7009bab8..00000000
--- a/app/libs/utils/services/ServiceLocator.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace utils\services;
-
-use App;
-
-/**
- * Class ServiceLocator
- * @package utils\services
- */
-final class ServiceLocator
-{
-
-    private static $instance = null;
-
-    private function __construct()
-    {
-    }
-
-    public static function getInstance()
-    {
-        if (self::$instance == null)
-        {
-            self::$instance = new ServiceLocator();
-        }
-
-        return self::$instance;
-    }
-
-    public function getService($service_id)
-    {
-        $service =  App::make($service_id);
-        return $service;
-    }
-
-    private function __clone()
-    {
-    }
-}
\ No newline at end of file
diff --git a/app/libs/utils/services/UtilsServiceCatalog.php b/app/libs/utils/services/UtilsServiceCatalog.php
deleted file mode 100644
index a808a9d5..00000000
--- a/app/libs/utils/services/UtilsServiceCatalog.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace utils\services;
-
-/**
- * Class UtilsServiceCatalog
- * @package utils\services
- */
-final class UtilsServiceCatalog {
-
-    const CheckPointService          = 'utils\\services\\ICheckPointService';
-    const LogService                 = 'utils\\services\\ILogService';
-    const AuthenticationService      = 'utils\\services\\IAuthService';
-    const LockManagerService         = 'utils\\services\\ILockManagerService';
-    const ServerConfigurationService = 'utils\\services\\IServerConfigurationService';
-    const CacheService               = 'utils\\services\\ICacheService';
-    const BannedIpService            = 'utils\\services\\IBannedIPService';
-    const TransactionService         = 'utils\\db\\ITransactionService';
-} 
\ No newline at end of file
diff --git a/app/models/BannedIP.php b/app/models/BannedIP.php
deleted file mode 100644
index 07b0726e..00000000
--- a/app/models/BannedIP.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-use utils\model\BaseModelEloquent;
-
-/**
- * Class BannedIP
- */
-class BannedIP extends BaseModelEloquent
-{
-    protected $table = 'banned_ips';
-
-    public function user()
-    {
-        return $this->belongsTo('auth\User');
-    }
-} 
\ No newline at end of file
diff --git a/app/models/Group.php b/app/models/Group.php
deleted file mode 100644
index cf9d0e87..00000000
--- a/app/models/Group.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * Class Group
- */
-class Group  extends Eloquent {
-
-    protected $primaryKey ='ID';
-    protected $table = 'Group';
-    //external os members db (SS)
-    protected $connection = 'os_members';
-
-}
\ No newline at end of file
diff --git a/app/models/MemberPhoto.php b/app/models/MemberPhoto.php
deleted file mode 100644
index 3ef067c2..00000000
--- a/app/models/MemberPhoto.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-use utils\model\BaseModelEloquent;
-
-class MemberPhoto extends BaseModelEloquent
-{
-    protected $table = 'File';
-    //external os members db (SS)
-    protected $connection = 'os_members';
-}
\ No newline at end of file
diff --git a/app/models/ServerConfiguration.php b/app/models/ServerConfiguration.php
deleted file mode 100644
index 4439d492..00000000
--- a/app/models/ServerConfiguration.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-use utils\model\BaseModelEloquent;
-
-class ServerConfiguration extends BaseModelEloquent
-{
-    public $timestamps = false;
-    protected $table = 'server_configuration';
-} 
\ No newline at end of file
diff --git a/app/models/UserAction.php b/app/models/UserAction.php
deleted file mode 100644
index cdfdfa6d..00000000
--- a/app/models/UserAction.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-use utils\model\BaseModelEloquent;
-
-class UserAction extends BaseModelEloquent
-{
-
-    protected $table = 'user_actions';
-
-    public function user()
-    {
-        return $this->belongsTo('auth\User');
-    }
-}
\ No newline at end of file
diff --git a/app/models/UserExceptionTrail.php b/app/models/UserExceptionTrail.php
deleted file mode 100644
index 4746ed12..00000000
--- a/app/models/UserExceptionTrail.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-use utils\model\BaseModelEloquent;
-
-class UserExceptionTrail extends BaseModelEloquent {
-    protected $table = 'user_exceptions_trail';
-}
\ No newline at end of file
diff --git a/app/models/oauth2/AccessToken.php b/app/models/oauth2/AccessToken.php
deleted file mode 100644
index 66bf1926..00000000
--- a/app/models/oauth2/AccessToken.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Class AccessToken
- * Access Token Entity
- */
-class AccessToken extends Eloquent {
-
-    protected $fillable = array
-    (
-        'value',
-        'user_id',
-        'from_ip',
-        'associated_authorization_code',
-        'lifetime',
-        'scope',
-        'audience',
-        'created_at',
-        'updated_at',
-        'client_id',
-        'refresh_token_id'
-    );
-
-    protected $table = 'oauth2_access_token';
-
-    private $friendly_scopes;
-
-    public function refresh_token()
-    {
-        return $this->belongsTo('RefreshToken');
-    }
-
-    public function client(){
-        return $this->belongsTo('Client');
-    }
-
-    public function user(){
-        return $this->belongsTo('auth\User');
-    }
-
-    public function isVoid(){
-        //check lifetime...
-        $created_at = $this->created_at;
-        $created_at->add(new DateInterval('PT' . intval($this->lifetime) . 'S'));
-        $now        = new DateTime(gmdate("Y-m-d H:i:s", time()), new DateTimeZone("UTC"));
-        return ($now > $created_at);
-    }
-
-    public function getFriendlyScopes(){
-        return $this->friendly_scopes;
-    }
-
-    public function setFriendlyScopes($friendly_scopes){
-        $this->friendly_scopes = $friendly_scopes;
-    }
-
-    public function getRemainingLifetime()
-    {
-        //check is refresh token is stills alive... (ZERO is infinite lifetime)
-        if (intval($this->lifetime) == 0) return 0;
-        $created_at = new DateTime($this->created_at, new DateTimeZone("UTC"));
-        $created_at->add(new DateInterval('PT' . intval($this->lifetime) . 'S'));
-        $now = new DateTime(gmdate("Y-m-d H:i:s", time()), new DateTimeZone("UTC"));
-        //check validity...
-        if ($now > $created_at)
-            return -1;
-        $seconds = abs($created_at->getTimestamp() - $now->getTimestamp());;
-        return $seconds;
-    }
-} 
\ No newline at end of file
diff --git a/app/models/oauth2/OAuth2TrailException.php b/app/models/oauth2/OAuth2TrailException.php
deleted file mode 100644
index a816c8f4..00000000
--- a/app/models/oauth2/OAuth2TrailException.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-use utils\model\BaseModelEloquent;
-
-class OAuth2TrailException extends BaseModelEloquent {
-    protected $table = 'oauth2_exception_trail';
-} 
\ No newline at end of file
diff --git a/app/models/oauth2/RefreshToken.php b/app/models/oauth2/RefreshToken.php
deleted file mode 100644
index 78dae830..00000000
--- a/app/models/oauth2/RefreshToken.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * Class RefreshToken
- * Refresh Token Entity
- */
-class RefreshToken extends Eloquent {
-
-    protected $table = 'oauth2_refresh_token';
-
-    private $friendly_scopes;
-
-    protected $fillable = array('value', 'from_ip', 'lifetime','scope','audience','void','created_at','updated_at','client_id');
-
-    public function access_tokens()
-    {
-        return $this->hasMany('AccessToken');
-    }
-
-    public function client(){
-        return $this->belongsTo('Client');
-    }
-
-    public function user(){
-        return $this->belongsTo('auth\User');
-    }
-
-    public function isVoid(){
-        if(intval($this->lifetime) == 0) return false;
-        //check lifetime...
-        $created_at = $this->created_at;
-        $created_at->add(new DateInterval('PT' . intval($this->lifetime) . 'S'));
-        $now        = new DateTime(gmdate("Y-m-d H:i:s", time()), new DateTimeZone("UTC"));
-        return ($now > $created_at);
-    }
-
-
-    public function getRemainingLifetime()
-    {
-        //check is refresh token is stills alive... (ZERO is infinite lifetime)
-        if (intval($this->lifetime) == 0) return 0;
-        $created_at = new DateTime($this->created_at, new DateTimeZone("UTC"));
-        $created_at->add(new DateInterval('PT' . intval($this->lifetime) . 'S'));
-        $now = new DateTime(gmdate("Y-m-d H:i:s", time()), new DateTimeZone("UTC"));
-        //check validity...
-        if ($now > $created_at)
-            return -1;
-        $seconds = abs($created_at->getTimestamp() - $now->getTimestamp());;
-        return $seconds;
-    }
-
-    public function getFriendlyScopes(){
-        return $this->friendly_scopes;
-    }
-
-    public function setFriendlyScopes($friendly_scopes){
-        $this->friendly_scopes = $friendly_scopes;
-    }
-} 
\ No newline at end of file
diff --git a/app/models/oauth2/UserConsent.php b/app/models/oauth2/UserConsent.php
deleted file mode 100644
index 1463f22d..00000000
--- a/app/models/oauth2/UserConsent.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-use  oauth2\models\IUserConsent;
-use utils\model\BaseModelEloquent;
-/**
- * Class UserConsent
- */
-class UserConsent extends BaseModelEloquent implements IUserConsent {
-
-    protected $table = 'oauth2_user_consents';
-
-    public function user()
-    {
-        return $this->belongsTo('auth\User');
-    }
-
-    public function client()
-    {
-        return $this->belongsTo('Client');
-    }
-
-    public function getScope()
-    {
-        return $this->scope;
-    }
-
-    public function getClient()
-    {
-        return $this->client()->first();
-    }
-
-    public function getUser()
-    {
-        return $this->user()->first();
-    }
-}
\ No newline at end of file
diff --git a/app/models/openid/IOpenIdAssociationRepository.php b/app/models/openid/IOpenIdAssociationRepository.php
deleted file mode 100644
index 45aa0f87..00000000
--- a/app/models/openid/IOpenIdAssociationRepository.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-namespace openid\repositories;
-use OpenIdAssociation;
-
-/**
- * Interface IOpenIdAssociationRepository
- * @package openid\repositories
- */
-interface  IOpenIdAssociationRepository {
-	public function add(OpenIdAssociation $a);
-	public function deleteById($id);
-	public function delete(OpenIdAssociation $a);
-	public function get($id);
-	public function getByHandle($handle);
-} 
\ No newline at end of file
diff --git a/app/models/openid/IOpenIdTrustedSiteRepository.php b/app/models/openid/IOpenIdTrustedSiteRepository.php
deleted file mode 100644
index 4b04feca..00000000
--- a/app/models/openid/IOpenIdTrustedSiteRepository.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-namespace openid\repositories;
-use OpenIdTrustedSite;
-
-/**
- * Interface IOpenIdTrustedSiteRepository
- * @package openid\repositories
- */
-interface  IOpenIdTrustedSiteRepository {
-	/**
-	 * @param OpenIdTrustedSite $s
-	 * @return bool
-	 */
-	public function add(OpenIdTrustedSite $s);
-	public function deleteById($id);
-	public function delete(OpenIdTrustedSite $s);
-	public function get($id);
-
-	/**
-	 * @param int   $user_id
-	 * @param array $sub_domains
-	 * @param array $data
-	 * @return array
-	 */
-	public function getMatchingOnesByUserId($user_id, array $sub_domains, array $data);
-
-} 
\ No newline at end of file
diff --git a/app/models/openid/OpenIdTrustedSite.php b/app/models/openid/OpenIdTrustedSite.php
deleted file mode 100644
index c1afb5d3..00000000
--- a/app/models/openid/OpenIdTrustedSite.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-use openid\model\ITrustedSite;
-
-class OpenIdTrustedSite extends Eloquent implements ITrustedSite
-{
-
-	protected $fillable = array('realm','user_id', 'policy', 'data');
-
-    public $timestamps = false;
-    protected $table = 'openid_trusted_sites';
-
-    public function getRealm()
-    {
-        return $this->realm;
-    }
-
-    public function getUITrustedData()
-    {
-        $data = $this->getData();
-        $str = '';
-        foreach ($data as $val) {
-            $str .= $val . ', ';
-        }
-        return trim($str, ', ');
-    }
-
-    public function getData()
-    {
-        $res = is_null($this->data)?'[]':$this->data;
-        return json_decode($res);
-    }
-
-    public function getUser()
-    {
-        return $this->user();
-    }
-
-    public function user()
-    {
-        return $this->belongsTo('auth\User');
-    }
-
-    public function getAuthorizationPolicy()
-    {
-        return $this->policy;
-    }
-
-}
\ No newline at end of file
diff --git a/app/models/openid/ServerExtension.php b/app/models/openid/ServerExtension.php
deleted file mode 100644
index 2f27eaf5..00000000
--- a/app/models/openid/ServerExtension.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class ServerExtension extends Eloquent
-{
-    protected $table = 'server_extensions';
-}
\ No newline at end of file
diff --git a/app/repositories/EloquentMemberRepository.php b/app/repositories/EloquentMemberRepository.php
deleted file mode 100644
index 3df79e9d..00000000
--- a/app/repositories/EloquentMemberRepository.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace repositories;
-
-use auth\IMemberRepository;
-use Member;
-use utils\services\ILogService;
-
-/**
- * Class EloquentMemberRepository
- * @package repositories
- */
-class EloquentMemberRepository implements IMemberRepository
-{
-
-	private $member;
-	private $log_service;
-
-    /**
-     * @param Member $member
-     * @param ILogService $log_service
-     */
-    public function __construct(Member $member, ILogService $log_service)
-    {
-        $this->member = $member;
-        $this->log_service = $log_service;
-    }
-	/**
-	 * @param $id
-	 * @return Member
-	 */
-	public function get($id)
-	{
-		return $this->member->find($id);
-	}
-
-	/**
-	 * @param $email
-	 * @return Member
-	 */
-	public function getByEmail($email)
-	{
-		return $this->member->where('Email', '=', $email)->first();
-	}
-}
\ No newline at end of file
diff --git a/app/repositories/EloquentOpenIdAssociationRepository.php b/app/repositories/EloquentOpenIdAssociationRepository.php
deleted file mode 100644
index 1ebd331a..00000000
--- a/app/repositories/EloquentOpenIdAssociationRepository.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace repositories;
-
-use openid\repositories\IOpenIdAssociationRepository;
-use OpenIdAssociation;
-
-/**
- * Class EloquentOpenIdAssociationRepository
- * @package repositories
- */
-class EloquentOpenIdAssociationRepository implements IOpenIdAssociationRepository
-{
-
-    private $association;
-
-    public function __construct(OpenIdAssociation $association)
-    {
-        $this->association = $association;
-    }
-
-    public function add(OpenIdAssociation $a)
-    {
-        return $a->Save();
-    }
-
-    public function deleteById($id)
-    {
-        return $this->delete($this->get($id));
-    }
-
-    public function getByHandle($handle)
-    {
-        return $this->association->where('identifier', '=', $handle)->first();
-    }
-
-    public function delete(OpenIdAssociation $a)
-    {
-        if (!is_null($a)) {
-            return $a->delete();
-        }
-
-        return false;
-    }
-
-    public function get($id)
-    {
-        return $this->association->find($id);
-    }
-}
\ No newline at end of file
diff --git a/app/repositories/EloquentOpenIdTrustedSiteRepository.php b/app/repositories/EloquentOpenIdTrustedSiteRepository.php
deleted file mode 100644
index 0d994896..00000000
--- a/app/repositories/EloquentOpenIdTrustedSiteRepository.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-namespace repositories;
-use openid\repositories\IOpenIdTrustedSiteRepository;
-use OpenIdTrustedSite;
-
-class EloquentOpenIdTrustedSiteRepository implements  IOpenIdTrustedSiteRepository {
-
-	private $openid_trusted_site;
-
-	public function __construct(OpenIdTrustedSite $openid_trusted_site){
-		$this->openid_trusted_site = $openid_trusted_site;
-	}
-	/**
-	 * @param OpenIdTrustedSite $s
-	 * @return bool
-	 */
-	public function add(OpenIdTrustedSite $s)
-	{
-		return $s->Save();
-	}
-
-	public function deleteById($id)
-	{
-		return $this->delete($this->get($id));
-	}
-
-	public function delete(OpenIdTrustedSite $s)
-	{
-		if(!is_null($s))
-			return $s->delete();
-		return false;
-	}
-
-	public function get($id)
-	{
-		return $this->openid_trusted_site->find($id);
-	}
-
-	/**
-	 * @param int   $user_id
-	 * @param array $sub_domains
-	 * @param array $data
-	 * @return array
-	 */
-	public function getMatchingOnesByUserId($user_id, array $sub_domains, array $data)
-	{
-		$query = $this->openid_trusted_site->where("user_id", "=", intval($user_id));
-		//add or condition for all given sub-domains
-		if (count($sub_domains)) {
-			$query = $query->where(function ($query) use ($sub_domains) {
-				foreach ($sub_domains as $sub_domain) {
-					$query = $query->orWhere(function ($query_aux) use ($sub_domain) {
-						$query_aux->where('realm', '=', $sub_domain);
-					});
-				}
-			});
-		}
-		//add conditions for all possible pre approved data
-		foreach ($data as $value) {
-			$query = $query->where("data", "LIKE", '%"' . $value . '"%');
-		}
-		return $query->get();
-	}
-}
\ No newline at end of file
diff --git a/app/repositories/RepositoriesProvider.php b/app/repositories/RepositoriesProvider.php
deleted file mode 100644
index f4047349..00000000
--- a/app/repositories/RepositoriesProvider.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace repositories;
-
-use App;
-use Illuminate\Support\ServiceProvider;
-
-/**
- * Class RepositoriesProvider
- * @package repositories
- */
-class RepositoriesProvider extends ServiceProvider
-{
-    protected $defer = false;
-
-    public function boot()
-    {
-    }
-
-    public function register()
-    {
-        App::singleton('openid\repositories\IOpenIdAssociationRepository', 'repositories\EloquentOpenIdAssociationRepository');
-        App::singleton('openid\repositories\IOpenIdTrustedSiteRepository', 'repositories\EloquentOpenIdTrustedSiteRepository');
-        App::singleton('auth\IUserRepository', 'repositories\EloquentUserRepository');
-        App::singleton('auth\IMemberRepository', 'repositories\EloquentMemberRepository');
-        App::singleton('oauth2\repositories\IClientPublicKeyRepository', 'repositories\EloquentClientPublicKeyRepository');
-        App::singleton('oauth2\repositories\IServerPrivateKeyRepository', 'repositories\EloquentServerPrivateKeyRepository');
-        App::singleton('oauth2\repositories\IClientRepository', 'repositories\EloquentClientRepository');
-        App::singleton('oauth2\repositories\IApiScopeGroupRepository', 'repositories\EloquentApiScopeGroupRepository');
-    }
-}
\ No newline at end of file
diff --git a/app/routes.php b/app/routes.php
deleted file mode 100644
index c2f6a3ad..00000000
--- a/app/routes.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-
-/*
-|--------------------------------------------------------------------------
-| Application Routes
-|--------------------------------------------------------------------------
-|
-| Here is where you can register all of the routes for an application.
-| It's a breeze. Simply tell Laravel the URIs it should respond to
-| and give it the Closure to execute when that URI is requested.
-|
-*/
-
-Route::pattern('id', '[0-9]+');
-Route::pattern('uri_id', '[0-9]+');
-Route::pattern('active', '(true|false)');
-Route::pattern('hint', '(access-token|refresh-token)');
-Route::pattern('scope_id', '[0-9]+');
-
-Route::group(array("before" => "ssl"), function () {
-
-    Route::get('/', "HomeController@index");
-    Route::get('/discovery', "DiscoveryController@idp");
-    /*
-    * If the Claimed Identifier was not previously discovered by the Relying Party
-    * (the "openid.identity" in the request was "http://specs.openid.net/auth/2.0/identifier_select"
-    * or a different Identifier, or if the OP is sending an unsolicited positive assertion),
-    * the Relying Party MUST perform discovery on the Claimed Identifier in
-    * the response to make sure that the OP is authorized to make assertions about the Claimed Identifier.
-    */
-    Route::get("/{identifier}", "UserController@getIdentity");
-    Route::get("/accounts/user/ud/{identifier}",
-        "DiscoveryController@user")->where(array('identifier' => '[\d\w\.\#]+'));
-
-    //op endpoint url
-    Route::post('/accounts/openid2', 'OpenIdProviderController@endpoint');
-    Route::get('/accounts/openid2', 'OpenIdProviderController@endpoint');
-
-    //user interaction
-    Route::get('/accounts/user/login', "UserController@getLogin");
-    Route::post('/accounts/user/login', "UserController@postLogin");
-    Route::get('/accounts/user/login/cancel', "UserController@cancelLogin");
-});
-
-//oauth2 endpoints
-
-Route::group( array( 'before' => 'ssl|oauth2.enabled' ), function () {
-    Route::get('/.well-known/openid-configuration',"OAuth2ProviderController@discovery");
-});
-
-Route::group(array('prefix' => 'oauth2', 'before' => 'ssl|oauth2.enabled'), function () {
-    Route::get('/check-session',"OAuth2ProviderController@checkSessionIFrame");
-    Route::get('/end-session',"OAuth2ProviderController@endSession");
-    Route::get('/end-session/cancel',"OAuth2ProviderController@cancelLogout");
-    Route::post('/end-session',"OAuth2ProviderController@endSession");
-
-    //authorization endpoint
-    Route::any('/auth', "OAuth2ProviderController@authorize");
-    // OIDC
-    // certificates
-    Route::get('/certs',"OAuth2ProviderController@certs");
-    // discovery document
-    Route::get('/.well-known/openid-configuration',"OAuth2ProviderController@discovery");
-    //token endpoint
-    Route::group(array('prefix' => 'token'), function () {
-        Route::post('/', "OAuth2ProviderController@token");
-        Route::post('/revoke', "OAuth2ProviderController@revoke");
-        Route::post('/introspection', "OAuth2ProviderController@introspection");
-    });
-});
-
-Route::group(array("before" => array("ssl", "auth")), function () {
-    Route::get('/accounts/user/consent', "UserController@getConsent");
-    Route::post('/accounts/user/consent', "UserController@postConsent");
-    Route::any("/accounts/user/logout", "UserController@logout");
-    Route::any("/accounts/user/profile", "UserController@getProfile");
-    Route::any("/accounts/user/profile/trusted_site/delete/{id}", "UserController@deleteTrustedSite");
-    Route::post('/accounts/user/profile/update', 'UserController@postUserProfileOptions');
-});
-
-Route::group(array('prefix' => 'admin', 'before' => 'ssl|auth'), function () {
-    //client admin UI
-    Route::get('clients/edit/{id}', array('before' => 'oauth2.enabled|user.can.edit.client.policy', 'uses' => 'AdminController@editRegisteredClient'));
-    Route::get('clients', array('before' => 'oauth2.enabled', 'uses' => 'AdminController@listOAuth2Clients'));
-    Route::get('/grants', array('before' => 'oauth2.enabled', 'uses' => 'AdminController@editIssuedGrants'));
-    //oauth2 server admin UI
-    Route::group(array('before' => 'oauth2.enabled|oauth2.server.admin'), function () {
-        Route::get('/api-scope-groups', 'AdminController@listApiScopeGroups');
-        Route::get('/api-scope-groups/{id}', 'AdminController@editApiScopeGroup');
-        Route::get('/resource-servers', 'AdminController@listResourceServers');
-        Route::get('/resource-server/{id}', 'AdminController@editResourceServer');
-        Route::get('/api/{id}', 'AdminController@editApi');
-        Route::get('/scope/{id}', 'AdminController@editScope');
-        Route::get('/endpoint/{id}', 'AdminController@editEndpoint');
-        Route::get('/locked-clients', 'AdminController@listLockedClients');
-        // server private keys
-        Route::get('/private-keys', 'AdminController@listServerPrivateKeys');
-    });
-
-    Route::group(array('before' => 'openstackid.server.admin'), function () {
-        Route::get('/locked-users', 'AdminController@listLockedUsers');
-        Route::get('/server-config', 'AdminController@listServerConfig');
-        Route::post('/server-config', 'AdminController@saveServerConfig');
-        Route::get('/banned-ips', 'AdminController@listBannedIPs');
-    });
-});
-
-//Admin Backend API
-Route::group(array('prefix' => 'admin/api/v1', 'before' => 'ssl|auth'), function () {
-    Route::group(array('prefix' => 'users'), function () {
-        Route::delete('/{id}/locked',array('before' => 'openstackid.server.admin.json', 'uses' => 'UserApiController@unlock'));
-        Route::delete('/{id}/token/{value}', array('before' => 'is.current.user', 'uses' => 'UserApiController@revokeToken'));
-        Route::get('/fetch', array('before' => 'user.logged', 'uses' => "UserApiController@fetch"));
-    });
-
-    Route::group(array('prefix' => 'banned-ips', 'before' => 'openstackid.server.admin.json'), function () {
-        Route::get('/{id}', "ApiBannedIPController@get");
-        Route::get('/', "ApiBannedIPController@getByPage");
-        Route::delete('/{id?}', "ApiBannedIPController@delete");
-    });
-
-    //client api
-    Route::group(array('prefix' => 'clients'), function () {
-
-        // public keys
-        Route::post('/{id}/public_keys', array('before' => 'user.can.edit.client.policy', 'uses' => 'ClientPublicKeyApiController@create'));
-        Route::get('/{id}/public_keys', array('before' => 'user.can.edit.client.policy', 'uses' => 'ClientPublicKeyApiController@getByPage'));
-        Route::delete('/{id}/public_keys/{public_key_id}', array('before' => 'user.can.edit.client.policy', 'uses' => 'ClientPublicKeyApiController@delete'));
-        Route::put('/{id}/public_keys/{public_key_id}', array('before' => 'user.can.edit.client.policy', 'uses' => 'ClientPublicKeyApiController@update'));
-
-        Route::post('/', array('before' => 'is.current.user', 'uses' => 'ClientApiController@create'));
-        Route::put('/', array('before' => 'user.can.edit.client.policy', 'uses' => 'ClientApiController@update'));
-        Route::get('/{id}', "ClientApiController@get");
-        Route::get('/', array('before' => 'is.current.user', 'uses' => 'ClientApiController@getByPage'));
-        Route::delete('/{id}', array('before' => 'user.owns.client.policy', 'uses' => 'ClientApiController@delete'));
-        //allowed redirect uris endpoints
-        Route::get('/{id}/uris', array('before' => 'user.can.edit.client.policy', 'uses' => 'ClientApiController@getRegisteredUris'));
-        Route::post('/{id}/uris', array('before' => 'user.can.edit.client.policy', 'uses' => 'ClientApiController@addAllowedRedirectUri'));
-        Route::delete('/{id}/uris/{uri_id}',  array('before' => 'user.can.edit.client.policy', 'uses' => 'ClientApiController@deleteClientAllowedUri'));
-
-        //allowed origin endpoints endpoints
-        Route::get('/{id}/origins', array('before' => 'user.can.edit.client.policy', 'uses' => 'ClientApiController@geAllowedOrigins'));
-        Route::post('/{id}/origins', array('before' => 'user.can.edit.client.policy', 'uses' => 'ClientApiController@addAllowedOrigin'));
-        Route::delete('/{id}/origins/{origin_id}', array('before' => 'user.can.edit.client.policy', 'uses' => 'ClientApiController@deleteClientAllowedOrigin'));
-        Route::delete('/{id}/lock', array('before' => 'openstackid.server.admin.json', 'uses' => 'ClientApiController@unlock'));
-        Route::put('/{id}/secret', array('before' => 'user.owns.client.policy', 'uses' => 'ClientApiController@regenerateClientSecret'));
-        Route::put('/{id}/use-refresh-token', array('before' => 'user.can.edit.client.policy', 'uses' => 'ClientApiController@setRefreshTokenClient'));
-        Route::put('/{id}/rotate-refresh-token', array('before' => 'user.can.edit.client.policy', 'uses' => 'ClientApiController@setRotateRefreshTokenPolicy'));
-        Route::get('/{id}/access-token', array('before' => 'user.can.edit.client.policy', 'uses' => 'ClientApiController@getAccessTokens'));
-        Route::get('/{id}/refresh-token', array('before' => 'user.can.edit.client.policy', 'uses' => 'ClientApiController@getRefreshTokens'));
-        Route::delete('/{id}/token/{value}/{hint}', array('before' => 'user.can.edit.client.policy', 'uses' => 'ClientApiController@revokeToken'));
-        Route::put('/{id}/scopes/{scope_id}', array('before' => 'user.can.edit.client.policy', 'uses' => 'ClientApiController@addAllowedScope'));
-        Route::delete('/{id}/scopes/{scope_id}', array('before' => 'user.can.edit.client.policy', 'uses' => 'ClientApiController@removeAllowedScope'));
-        Route::put('/{id}/active', array('before' => 'user.owns.client.policy', 'uses' => 'ClientApiController@activate'));
-        Route::delete('/{id}/active', array('before' => 'user.owns.client.policy', 'uses' => 'ClientApiController@deactivate'));
-
-    });
-
-    // resource servers
-    Route::group(array('prefix' => 'resource-servers', 'before' => 'oauth2.server.admin.json'), function () {
-        Route::get('/{id}', "ApiResourceServerController@get");
-        Route::get('/', "ApiResourceServerController@getByPage");
-        Route::post('/', "ApiResourceServerController@create");
-        Route::delete('/{id}', "ApiResourceServerController@delete");
-        Route::put('/', "ApiResourceServerController@update");
-        Route::put('/{id}/client-secret', "ApiResourceServerController@regenerateClientSecret");
-        Route::put('/{id}/active', "ApiResourceServerController@activate");
-        Route::delete('/{id}/active', "ApiResourceServerController@deactivate");
-    });
-
-    // api scope groups
-    Route::group(array('prefix' => 'api-scope-groups', 'before' => 'oauth2.server.admin.json'), function () {
-        Route::get('/{id}', "ApiScopeGroupController@get");
-        Route::get('/', "ApiScopeGroupController@getByPage");
-        Route::put('/', "ApiScopeGroupController@update");
-        Route::post('/', "ApiScopeGroupController@create");
-        Route::delete('/{id}', "ApiScopeGroupController@delete");
-        Route::put('/{id}/active', "ApiScopeGroupController@activate");
-        Route::delete('/{id}/active', "ApiScopeGroupController@deactivate");
-    });
-
-    // apis
-    Route::group(array('prefix' => 'apis', 'before' => 'oauth2.server.admin.json'), function () {
-        Route::get('/{id}', "ApiController@get");
-        Route::get('/', "ApiController@getByPage");
-        Route::post('/', "ApiController@create");
-        Route::delete('/{id}', "ApiController@delete");
-        Route::put('/', "ApiController@update");
-        Route::put('/{id}/active', "ApiController@activate");
-        Route::delete('/{id}/active', "ApiController@deactivate");
-    });
-
-    // scopes
-    Route::group(array('prefix' => 'scopes', 'before' => 'oauth2.server.admin.json'), function () {
-        Route::get('/{id}', "ApiScopeController@get");
-        Route::get('/', "ApiScopeController@getByPage");
-        Route::post('/', "ApiScopeController@create");
-        Route::delete('/{id}', "ApiScopeController@delete");
-        Route::put('/', "ApiScopeController@update");
-        Route::put('/{id}/active', "ApiScopeController@activate");
-        Route::delete('/{id}/active', "ApiScopeController@deactivate");
-    });
-
-    // endpoints
-    Route::group(array('prefix' => 'endpoints', 'before' => 'oauth2.server.admin.json'), function () {
-        Route::get('/{id}', "ApiEndpointController@get");
-        Route::get('/', "ApiEndpointController@getByPage");
-        Route::post('/', "ApiEndpointController@create");
-        Route::delete('/{id}', "ApiEndpointController@delete");
-        Route::put('/', "ApiEndpointController@update");
-        Route::put('/{id}/scope/{scope_id}', "ApiEndpointController@addRequiredScope");
-        Route::delete('/{id}/scope/{scope_id}', "ApiEndpointController@removeRequiredScope");
-        Route::put('/{id}/active', "ApiEndpointController@activate");
-        Route::delete('/{id}/active', "ApiEndpointController@deactivate");
-    });
-
-    // private keys
-    Route::group(array('prefix' => 'private-keys', 'before' => 'oauth2.server.admin.json'), function () {
-        Route::get('/', "ServerPrivateKeyApiController@getByPage");
-        Route::post('/', "ServerPrivateKeyApiController@create");
-        Route::delete('/{id}', "ServerPrivateKeyApiController@delete");
-        Route::put('/{id}', "ServerPrivateKeyApiController@update");
-    });
-
-});
-
-//OAuth2 Protected API
-Route::group(array(
-    'prefix' => 'api/v1',
-    'before' => 'ssl|oauth2.enabled|oauth2.protected.endpoint',
-    'after' => ''
-), function () {
-
-    Route::group(array('prefix' => 'users'), function () {
-        Route::get('/me', 'OAuth2UserApiController@me');
-        Route::get('/info', 'OAuth2UserApiController@userInfo');
-        Route::post('/info', 'OAuth2UserApiController@userInfo');
-    });
-});
\ No newline at end of file
diff --git a/app/services/IUserActionService.php b/app/services/IUserActionService.php
deleted file mode 100644
index 59827f97..00000000
--- a/app/services/IUserActionService.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace services;
-
-use openid\model\IOpenIdUser;
-
-interface IUserActionService
-{
-
-    const LoginAction = 'LOGIN';
-    const CancelLoginAction = 'CANCEL_LOGIN';
-    const LogoutAction = 'LOGOUT';
-    const ConsentAction = 'CONSENT';
-
-    public function addUserAction(IOpenIdUser $user, $ip, $action, $realm=null);
-} 
\ No newline at end of file
diff --git a/app/services/ServicesProvider.php b/app/services/ServicesProvider.php
deleted file mode 100644
index f8753f47..00000000
--- a/app/services/ServicesProvider.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-namespace services;
-
-use Illuminate\Support\ServiceProvider;
-use utils\services\UtilsServiceCatalog;
-use services\oauth2\ResourceServer;
-use services\utils\CheckPointService;
-use App;
-
-/**
- * Class ServicesProvider
- * @package services
- */
-class ServicesProvider extends ServiceProvider
-{
-    protected $defer = false;
-
-    public function boot(){
-    }
-
-    public function register(){
-
-        App::singleton('services\\IUserActionService', 'services\\UserActionService');
-        App::singleton("services\\DelayCounterMeasure", 'services\\DelayCounterMeasure');
-        App::singleton("services\\LockUserCounterMeasure", 'services\\LockUserCounterMeasure');
-        App::singleton("services\\RevokeAuthorizationCodeRelatedTokens", 'services\\RevokeAuthorizationCodeRelatedTokens');
-        App::singleton("services\\BlacklistSecurityPolicy", 'services\\BlacklistSecurityPolicy');
-        App::singleton("services\\LockUserSecurityPolicy", 'services\\LockUserSecurityPolicy');
-        App::singleton("services\\OAuth2LockClientCounterMeasure", 'services\\OAuth2LockClientCounterMeasure');
-        App::singleton("services\\OAuth2SecurityPolicy", 'services\\OAuth2SecurityPolicy');
-        App::singleton("services\\AuthorizationCodeRedeemPolicy", 'services\\AuthorizationCodeRedeemPolicy');
-
-        App::singleton(UtilsServiceCatalog::CheckPointService,
-            function(){
-                //set security policies
-                $delay_counter_measure = App::make("services\\DelayCounterMeasure");
-
-                $blacklist_security_policy = App::make("services\\BlacklistSecurityPolicy");
-                $blacklist_security_policy->setCounterMeasure($delay_counter_measure);
-
-                $revoke_tokens_counter_measure = App::make("services\\RevokeAuthorizationCodeRelatedTokens");
-
-                $authorization_code_redeem_Policy = App::make("services\\AuthorizationCodeRedeemPolicy");
-                $authorization_code_redeem_Policy->setCounterMeasure($revoke_tokens_counter_measure);
-
-                $lock_user_counter_measure = App::make("services\\LockUserCounterMeasure");
-
-                $lock_user_security_policy = App::make("services\\LockUserSecurityPolicy");
-                $lock_user_security_policy->setCounterMeasure($lock_user_counter_measure);
-
-                $oauth2_lock_client_counter_measure = App::make("services\\OAuth2LockClientCounterMeasure");
-                $oauth2_security_policy             = App::make("services\\OAuth2SecurityPolicy");
-                $oauth2_security_policy->setCounterMeasure($oauth2_lock_client_counter_measure);
-
-                $checkpoint_service = new CheckPointService($blacklist_security_policy);
-                $checkpoint_service->addPolicy($lock_user_security_policy);
-                $checkpoint_service->addPolicy($authorization_code_redeem_Policy);
-                $checkpoint_service->addPolicy($oauth2_security_policy);
-                return $checkpoint_service;
-            });
-
-    }
-
-    public function provides()
-    {
-        return array('application.services');
-    }
-}
\ No newline at end of file
diff --git a/app/services/UserActionService.php b/app/services/UserActionService.php
deleted file mode 100644
index 36b59e24..00000000
--- a/app/services/UserActionService.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace services;
-
-use auth\User;
-use Exception;
-use openid\model\IOpenIdUser;
-use UserAction;
-
-class UserActionService implements IUserActionService
-{
-
-    public function addUserAction(IOpenIdUser $user, $ip, $user_action, $realm=null)
-    {
-        try {
-            $action = new UserAction();
-            $action->from_ip     = $ip;
-            $action->user_action = $user_action;
-            $action->realm       = $realm;
-            $user = User::find($user->getId());
-            if ($user) {
-                $user->actions()->save($action);
-                return true;
-            }
-            return false;
-        } catch (Exception $ex) {
-            Log::error($ex);
-            return false;
-        }
-    }
-} 
\ No newline at end of file
diff --git a/app/services/facades/ServerConfigurationService.php b/app/services/facades/ServerConfigurationService.php
deleted file mode 100644
index d871e18e..00000000
--- a/app/services/facades/ServerConfigurationService.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace services\facades;
-
-use Illuminate\Support\Facades\Facade;
-/**
- * Class ServerConfigurationService
- * @package services\facades
- */
-class ServerConfigurationService extends Facade {
-
-    protected static function getFacadeAccessor()
-    {
-        return 'serverconfigurationservice';
-    }
-} 
\ No newline at end of file
diff --git a/app/services/oauth2/ApiEndpointService.php b/app/services/oauth2/ApiEndpointService.php
deleted file mode 100644
index af3d34d3..00000000
--- a/app/services/oauth2/ApiEndpointService.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?php
-
-namespace services\oauth2;
-
-use oauth2\models\IApiEndpoint;
-use oauth2\services\IApiEndpointService;
-use ApiEndpoint;
-use ApiScope;
-use DB;
-use  oauth2\exceptions\InvalidApiEndpoint;
-use  oauth2\exceptions\InvalidApiScope;
-use utils\db\ITransactionService;
-/**
- * Class ApiEndpointService
- * @package services\oauth2
- */
-class ApiEndpointService implements IApiEndpointService {
-
-	private $tx_service;
-
-	/**
-	 * @param ITransactionService $tx_service
-	 */
-	public function __construct(ITransactionService $tx_service){
-		$this->tx_service = $tx_service;
-	}
-
-    /**
-     * @param $url
-     * @param $http_method
-     * @return IApiEndpoint
-     */
-    public function getApiEndpointByUrlAndMethod($url, $http_method)
-    {
-        return ApiEndpoint::where('route','=',$url)->where('http_method','=',$http_method)->first();
-    }
-
-    /**
-     * @param $url
-     * @return IApiEndpoint
-     */
-    public function getApiEndpointByUrl($url)
-    {
-        return ApiEndpoint::where('route','=',$url)->first();
-    }
-
-
-    /**
-     * @param $id
-     * @return IApiEndpoint
-     */
-    public function get($id){
-        return ApiEndpoint::find($id);
-    }
-
-    /**
-     * @param int $page_nbr
-     * @param int $page_size
-     * @param array $filters
-     * @param array $fields
-     * @return mixed
-     */
-    public function getAll($page_nbr=1,$page_size=10,array $filters=array(), array $fields=array('*')){
-        DB::getPaginator()->setCurrentPage($page_nbr);
-        return ApiEndpoint::Filter($filters)->paginate($page_size,$fields);
-    }
-
-    /**
-     * Adds a new api endpoint to an existent api
-     * @param string $name
-     * @param string $description
-     * @param boolean $active
-     * @param boolean $allow_cors
-     * @param string $route
-     * @param string $http_method
-     * @param integer $api_id
-     * @param integer $rate_limit
-     * @return IApiEndpoint
-     */
-    public function add($name, $description, $active,$allow_cors, $route, $http_method, $api_id, $rate_limit)
-    {
-        $instance = null;
-
-	    $this->tx_service->transaction(function () use ($name, $description, $active,$allow_cors, $route, $http_method, $api_id, $rate_limit, &$instance) {
-
-            //check that does not exists an endpoint with same http method and same route
-            if(ApiEndpoint::where('http_method','=',$http_method)->where('route','=',$route)->where('api_id','=',$api_id)->count()>0)
-                throw new InvalidApiEndpoint(sprintf('there is already an endpoint api with route %s and http method %s',$route,$http_method));
-
-            $instance = new ApiEndpoint(
-                array(
-                    'name'               => $name,
-                    'description'        => $description,
-                    'active'             => $active,
-                    'route'              => $route,
-                    'http_method'        => $http_method,
-                    'api_id'             => $api_id,
-                    'allow_cors'         => $allow_cors,
-                    'rate_limit'         => (int)$rate_limit,
-                )
-            );
-            $instance->Save();
-        });
-        return $instance;
-    }
-
-    /**
-     * @param int $id
-     * @param array $params
-     * @return bool
-     * @throws \oauth2\exceptions\InvalidApiEndpoint
-     */
-    public function update($id, array $params){
-
-        $res = false;
-	    $this_var = $this;
-
-	    $this->tx_service->transaction(function () use ($id,$params, &$res,&$this_var){
-            $endpoint = ApiEndpoint::find($id);
-            if(is_null($endpoint))
-                throw new InvalidApiEndpoint(sprintf('api endpoint id %s does not exists!',$id));
-
-            $allowed_update_params = array('name','description','active','route','http_method','allow_cors', 'rate_limit');
-            foreach($allowed_update_params as $param){
-                if(array_key_exists($param,$params)){
-                    $endpoint->{$param} = $params[$param];
-                }
-            }
-            //check that does not exists an endpoint with same http method and same route
-            if(ApiEndpoint::where('http_method', '=' , $endpoint->http_method)->where('route', '=', $endpoint->route)->where('id', '<>' ,$endpoint->id)->where('api_id','=',$endpoint->api_id)->count()>0)
-                throw new InvalidApiEndpoint(sprintf('there is already an endpoint api with route %s and http method %s',$endpoint->route,$endpoint->http_method));
-            $res = $this_var->save($endpoint);
-        });
-        return $res;
-    }
-
-    /**
-     * Adds a new required scope to a given api endpoint,
-     * given scope must belongs to owner api of the given endpoint
-     * @param int $api_endpoint_id
-     * @param int $scope_id
-     * @return boolean
-     * @throws \oauth2\exceptions\InvalidApiScope
-     * @throws \oauth2\exceptions\InvalidApiEndpoint
-     */
-    public function addRequiredScope($api_endpoint_id, $scope_id)
-    {
-        $res = false;
-
-	    $this->tx_service->transaction(function () use($api_endpoint_id, $scope_id,&$res){
-
-            $api_endpoint = ApiEndpoint::find($api_endpoint_id);
-
-            if(is_null($api_endpoint))
-                throw new InvalidApiEndpoint(sprintf("api endpoint id %s does not exists!.",$api_endpoint_id));
-
-            $scope        = ApiScope::find($scope_id);
-
-            if(is_null($scope))
-                throw new InvalidApiScope(sprintf("api scope id %s does not exists!.",$scope_id));
-
-            if($scope->api_id!==$api_endpoint->api_id)
-                throw new InvalidApiScope(sprintf("api scope id %s does not belong to api id %s !.",$scope_id,$api_endpoint->api_id));
-
-            $res = $api_endpoint->scopes()->where('id','=',$scope_id)->count();
-
-            if($res>0)
-                throw new InvalidApiScope(sprintf("api scope id %s already belongs to endpoint id %s!.",$scope_id,$api_endpoint->id));
-
-            $api_endpoint->scopes()->attach($scope_id);
-
-            $res = true;
-        });
-        return $res;
-    }
-
-
-    /**
-     * Removes a required scope to a given api endpoint,
-     * given scope must belongs to owner api of the given endpoint
-     * @param int $api_endpoint_id
-     * @param int $scope_id
-     * @return boolean
-     * @throws \oauth2\exceptions\InvalidApiScope
-     * @throws \oauth2\exceptions\InvalidApiEndpoint
-     */
-    public function removeRequiredScope($api_endpoint_id, $scope_id)
-    {
-
-        $res = false;
-
-	    $this->tx_service->transaction(function () use($api_endpoint_id, $scope_id,&$res){
-
-            $api_endpoint = ApiEndpoint::find($api_endpoint_id);
-
-            if(is_null($api_endpoint))
-                throw new InvalidApiEndpoint(sprintf("api endpoint id %s does not exists!.",$api_endpoint_id));
-
-            $scope        = ApiScope::find($scope_id);
-
-            if(is_null($scope))
-                throw new InvalidApiScope(sprintf("api scope id %s does not exists!.",$scope_id));
-
-            if($scope->api_id !== $api_endpoint->api_id)
-                throw new InvalidApiScope(sprintf("api scope id %s does not belongs to api id %s!.",$scope_id,$api_endpoint->api_id));
-
-            $res = $api_endpoint->scopes()->where('id','=',$scope_id)->count();
-
-            if($res==0)
-                throw new InvalidApiScope(sprintf("api scope id %s does not belongs to endpoint id %s !.",$scope_id,$api_endpoint->id));
-
-            $api_endpoint->scopes()->detach($scope_id);
-
-            $res = true;
-        });
-        return $res;
-    }
-
-    /**
-     * deletes a given api endpoint
-     * @param int $id
-     * @return boolean
-     */
-    public function delete($id)
-    {
-        $res = false;
-	    $this->tx_service->transaction(function () use ($id,&$res) {
-            $endpoint = ApiEndpoint::find($id);
-            if(!is_null($endpoint)){
-                $res = $endpoint->delete();
-            }
-        });
-        return $res;
-    }
-
-    public function save(IApiEndpoint $api_endpoint)
-    {
-        if(!$api_endpoint->exists() || count($api_endpoint->getDirty())>0){
-            return $api_endpoint->Save();
-        }
-        return true;
-    }
-
-    /**
-     * @param int $id
-     * @param boolean $active
-     * @return boolean
-     */
-    public function setStatus($id, $active)
-    {
-	    $endpoint = ApiEndpoint::find($id);
-        if(is_null($endpoint)) return false;
-        return $endpoint->update(array('active'=>$active));
-    }
-}
\ No newline at end of file
diff --git a/app/services/oauth2/ApiService.php b/app/services/oauth2/ApiService.php
deleted file mode 100644
index 1277c109..00000000
--- a/app/services/oauth2/ApiService.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-namespace services\oauth2;
-
-use oauth2\models\IApi;
-use oauth2\services\IApiService;
-use Api;
-use DB;
-use oauth2\exceptions\InvalidApi;
-use utils\db\ITransactionService;
-
-/**
- * Class ApiService
- * @package services\oauth2
- */
-class ApiService implements  IApiService {
-
-	private $tx_service;
-
-	/**
-	 * @param ITransactionService $tx_service
-	 */
-	public function __construct(ITransactionService $tx_service){
-		$this->tx_service = $tx_service;
-	}
-
-	/**
-     * @param $api_id
-     * @return IApi
-     */
-    public function get($api_id)
-    {
-        return Api::find($api_id);
-    }
-
-    /**
-     * @param $api_name
-     * @return IApi
-     */
-    public function getByName($api_name)
-    {
-        return Api::where('name','=',$api_name)->first();
-    }
-
-    /**
-     * @param $id
-     * @return bool
-     */
-    public function delete($id)
-    {
-        $res = false;
-	    $this->tx_service->transaction(function () use ($id,&$res) {
-            $api = Api::find($id);
-            if(!is_null($api)){
-                $res = $api->delete();
-            }
-        });
-        return $res;
-    }
-
-    /**
-     * @param $name
-     * @param $description
-     * @param $active
-     * @param $resource_server_id
-     * @return null|IApi
-     */
-    public function add($name, $description, $active, $resource_server_id)
-    {
-        $instance = null;
-        if(is_string($active)){
-            $active =  strtoupper($active) == 'TRUE'?true:false;
-        }
-
-	    $this->tx_service->transaction(function () use ($name, $description, $active, $resource_server_id, &$instance) {
-
-            $count = Api::where('name','=',$name)->where('resource_server_id','=',$resource_server_id)->count();
-            if($count>0)
-                throw new InvalidApi(sprintf('api name %s already exists!',$name));
-
-            $instance = new Api(
-                array(
-                    'name'               => $name,
-                    'description'        => $description,
-                    'active'             => $active,
-                    'resource_server_id' => $resource_server_id
-                )
-            );
-
-            $instance->Save();
-        });
-        return $instance;
-    }
-
-    /**
-     * @param $id
-     * @param array $params
-     * @return bool
-     */
-    public function update($id, array $params){
-
-        $res      = false;
-	    $this_var = $this;
-
-	    $this->tx_service->transaction(function () use ($id,$params, &$res, &$this_var) {
-
-            $api = Api::find($id);
-            if(is_null($api))
-                throw new InvalidApi(sprintf('api id %s does not exists!',$id));
-
-            $allowed_update_params = array('name','description','active');
-            foreach($allowed_update_params as $param){
-                if(array_key_exists($param,$params)){
-
-                    if($param=='name'){
-                        if(Api::where('name','=',$params[$param])->where('id','<>',$id)->where('resource_server_id','=',$api->resource_server_id)->count()>0)
-                            throw new InvalidApi(sprintf('api name %s already exists!',$params[$param]));
-                    }
-
-                    $api->{$param} = $params[$param];
-                }
-            }
-            $res = $this_var->save($api);
-        });
-        return $res;
-    }
-
-    /**
-     * @param IApi $api
-     * @return bool|void
-     */
-    public function save(IApi $api)
-    {
-        if(!$api->exists() || count($api->getDirty())>0){
-            return $api->Save();
-        }
-        return true;
-    }
-
-    /**
-     * @param $id
-     * @param $active
-     * @return bool
-     * @throws \oauth2\exceptions\InvalidApi
-     */
-    public function setStatus($id, $active)
-    {
-        $api = Api::find($id);
-        if(is_null($api))
-            throw new InvalidApi(sprintf("api id %s does not exists!",$id));
-        return $api->update(array('active'=>$active));
-    }
-
-    /**
-     * @param int $page_nbr
-     * @param int $page_size
-     * @param array $filters
-     * @param array $fields
-     * @return mixed
-     */
-    public function getAll($page_nbr=1,$page_size=10,array $filters=array(), array $fields=array('*')){
-        DB::getPaginator()->setCurrentPage($page_nbr);
-        return Api::Filter($filters)->paginate($page_size,$fields);
-    }
-}
\ No newline at end of file
diff --git a/app/services/oauth2/CORS/CORSMiddleware.php b/app/services/oauth2/CORS/CORSMiddleware.php
deleted file mode 100644
index 5b6aac5a..00000000
--- a/app/services/oauth2/CORS/CORSMiddleware.php
+++ /dev/null
@@ -1,314 +0,0 @@
-<?php
-
-namespace services\oauth2\CORS;
-
-use App;
-use Config;
-use Exception;
-use Log;
-use oauth2\models\IApiEndpoint;
-use oauth2\services\IClientService;
-use oauth2\services\IApiEndpointService;
-use Route;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use utils\services\ICacheService;
-
-/**
- * Class CORSMiddleware
- * @package services\oauth2
- * Implementation of http://www.w3.org/TR/cors/
- */
-final class CORSMiddleware
-{
-
-    /**
-     * @var IApiEndpointService
-     */
-    private $endpoint_service;
-    /**
-     * @var ICacheService
-     */
-    private $cache_service;
-    /**
-     * @var IClientService
-     */
-    private $client_service;
-    private $actual_request = false;
-    private $headers = array();
-    private $allowed_headers;
-    private $allowed_methods;
-    /**
-     * Simple headers as defined in the spec should always be accepted
-     */
-    protected static $simple_headers = array(
-        'accept',
-        'accept-language',
-        'content-language',
-        'origin',
-    );
-
-    const DefaultAllowedHeaders = 'origin, content-type, accept, authorization, x-requested-with';
-    const DefaultAllowedMethods = 'GET, POST, OPTIONS, PUT, DELETE';
-
-    /**
-     * @param IApiEndpointService $endpoint_service
-     * @param ICacheService $cache_service
-     * @param IClientService $client_service
-     */
-    public function __construct
-    (
-        IApiEndpointService $endpoint_service,
-        ICacheService $cache_service,
-        IClientService $client_service
-    )
-    {
-        $this->endpoint_service = $endpoint_service;
-        $this->cache_service    = $cache_service;
-        $this->client_service  = $client_service;
-
-        $this->allowed_headers = Config::get('cors.AllowedHeaders', self::DefaultAllowedHeaders);
-        $this->allowed_methods = Config::get('cors.AllowedMethods', self::DefaultAllowedMethods);
-    }
-
-    /**
-     * User agents can discover via a preflight request whether a cross-origin resource is prepared to
-     * accept requests, using a non-simple method, from a given origin.
-     * @param Request $request
-     * @param IApiEndpoint $endpoint
-     * @return Response
-     */
-    private function makePreflightResponse(Request $request, IApiEndpoint $endpoint)
-    {
-
-        $response = new Response();
-
-        $allow_credentials = Config::get('cors.AllowCredentials', '');
-
-        if (!empty($allow_credentials)) {
-            // The Access-Control-Allow-Credentials header indicates whether the response to request
-            // can be exposed when the omit credentials flag is unset. When part of the response to a preflight request
-            // it indicates that the actual request can include user credentials.
-            $response->headers->set('Access-Control-Allow-Credentials', $allow_credentials);
-        }
-
-        if (Config::get('cors.UsePreflightCaching', false)) {
-            // The Access-Control-Max-Age header indicates how long the response can be cached, so that for
-            // subsequent requests, within the specified time, no preflight request has to be made.
-            $response->headers->set('Access-Control-Max-Age', Config::get('cors.MaxAge', 32000));
-        }
-        // The Access-Control-Allow-Headers header indicates, as part of the response to a preflight request,
-        // which header field names can be used during the actual request
-        $response->headers->set('Access-Control-Allow-Headers', $this->allowed_headers);
-
-        if (!$this->checkOrigin($request)) {
-            $response->headers->set('Access-Control-Allow-Origin', 'null');
-            $response->setStatusCode(403);
-
-            return $response;
-        }
-
-        $response->headers->set('Access-Control-Allow-Origin', $request->headers->get('Origin'));
-
-        // The Access-Control-Request-Method header indicates which method will be used in the actual
-        // request as part of the preflight request
-        // check request method
-
-        if ($request->headers->get('Access-Control-Request-Method') != $endpoint->getHttpMethod()) {
-            $response->setStatusCode(405);
-
-            return $response;
-        }
-        //The Access-Control-Allow-Methods header indicates, as part of the response to a preflight request,
-        // which methods can be used during the actual request.
-        $response->headers->set('Access-Control-Allow-Methods', $this->allowed_methods);
-
-        // The Access-Control-Request-Headers header indicates which headers will be used in the actual request
-        // as part of the preflight request.
-
-        $headers = $request->headers->get('Access-Control-Request-Headers');
-
-        if ($headers) {
-            $headers = trim(strtolower($headers));
-            $allow_headers = explode(', ', $this->allowed_headers);
-            foreach (preg_split('{, *}', $headers) as $header) {
-                //if they are simple headers then skip them
-                if (in_array($header, self::$simple_headers, true)) {
-                    continue;
-                }
-                //check is the requested header is on the list of allowed headers
-                if (!in_array($header, $allow_headers, true)) {
-                    $response->setStatusCode(400);
-                    $response->setContent('Unauthorized header ' . $header);
-                    break;
-                }
-            }
-        }
-        //OK - No Content
-        $response->setStatusCode(204);
-
-        return $response;
-    }
-
-    private function checkOrigin(Request $request)
-    {
-        // check origin
-        $origin = $request->headers->get('Origin');
-        if ($this->cache_service->getSingleValue($origin)) {
-            return true;
-        }
-        if ($client = $this->client_service->getByOrigin($origin))
-        {
-            $this->cache_service->addSingleValue($origin, $origin);
-            return true;
-        }
-        Log::warning(sprintf('CORS: origin %s not allowed!', $origin));
-
-        return false;
-    }
-
-    public function verifyRequest($request)
-    {
-        try {
-            /**
-             * The presence of the Origin header does not necessarily mean that the request is a cross-origin request.
-             * While all cross-origin requests will contain an Origin header,
-             * some same-origin requests might have one as well. For example, Firefox doesn't include an
-             * Origin header on same-origin requests. But Chrome and Safari include an Origin header on
-             * same-origin POST/PUT/DELETE requests (same-origin GET requests will not have an Origin header).
-             */
-
-            if (!$request->headers->has('Origin')) {
-                return;
-            }
-            //https://www.owasp.org/index.php/CORS_OriginHeaderScrutiny
-            $origin = $request->headers->get('Origin', null, false);
-            $host = $request->headers->get('Host', null, false);
-            if (is_array($origin) && count($origin) > 1) {
-                // If we reach this point it means that we have multiple instance of the "Origin" header
-                $response = new Response();
-                $response->setStatusCode(403);
-
-                return $response;
-            }
-            //now get the first one
-            $origin = $request->headers->get('Origin');
-            $server_name = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
-            $origin_host = @parse_url($origin, PHP_URL_HOST);
-
-            //Have only one and non empty instance of the host header,
-            if (is_array($host) && count($host) > 1) {
-                // If we reach this point it means that we have multiple instance of the "Host" header
-                $response = new Response();
-                $response->setStatusCode(403);
-
-                return;
-            }
-            //now get the first one
-            $host = $request->headers->get('Host');
-
-            if (is_null($host) || $server_name != $host || is_null($origin_host) || $origin_host == $server_name) {
-                return;
-            }
-
-            $method = $request->getMethod();
-            $preflight = false;
-
-            //preflight checks
-            if ($method == 'OPTIONS') {
-                $request_method = $request->headers->get('Access-Control-Request-Method');
-                if (!is_null($request_method)) {
-                    // sets the original method on request in order to be able to find the
-                    // correct route
-                    $request->setMethod($request_method);
-                    $preflight = true;
-                }
-            }
-
-            //gets routes from container and try to find the route
-            $router = App::make('router');
-            $routes = $router->getRoutes();
-            $route = $routes->match($request);
-            $url = $route->getPath();
-
-            if (strpos($url, '/') != 0) {
-                $url = '/' . $url;
-            }
-
-            $endpoint = $this->endpoint_service->getApiEndpointByUrl($url);
-            //check if api endpoint exists or not, if active and if supports cors
-            if (is_null($endpoint) || !$endpoint->isActive() || !$endpoint->supportCORS()) {
-
-                if (is_null($endpoint)) {
-                    Log::warning(sprintf("does not exists an endpoint for url %s.", $url));
-                } else {
-                    if (!$endpoint->isActive()) {
-                        Log::warning(sprintf("endpoint %s is not active.", $url));
-                    } else {
-                        if (!$endpoint->supportCORS()) {
-                            Log::warning(sprintf("endpoint %s does not support CORS.", $url));
-                        }
-                    }
-                }
-
-                return;
-            }
-
-            //perform preflight checks
-            if ($preflight) {
-                return $this->makePreflightResponse($request, $endpoint);
-            }
-            //Actual Request
-            if (!$this->checkOrigin($request)) {
-                return new Response('', 403, array('Access-Control-Allow-Origin' => 'null'));
-            }
-
-            $this->actual_request = true;
-
-            // Save response headers
-            $this->headers['Access-Control-Allow-Origin'] = $request->headers->get('Origin');
-            $allow_credentials = Config::get('cors.AllowCredentials', '');
-            if (!empty($allow_credentials)) {
-                // The Access-Control-Allow-Credentials header indicates whether the response to request
-                // can be exposed when the omit credentials flag is unset. When part of the response to a preflight request
-                // it indicates that the actual request can include user credentials.
-                $this->headers['Access-Control-Allow-Credentials'] = $allow_credentials;
-            }
-
-            /**
-             * During a CORS request, the getResponseHeader() method can only access simple response headers.
-             * Simple response headers are defined as follows:
-             ** Cache-Control
-             ** Content-Language
-             ** Content-Type
-             ** Expires
-             ** Last-Modified
-             ** Pragma
-             * If you want clients to be able to access other headers,
-             * you have to use the Access-Control-Expose-Headers header.
-             * The value of this header is a comma-delimited list of response headers you want to expose
-             * to the client.
-             */
-            $exposed_headers = Config::get('cors.ExposedHeaders', '');
-            if (!empty($exposed_headers)) {
-                $this->headers['Access-Control-Expose-Headers'] = $exposed_headers;
-            }
-
-        } catch (Exception $ex) {
-            Log::error($ex);
-        }
-    }
-
-    public function modifyResponse($request, $response)
-    {
-        if (!$this->actual_request) {
-            return $response;
-        }
-        // add CORS response headers
-        Log::info('CORS: Adding CORS HEADERS.');
-        $response->headers->add($this->headers);
-
-        return $response;
-    }
-
-}
\ No newline at end of file
diff --git a/app/services/oauth2/CORS/CORSProvider.php b/app/services/oauth2/CORS/CORSProvider.php
deleted file mode 100644
index 848c2575..00000000
--- a/app/services/oauth2/CORS/CORSProvider.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace services\oauth2\CORS;
-
-use App;
-use Illuminate\Support\ServiceProvider;
-
-class CORSProvider extends ServiceProvider
-{
-
-    protected $defer = false;
-
-    /**
-     * Register the service provider.
-     * @return void
-     */
-    public function register()
-    {
-        App::singleton('CORSMiddleware', 'services\oauth2\CORS\CORSMiddleware');
-    }
-
-    public function boot()
-    {
-
-    }
-
-    public function provides()
-    {
-        return array('oauth2.cors');
-    }
-}
\ No newline at end of file
diff --git a/app/services/oauth2/HttpIClientJWKSetReader.php b/app/services/oauth2/HttpIClientJWKSetReader.php
deleted file mode 100644
index 98e50cea..00000000
--- a/app/services/oauth2/HttpIClientJWKSetReader.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-namespace services\oauth2;
-
-
-use jwk\IJWKSet;
-use jwk\impl\JWKSet;
-use oauth2\models\IClient;
-use oauth2\services\IClientJWKSetReader;
-use Guzzle\Http\Client as HttpClient;
-use utils\http\HttpContentType;
-
-/**
- * Class HttpIClientJWKSetReader
- * @package services\oauth2
- */
-final class HttpIClientJWKSetReader implements IClientJWKSetReader
-{
-
-    /**
-     * @param IClient $client
-     * @return IJWKSet
-     */
-    public function read(IClient $client)
-    {
-        $jwk_set_uri = $client->getJWKSUri();
-        if(empty($jwk_set_uri)) return null;
-
-        $client = new HttpClient;
-        $client->setSslVerification(false);
-        $request  = $client->get($jwk_set_uri);
-        $response = $request->send();
-        if($response->getStatusCode() !== 200) return null;
-        $content_type = $response->getHeader('content-type');
-        if(is_null($content_type)) return null;
-        if(!$content_type->hasValue(HttpContentType::Json)) return null;
-        return JWKSet::fromJson($response->getBody());
-    }
-}
\ No newline at end of file
diff --git a/app/services/oauth2/OAuth2ServiceProvider.php b/app/services/oauth2/OAuth2ServiceProvider.php
deleted file mode 100644
index 98d3406d..00000000
--- a/app/services/oauth2/OAuth2ServiceProvider.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-namespace services\oauth2;
-
-use Illuminate\Support\ServiceProvider;
-use oauth2\services\AccessTokenGenerator;
-use oauth2\services\AuthorizationCodeGenerator;
-use oauth2\services\OAuth2ServiceCatalog;
-use oauth2\services\RefreshTokenGenerator;
-use oauth2\strategies\ClientAuthContextValidatorFactory;
-use services\oauth2\ResourceServer;
-use App;
-use utils\services\UtilsServiceCatalog;
-use URL;
-
-/**
- * Class OAuth2ServiceProvider
- * @package services\oauth2
- */
-class OAuth2ServiceProvider extends ServiceProvider
-{
-    protected $defer = false;
-
-    public function boot()
-    {
-    }
-
-    public function register()
-    {
-        App::singleton('oauth2\\IResourceServerContext', 'services\\oauth2\\ResourceServerContext');
-        App::singleton(OAuth2ServiceCatalog::ClientCredentialGenerator, 'services\\oauth2\\ClientCrendentialGenerator');
-        App::singleton(OAuth2ServiceCatalog::ClientService, 'services\\oauth2\\ClientService');
-        App::singleton(OAuth2ServiceCatalog::ClienPublicKeyService, 'services\\oauth2\\ClienPublicKeyService');
-        App::singleton(OAuth2ServiceCatalog::ServerPrivateKeyService, 'services\\oauth2\\ServerPrivateKeyService');
-        App::singleton(OAuth2ServiceCatalog::ScopeService, 'services\\oauth2\\ApiScopeService');
-        App::singleton(OAuth2ServiceCatalog::ResourceServerService, 'services\\oauth2\\ResourceServerService');
-        App::singleton(OAuth2ServiceCatalog::ApiService, 'services\\oauth2\\ApiService');
-        App::singleton(OAuth2ServiceCatalog::ApiEndpointService, 'services\\oauth2\\ApiEndpointService');
-        App::singleton(OAuth2ServiceCatalog::UserConsentService, 'services\\oauth2\\UserConsentService');
-        App::singleton(OAuth2ServiceCatalog::OpenIDProviderConfigurationService,'services\\oauth2\\OpenIDProviderConfigurationService');
-        App::singleton(OAuth2ServiceCatalog::MementoSerializerService,'services\\oauth2\\OAuth2MementoSessionSerializerService');
-        App::singleton(OAuth2ServiceCatalog::SecurityContextService,'services\\oauth2\\SecurityContextService');
-        App::singleton(OAuth2ServiceCatalog::PrincipalService,'services\\oauth2\\PrincipalService');
-        App::singleton('oauth2\services\IClientJWKSetReader','services\oauth2\HttpIClientJWKSetReader');
-        App::singleton('oauth2\services\IApiScopeGroupService','services\oauth2\ApiScopeGroupService');
-
-        App::singleton('oauth2\\builders\\IdTokenBuilder',function() {
-            return new IdTokenBuilderImpl
-            (
-                App::make('oauth2\repositories\IServerPrivateKeyRepository'),
-                new HttpIClientJWKSetReader
-            );
-        });
-
-        App::singleton(OAuth2ServiceCatalog::TokenService, function()
-        {
-            return new TokenService
-            (
-                App::make(OAuth2ServiceCatalog::ClientService),
-                App::make(UtilsServiceCatalog::LockManagerService),
-                App::make(UtilsServiceCatalog::ServerConfigurationService),
-                App::make(UtilsServiceCatalog::CacheService),
-                App::make(UtilsServiceCatalog::AuthenticationService),
-                App::make(OAuth2ServiceCatalog::UserConsentService),
-                new AuthorizationCodeGenerator(App::make(UtilsServiceCatalog::CacheService)),
-                new AccessTokenGenerator(App::make(UtilsServiceCatalog::CacheService)),
-                new RefreshTokenGenerator(App::make(UtilsServiceCatalog::CacheService)),
-                App::make('oauth2\repositories\IServerPrivateKeyRepository'),
-                new HttpIClientJWKSetReader,
-                App::make(OAuth2ServiceCatalog::SecurityContextService),
-                App::make(OAuth2ServiceCatalog::PrincipalService),
-                App::make('oauth2\\builders\\IdTokenBuilder'),
-                App::make(UtilsServiceCatalog::TransactionService)
-            );
-        });
-
-        //OAUTH2 resource server endpoints
-        App::singleton('oauth2\resource_server\IUserService', 'services\oauth2\resource_server\UserService');
-    }
-
-    public function provides()
-    {
-        return array('oauth2.services');
-    }
-}
\ No newline at end of file
diff --git a/app/services/oauth2/ResourceServerService.php b/app/services/oauth2/ResourceServerService.php
deleted file mode 100644
index 02b40b47..00000000
--- a/app/services/oauth2/ResourceServerService.php
+++ /dev/null
@@ -1,263 +0,0 @@
-<?php
-
-
-namespace services\oauth2;
-
-use DB;
-use oauth2\exceptions\InvalidResourceServer;
-use oauth2\models\IClient;
-use oauth2\models\IResourceServer;
-use oauth2\services\IClientService;
-use oauth2\services\id;
-use oauth2\services\IResourceServerService;
-use ResourceServer;
-use utils\db\ITransactionService;
-
-/**
- * Class ResourceServerService
- * @package services\oauth2
- */
-final class ResourceServerService implements IResourceServerService
-{
-
-    private $client_service;
-
-    /**
-     * @param IClientService $client_service
-     * @param ITransactionService $tx_service
-     */
-    public function __construct(IClientService $client_service, ITransactionService $tx_service)
-    {
-        $this->client_service = $client_service;
-        $this->tx_service     = $tx_service;
-    }
-
-    /**
-     * @param int $page_nbr
-     * @param int $page_size
-     * @param array $filters
-     * @param array $fields
-     * @return mixed
-     */
-    public function getAll($page_nbr = 1, $page_size = 10, array $filters = array(), array $fields = array('*'))
-    {
-        DB::getPaginator()->setCurrentPage($page_nbr);
-
-        return ResourceServer::Filter($filters)->paginate($page_size, $fields);
-    }
-
-    /**
-     * @param $id
-     * @param array $params
-     * @return bool
-     * @throws \oauth2\exceptions\InvalidResourceServer
-     */
-    public function update($id, array $params)
-    {
-
-        $res = false;
-        $this_var = $this;
-
-        $this->tx_service->transaction(function () use ($id, $params, &$res, &$this_var) {
-
-            $resource_server = ResourceServer::find($id);
-
-            if (is_null($resource_server)) {
-                throw new InvalidResourceServer(sprintf('resource server id %s does not exists!', $id));
-            }
-            $allowed_update_params = array('host', 'ips', 'active', 'friendly_name');
-
-            foreach ($allowed_update_params as $param) {
-                if (array_key_exists($param, $params)) {
-
-                    if ($param == 'host') {
-                        if (ResourceServer::where('host', '=', $params[$param])->where('id', '<>', $id)->count() > 0) {
-                            throw new InvalidResourceServer(sprintf('there is already another resource server with that hostname (%s).',
-                                $params[$param]));
-                        }
-                    }
-
-                    if ($param == 'friendly_name') {
-                        if (ResourceServer::where('friendly_name', '=', $params[$param])->where('id', '<>',
-                                $id)->count() > 0
-                        ) {
-                            throw new InvalidResourceServer(sprintf('there is already another resource server with that friendly name (%s).',
-                                $params[$param]));
-                        }
-                    }
-
-                    $resource_server->{$param} = $params[$param];
-                }
-            }
-            $res = $this_var->save($resource_server);
-        });
-
-        return $res;
-    }
-
-    /**
-     * @param IResourceServer $resource_server
-     * @return bool
-     */
-    public function save(IResourceServer $resource_server)
-    {
-        if (!$resource_server->exists() || count($resource_server->getDirty()) > 0) {
-            return $resource_server->Save();
-        }
-
-        return true;
-    }
-
-    /**
-     * sets resource server status (active/deactivated)
-     * @param $id id of resource server
-     * @param bool $active status (active/non active)
-     * @return bool
-     */
-    public function setStatus($id, $active)
-    {
-        return ResourceServer::find($id)->update(array('active' => $active));
-    }
-
-    /**
-     * deletes a resource server
-     * @param id $id
-     * @return bool
-     */
-    public function delete($id)
-    {
-        $res = false;
-        $client_service = $this->client_service;
-
-        $this->tx_service->transaction(function () use ($id, &$res, &$client_service) {
-
-            $resource_server = ResourceServer::find($id);
-
-            if (!is_null($resource_server)) {
-                $client = $resource_server->client()->first();
-                if (!is_null($client)) {
-                    $client_service->deleteClientByIdentifier($client->id);
-                }
-                $resource_server->delete();
-                $res = true;
-            }
-        });
-
-        return $res;
-    }
-
-    /**
-     * get a resource server by id
-     * @param $id id of resource server
-     * @return IResourceServer
-     */
-    public function get($id)
-    {
-        return ResourceServer::find($id);
-    }
-
-    /** Creates a new resource server instance
-     * @param $host
-     * @param $ips
-     * @param $friendly_name
-     * @param bool $active
-     * @return IResourceServer
-     */
-    public function add($host, $ips, $friendly_name, $active)
-    {
-
-        $client_service = $this->client_service;
-
-        if (is_string($active))
-        {
-            $active = strtoupper($active) == 'TRUE' ? true : false;
-        }
-
-        return $this->tx_service->transaction(function () use (
-            $host,
-            $ips,
-            $friendly_name,
-            $active,
-            $client_service
-        ) {
-
-            if (ResourceServer::where('host', '=', $host)->count() > 0) {
-                throw new InvalidResourceServer(sprintf('there is already another resource server with that hostname (%s).',
-                    $host));
-            }
-
-            if (ResourceServer::where('ips','like', '%'.$ips.'%')->count() > 0)
-            {
-                throw new InvalidResourceServer(sprintf('there is already another resource server with that ip (%s).',
-                    $ips));
-            }
-
-            if (ResourceServer::where('friendly_name', '=', $friendly_name)->count() > 0) {
-                throw new InvalidResourceServer(sprintf('there is already another resource server with that friendly name (%s).',
-                    $friendly_name));
-            }
-
-            $instance = new ResourceServer
-            (
-                array
-                (
-                    'host'          => $host,
-                    'ips'           => $ips,
-                    'active'        => $active,
-                    'friendly_name' => $friendly_name
-                )
-            );
-
-            $instance->Save();
-
-            // creates a new client for this brand new resource server
-            $new_client = $client_service->addClient
-            (
-                IClient::ApplicationType_Service,
-                null,
-                $host . '.confidential.application',
-                $friendly_name . ' confidential oauth2 application', ''
-            );
-
-            $new_client->resource_server()->associate($instance);
-            // does not expires ...
-            $new_client->client_secret_expires_at = null;
-            $new_client->Save();
-            return $instance;
-        });
-
-    }
-
-    /**
-     * @param $id
-     * @return bool
-     */
-    public function regenerateClientSecret($id)
-    {
-        $res = null;
-        $client_service = $this->client_service;
-
-        $this->tx_service->transaction(function () use ($id, &$res, &$client_service) {
-
-            $resource_server = ResourceServer::find($id);
-
-            if (!is_null($resource_server)) {
-                $client = $resource_server->client()->first();
-                if (!is_null($client)) {
-                    $res = $client_service->regenerateClientSecret($client->id);
-                }
-            }
-        });
-
-        return $res;
-    }
-
-    /**
-     * @param string $ip
-     * @return IResourceServer
-     */
-    public function getByIPAddress($ip)
-    {
-        return ResourceServer::where('ips','like', '%'.$ip.'%')->first();
-    }
-}
diff --git a/app/services/oauth2/UserConsentService.php b/app/services/oauth2/UserConsentService.php
deleted file mode 100644
index 3da61ce8..00000000
--- a/app/services/oauth2/UserConsentService.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-namespace services\oauth2;
-
-use Client;
-use oauth2\exceptions\AbsentClientException;
-use oauth2\models\IUserConsent;
-use oauth2\services\IUserConsentService;
-use UserConsent;
-
-class UserConsentService implements IUserConsentService
-{
-
-    /**
-     * @param $user_id
-     * @param $client_id
-     * @param $scopes
-     * @return IUserConsent
-     */
-    public function get($user_id, $client_id, $scopes)
-    {
-
-        $set = explode(' ', $scopes);
-        $size = count($set) - 1;
-        $perm = range(0, $size);
-        $j = 0;
-        $perms = array();
-
-        do
-        {
-            foreach ($perm as $i)
-            {
-                $perms[$j][] = $set[$i];
-            }
-        } while ($perm = $this->nextPermutation($perm, $size) and ++$j);
-
-        $scope_conditions = array();
-
-        $query1 = UserConsent::where('user_id', '=', $user_id)->where('client_id', '=', $client_id);
-
-        $query2 = UserConsent::where('user_id', '=', $user_id)->where('client_id', '=', $client_id);
-
-
-        $query1 = $query1->where(function ($query) use($perms)
-        {
-            foreach ($perms as $p)
-            {
-                $str = join(' ', $p);
-                $query = $query->orWhere('scopes', '=', $str);
-            }
-
-            return $query;
-        });
-
-
-        $query2 = $query2->where(function ($query) use($perms)
-        {
-            foreach ($perms as $p)
-            {
-                $str = join(' ', $p);
-                $query = $query->orWhere('scopes', 'like', '%'.$str.'%');
-            }
-
-            return $query;
-        });
-
-
-        $consent = $query1->first();
-
-        if (is_null($consent)) {
-            $consent = $query2->first();
-        }
-
-        return $consent;
-    }
-
-
-    /**
-     * @param $p
-     * @param $size
-     * @return bool
-     *
-     * http://docstore.mik.ua/orelly/webprog/pcook/ch04_26.htm
-     *
-     */
-    private function nextPermutation($p, $size)
-    {
-        // slide down the array looking for where we're smaller than the next guy
-        for ($i = $size - 1; $i >= 0 && $p[$i] >= $p[$i + 1]; --$i) {}
-
-        // if this doesn't occur, we've finished our permutations
-        // the array is reversed: (1, 2, 3, 4) => (4, 3, 2, 1)
-        if ($i == -1)
-        {
-            return false;
-        }
-
-        // slide down the array looking for a bigger number than what we found before
-        for ($j = $size; $p[$j] <= $p[$i]; --$j) {}
-
-        // swap them
-        $tmp   = $p[$i];
-        $p[$i] = $p[$j];
-        $p[$j] = $tmp;
-
-        // now reverse the elements in between by swapping the ends
-        for (++$i, $j = $size; $i < $j; ++$i, --$j)
-        {
-            $tmp = $p[$i];
-            $p[$i] = $p[$j];
-            $p[$j] = $tmp;
-        }
-
-        return $p;
-    }
-
-
-    /**
-     * @param $user_id
-     * @param $client_id
-     * @param $scopes
-     * @return IUserConsent|void
-     * @throws \oauth2\exceptions\AbsentClientException
-     */
-    public function add($user_id, $client_id, $scopes)
-    {
-        $consent = new UserConsent();
-
-        if (is_null(Client::find($client_id))) {
-            throw new AbsentClientException;
-        }
-
-        $consent->client_id = $client_id;
-        $consent->user_id = $user_id;
-        $consent->scopes = $scopes;
-        $consent->Save();
-    }
-}
\ No newline at end of file
diff --git a/app/services/openid/AssociationService.php b/app/services/openid/AssociationService.php
deleted file mode 100644
index b6160190..00000000
--- a/app/services/openid/AssociationService.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-
-namespace services\openid;
-
-use openid\exceptions\InvalidAssociation;
-use openid\exceptions\OpenIdInvalidRealmException;
-use openid\exceptions\ReplayAttackException;
-use openid\helpers\OpenIdErrorMessages;
-use openid\model\IAssociation;
-use openid\repositories\IOpenIdAssociationRepository;
-use openid\services\IAssociationService;
-use OpenIdAssociation;
-use utils\exceptions\UnacquiredLockException;
-use utils\services\ICacheService;
-use utils\services\ILockManagerService;
-
-/**
- * Class AssociationService
- * @package services
- */
-class AssociationService implements IAssociationService
-{
-
-    private $lock_manager_service;
-    private $cache_service;
-    private $repository;
-
-    /**
-     * @param IOpenIdAssociationRepository $repository
-     * @param ILockManagerService $lock_manager_service
-     * @param ICacheService $cache_service
-     */
-    public function __construct(
-        IOpenIdAssociationRepository $repository,
-        ILockManagerService $lock_manager_service,
-        ICacheService $cache_service
-    ) {
-        $this->lock_manager_service = $lock_manager_service;
-        $this->cache_service = $cache_service;
-        $this->repository = $repository;
-    }
-
-    /**
-     * gets a given association by handle, and if association exists and its type is private, then lock it
-     * to prevent subsequent usage ( private association could be used once)
-     * @param $handle
-     * @param null $realm
-     * @return null|IAssociation|OpenIdAssociation
-     * @throws \openid\exceptions\ReplayAttackException
-     * @throws \openid\exceptions\InvalidAssociation
-     * @throws \openid\exceptions\OpenIdInvalidRealmException
-     */
-    public function getAssociation($handle, $realm = null)
-    {
-
-        $lock_name = 'lock.get.assoc.' . $handle;
-
-        try {
-            // check if association is on cache
-            if (!$this->cache_service->exists($handle)) {
-                // if not , check on db
-                $assoc = $this->repository->getByHandle($handle);
-                if (is_null($assoc)) {
-                    throw new InvalidAssociation(sprintf('openid association %s does not exists!', $handle));
-                }
-                //check association lifetime ...
-                $remaining_lifetime = $assoc->getRemainingLifetime();
-                if ($remaining_lifetime < 0) {
-                    $this->deleteAssociation($handle);
-
-                    return null;
-                }
-                //convert secret to hexa representation
-                // bin2hex
-                $secret_unpack = \unpack('H*', $assoc->secret);
-                $secret_unpack = array_shift($secret_unpack);
-                //repopulate cache
-                $this->cache_service->storeHash($handle, array(
-                    "type" => $assoc->type,
-                    "mac_function" => $assoc->mac_function,
-                    "issued" => $assoc->issued,
-                    "lifetime" => $assoc->lifetime,
-                    "secret" => $secret_unpack,
-                    "realm" => $assoc->realm
-                ),
-                    $remaining_lifetime);
-            }
-
-            //get hash from cache
-            $cache_values = $this->cache_service->getHash($handle, array(
-                "type",
-                "mac_function",
-                "issued",
-                "lifetime",
-                "secret",
-                "realm"
-            ));
-
-            if ($cache_values['type'] == IAssociation::TypePrivate) {
-                if (is_null($realm) || empty($realm) || $cache_values['realm'] != $realm) {
-                    throw new OpenIdInvalidRealmException(sprintf(OpenIdErrorMessages::InvalidPrivateAssociationMessage,
-                        $handle, $realm));
-                }
-                // only one time we could use this handle
-                $this->lock_manager_service->acquireLock($lock_name);
-            }
-
-            //convert hex 2 bin
-            $secret = \pack('H*', $cache_values['secret']);
-            $assoc = new OpenIdAssociation();
-
-            $assoc->type = $cache_values['type'];
-            $assoc->mac_function = $cache_values['mac_function'];
-            $assoc->issued = $cache_values['issued'];
-            $assoc->lifetime = intval($cache_values['lifetime']);
-            $assoc->secret = $secret;
-            $realm = $cache_values['realm'];
-            if (!empty($realm)) {
-                $assoc->realm = $realm;
-            }
-
-            return $assoc;
-
-        } catch (UnacquiredLockException $ex1) {
-            throw new ReplayAttackException(sprintf(OpenIdErrorMessages::ReplayAttackPrivateAssociationAlreadyUsed,
-                $handle));
-        }
-    }
-
-    /**
-     * @param $handle
-     * @return bool
-     */
-    public function deleteAssociation($handle)
-    {
-        $this->cache_service->delete($handle);
-        $assoc = $this->repository->getByHandle($handle);
-        if (!is_null($assoc)) {
-            return $this->repository->delete($assoc);
-        }
-
-        return false;
-    }
-
-    /**
-     * @param IAssociation $association
-     * @return IAssociation|OpenIdAssociation
-     * @throws \openid\exceptions\ReplayAttackException
-     */
-    public function addAssociation(IAssociation $association)
-    {
-        $assoc = new OpenIdAssociation();
-        try {
-            $lock_name = 'lock.add.assoc.' . $association->getHandle();
-            $this->lock_manager_service->acquireLock($lock_name);
-
-            $assoc->identifier = $association->getHandle();;
-            $assoc->secret = $association->getSecret();
-            $assoc->type = $association->getType();;
-            $assoc->mac_function = $association->getMacFunction();
-            $assoc->lifetime = intval($association->getLifetime());
-            $assoc->issued = $association->getIssued();
-
-            if (!is_null($association->getRealm())) {
-                $assoc->realm = $association->getRealm();
-            }
-
-            if ($association->getType() == IAssociation::TypeSession) {
-                $this->repository->add($assoc);
-            }
-            //convert secret to hexa representation
-            // bin2hex
-            $secret_unpack = \unpack('H*', $association->getSecret());
-            $secret_unpack = array_shift($secret_unpack);
-
-            $this->cache_service->storeHash($association->getHandle(),
-                array(
-                    "type" => $association->getType(),
-                    "mac_function" => $association->getMacFunction(),
-                    "issued" => $association->getIssued(),
-                    "lifetime" => intval($association->getLifetime()),
-                    "secret" => $secret_unpack,
-                    "realm" => !is_null($association->getRealm()) ? $association->getRealm() : ''
-                ),
-                intval($association->getLifetime())
-            );
-
-        } catch (UnacquiredLockException $ex1) {
-            throw new ReplayAttackException(sprintf(OpenIdErrorMessages::ReplayAttackPrivateAssociationAlreadyUsed,
-                $association->getHandle()));
-        }
-
-        return $assoc;
-    }
-
-}
\ No newline at end of file
diff --git a/app/services/openid/OpenIdProvider.php b/app/services/openid/OpenIdProvider.php
deleted file mode 100644
index 771375ee..00000000
--- a/app/services/openid/OpenIdProvider.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-namespace services\openid;
-
-use Illuminate\Support\ServiceProvider;
-use openid\services\NonceUniqueIdentifierGenerator;
-use openid\services\OpenIdServiceCatalog;
-use App;
-use utils\services\UtilsServiceCatalog;
-
-class OpenIdProvider extends ServiceProvider {
-
-    /**
-     * Register the service provider.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //register on boot bc we rely on Illuminate\Redis\ServiceProvider\RedisServiceProvider
-        App::singleton(OpenIdServiceCatalog::MementoSerializerService, 'services\\openid\\OpenIdMementoSessionSerializerService');
-        App::singleton(OpenIdServiceCatalog::ServerExtensionsService, 'services\\openid\\ServerExtensionsService');
-        App::singleton(OpenIdServiceCatalog::AssociationService, 'services\\openid\\AssociationService');
-        App::singleton(OpenIdServiceCatalog::TrustedSitesService, 'services\\openid\\TrustedSitesService');
-        App::singleton(OpenIdServiceCatalog::ServerConfigurationService, 'services\\utils\\ServerConfigurationService');
-        App::singleton(OpenIdServiceCatalog::UserService, 'services\\openid\\UserService');
-
-        App::singleton(OpenIdServiceCatalog::NonceService, function(){
-            return new NonceService(
-                App::make(UtilsServiceCatalog::LockManagerService),
-                App::make(UtilsServiceCatalog::CacheService),
-                App::make(UtilsServiceCatalog::ServerConfigurationService),
-                new NonceUniqueIdentifierGenerator(App::make(UtilsServiceCatalog::CacheService))
-            );
-        });
-
-    }
-
-    public function provides()
-    {
-        return array('openid.services');
-    }
-}
\ No newline at end of file
diff --git a/app/services/openid/ServerExtensionsService.php b/app/services/openid/ServerExtensionsService.php
deleted file mode 100644
index e5b3fe93..00000000
--- a/app/services/openid/ServerExtensionsService.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace services\openid;
-
-use openid\services\IServerExtensionsService;
-use utils\services\ServiceLocator;
-use ServerExtension;
-use ReflectionClass;
-
-/**
- * Class ServerExtensionsService
- * @package services\openid
- */
-class ServerExtensionsService implements IServerExtensionsService
-{
-
-	/**
-	 * @return array
-	 */
-	public function getAllActiveExtensions()
-    {
-        $extensions = ServerExtension::where('active', '=', true)->get();
-        $res = array();
-        foreach ($extensions as $extension) {
-            $class_name = $extension->extension_class;
-            if (empty($class_name)) continue;
-
-	        $class              = new ReflectionClass($class_name);
-	        $constructor        = $class->getConstructor();
-	        $constructor_params = $constructor->getParameters();
-
-	        $deps = array();
-
-	        foreach($constructor_params as $constructor_param){
-				$param_class  = $constructor_param->getClass();
-				$name         = $constructor_param->getName();
-				if(is_null($param_class)){
-					array_push($deps,$extension->$name);
-				}
-		        else{
-			        $service = ServiceLocator::getInstance()->getService($param_class->getName());
-			        array_push($deps,$service);
-		        }
-			}
-
-	        $implementation =  $class->newInstanceArgs($deps);
-
-            array_push($res, $implementation);
-        }
-        return $res;
-    }
-}
\ No newline at end of file
diff --git a/app/services/openid/UserService.php b/app/services/openid/UserService.php
deleted file mode 100644
index 56aaa311..00000000
--- a/app/services/openid/UserService.php
+++ /dev/null
@@ -1,287 +0,0 @@
-<?php
-
-namespace services\openid;
-
-use auth\IUserNameGeneratorService;
-use auth\IUserRepository;
-use auth\User;
-use Exception;
-use openid\model\IOpenIdUser;
-use openid\services\IUserService;
-use utils\db\ITransactionService;
-use utils\services\ILogService;
-use Illuminate\Support\Facades\Mail;
-use utils\services\IServerConfigurationService;
-
-/**
- * Class UserService
- * @package services\openid
- */
-final class UserService implements IUserService
-{
-
-     /**
-     * @var IUserRepository
-     */
-    private $repository;
-    /**
-     * @var ILogService
-     */
-    private $log_service;
-    /**
-     * @var ITransactionService
-     */
-    private $tx_service;
-
-    /**
-     * @var IUserNameGeneratorService
-     */
-    private $user_name_generator;
-
-    /**
-     * @var IServerConfigurationService
-     */
-    private $configuration_service;
-
-    /**
-     * UserService constructor.
-     * @param IUserRepository $repository
-     * @param IUserNameGeneratorService $user_name_generator
-     * @param ITransactionService $tx_service
-     * @param IServerConfigurationService $configuration_service
-     * @param ILogService $log_service
-     */
-    public function __construct
-    (
-        IUserRepository $repository,
-        IUserNameGeneratorService $user_name_generator,
-        ITransactionService $tx_service,
-        IServerConfigurationService $configuration_service,
-        ILogService $log_service
-    )
-    {
-        $this->repository            = $repository;
-        $this->user_name_generator   = $user_name_generator;
-        $this->configuration_service = $configuration_service;
-        $this->log_service           = $log_service;
-        $this->tx_service            = $tx_service;
-    }
-
-
-    /**
-     * @param $identifier
-     * @return mixed|void
-     * @throws \Exception
-     */
-    public function updateLastLoginDate($identifier)
-    {
-        try {
-            $user = $this->repository->get($identifier);
-            if (!is_null($user)) {
-                $user->last_login_date = gmdate("Y-m-d H:i:s", time());
-                $this->repository->update($user);
-            }
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-            throw $ex;
-        }
-    }
-
-    /**
-     * @param $identifier
-     * @return mixed|void
-     * @throws \Exception
-     */
-    public function updateFailedLoginAttempts($identifier)
-    {
-        try {
-            $user = $this->repository->get($identifier);
-            if (!is_null($user)) {
-                $user->login_failed_attempt += 1;
-                $this->repository->update($user);
-            }
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-            throw $ex;
-        }
-    }
-
-    /**
-     * @param $identifier
-     * @return mixed|void
-     * @throws \Exception
-     */
-    public function lockUser($identifier)
-    {
-        try {
-            $user = $this->repository->get($identifier);
-            if (!is_null($user)) {
-
-                $user->lock = true;
-                $this->repository->update($user);
-                $support_email = $this->configuration_service->getConfigValue('SupportEmail');
-                Mail::send('emails.auth.user_locked', array
-                (
-                    'user_name'     => $user->getFullName(),
-                    'attempts'      => $user->login_failed_attempt,
-                    'support_email' => $support_email,
-                ), function($message) use ($user, $support_email)
-                {
-                    $message
-                            ->from($support_email, 'OpenStack Support Team')
-                            ->to($user->getEmail(), $user->getFullName())
-                            ->subject('OpenStackId - your user has been locked!');
-                });
-            }
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-            throw $ex;
-        }
-    }
-
-    /**
-     * @param $identifier
-     * @return void
-     * @throws \Exception
-     */
-    public function unlockUser($identifier)
-    {
-        try {
-            $user = $this->repository->get($identifier);
-            if (!is_null($user)) {
-
-                $user->lock = false;
-                $this->repository->update($user);
-            }
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-            throw $ex;
-        }
-    }
-
-    /**
-     * @param $identifier
-     * @return mixed|void
-     * @throws \Exception
-     */
-    public function activateUser($identifier)
-    {
-        try {
-            $user = $this->repository->get($identifier);
-            if (!is_null($user)) {
-                $user->active = true;
-                $this->repository->update($user);
-            }
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-            throw $ex;
-        }
-    }
-
-    /**
-     * @param $identifier
-     * @return mixed|void
-     * @throws \Exception
-     */
-    public function deActivateUser($identifier)
-    {
-        try {
-            $user = $this->repository->get($identifier);
-            if (!is_null($user)) {
-                $user->active = false;
-                $this->repository->update($user);
-            }
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-            throw $ex;
-        }
-    }
-
-    /**
-     * @param $identifier
-     * @param $show_pic
-     * @param $show_full_name
-     * @param $show_email
-     * @return bool
-     * @throws \Exception
-     */
-    public function saveProfileInfo($identifier, $show_pic, $show_full_name, $show_email)
-    {
-        try {
-            $user = $this->repository->get($identifier);
-            if (!is_null($user)) {
-                $user->public_profile_show_photo = $show_pic;
-                $user->public_profile_show_fullname = $show_full_name;
-                $user->public_profile_show_email = $show_email;
-
-                return $this->repository->update($user);
-            }
-        } catch (Exception $ex) {
-            $this->log_service->error($ex);
-            throw $ex;
-        }
-
-        return false;
-    }
-
-    public function get($id)
-    {
-        return $this->repository->get($id);
-    }
-
-    /**
-     * @param int $page_nbr
-     * @param int $page_size
-     * @param array $filters
-     * @param array $fields
-     * @return mixed
-     */
-    public function getAll($page_nbr = 1, $page_size = 10, array $filters = array(), array $fields = array('*'))
-    {
-        return $this->repository->getAll($page_nbr, $page_size, $filters, $fields);
-    }
-
-    /**
-     * @param \Member $member
-     * @return IOpenIdUser
-     */
-    public function buildUser(\Member $member)
-    {
-        $repository          = $this->repository;
-        $user_name_generator = $this->user_name_generator;
-
-        return $this->tx_service->transaction(function () use($member, $user_name_generator, $repository){
-            //create user
-            $old_user = $repository->getByExternalId($member->ID);
-            if(!is_null($old_user))
-                throw new ValidationException(sprintf('already exists an user with external_identifier %s', $member->ID));
-
-            $user                       = new User();
-            $user->external_identifier  = $member->ID;
-            $user->identifier           = $member->ID;
-            $user->last_login_date      = gmdate("Y-m-d H:i:s", time());
-            $user->active               = true;
-            $user->lock                 = false;
-            $user->login_failed_attempt = 0;
-
-            $done                  = false;
-            $fragment_nbr          = 1;
-            $identifier            = $original_identifier = $user_name_generator->generate($member);
-            do
-            {
-                $old_user = $repository->getByIdentifier($identifier);
-                if(!is_null($old_user))
-                {
-                    $identifier = $original_identifier . IUserNameGeneratorService::USER_NAME_CHAR_CONNECTOR . $fragment_nbr;
-                    $fragment_nbr++;
-                    continue;
-                }
-                $user->identifier = $identifier;
-                break;
-            } while (1);
-            $repository->add($user);
-            return $user;
-        });
-    }
-
-}
\ No newline at end of file
diff --git a/app/services/security_policies/DelayCounterMeasure.php b/app/services/security_policies/DelayCounterMeasure.php
deleted file mode 100644
index 89f5219e..00000000
--- a/app/services/security_policies/DelayCounterMeasure.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace services;
-
-use Exception;
-use Log;
-use utils\services\ICacheService;
-use utils\services\ISecurityPolicyCounterMeasure;
-use utils\IPHelper;
-
-/**
- * Class DelayCounterMeasure
- * @package services
- */
-class DelayCounterMeasure implements ISecurityPolicyCounterMeasure
-{
-    private $cache_service;
-
-    public function __construct(ICacheService $cache_service){
-        $this->cache_service = $cache_service;
-    }
-
-    public function trigger(array $params = array())
-    {
-        try {
-            $remote_address = IPHelper::getUserIp();
-            if ($this->cache_service->exists($remote_address)) {
-                Log::warning(sprintf("DelayCounterMeasure: attempt from banned ip %s",$remote_address));
-                $hits = intval($this->cache_service->getSingleValue($remote_address));
-                sleep(2 ^ $hits);
-            }
-        } catch (Exception $ex) {
-            Log::error($ex);
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/services/security_policies/LockUserCounterMeasure.php b/app/services/security_policies/LockUserCounterMeasure.php
deleted file mode 100644
index b3fbac21..00000000
--- a/app/services/security_policies/LockUserCounterMeasure.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace services;
-
-use auth\IUserRepository;
-use Exception;
-use Log;
-use openid\services\IUserService;
-use utils\services\ISecurityPolicyCounterMeasure;
-use utils\services\IServerConfigurationService;
-
-class LockUserCounterMeasure implements ISecurityPolicyCounterMeasure
-{
-    private $server_configuration;
-    private $user_service;
-    private $repository;
-
-    public function __construct(
-        IUserRepository $repository,
-        IUserService $user_service,
-        IServerConfigurationService $server_configuration
-    ) {
-        $this->user_service = $user_service;
-        $this->server_configuration = $server_configuration;
-        $this->repository = $repository;
-    }
-
-    public function trigger(array $params = array())
-    {
-        try {
-
-            if (!isset($params["user_identifier"])) {
-                return;
-            }
-            $user_identifier = $params["user_identifier"];
-
-            $user = $this->repository->getByExternalId($user_identifier);
-            if (is_null($user)) {
-                return;
-            }
-            //apply lock policy
-            if (intval($user->login_failed_attempt) < intval($this->server_configuration->getConfigValue("MaxFailed.Login.Attempts"))) {
-                $this->user_service->updateFailedLoginAttempts($user->id);
-            } else {
-                $this->user_service->lockUser($user->id);
-            }
-        } catch (Exception $ex) {
-            Log::error($ex);
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/services/security_policies/LockUserSecurityPolicy.php b/app/services/security_policies/LockUserSecurityPolicy.php
deleted file mode 100644
index 08354158..00000000
--- a/app/services/security_policies/LockUserSecurityPolicy.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace services;
-
-use DB;
-use Exception;
-use Log;
-use auth\exceptions\AuthenticationInvalidPasswordAttemptException;
-use utils\services\ISecurityPolicy;
-use utils\services\ISecurityPolicyCounterMeasure;
-
-/**
- * Class LockUserSecurityPolicy
- * @package services
- */
-final class LockUserSecurityPolicy implements ISecurityPolicy
-{
-    private $counter_measure;
-    /**
-     * Check if current security policy is meet or not
-     * @return boolean
-     */
-    public function check()
-    {
-        return true;
-    }
-
-    public function setCounterMeasure(ISecurityPolicyCounterMeasure $counter_measure)
-    {
-        $this->counter_measure = $counter_measure;
-    }
-
-    /**
-     * Apply security policy on a exception
-     * @param Exception $ex
-     * @return void
-     */
-    public function apply(Exception $ex)
-    {
-        try {
-            if($ex instanceof AuthenticationInvalidPasswordAttemptException) {
-                $user_identifier = $ex->getIdentifier();
-                if (!is_null($user_identifier) && !empty($user_identifier))
-                    $this->counter_measure->trigger(array('user_identifier' => $user_identifier));
-            }
-        } catch (Exception $ex) {
-            Log::error($ex);
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/services/security_policies/OAuth2LockClientCounterMeasure.php b/app/services/security_policies/OAuth2LockClientCounterMeasure.php
deleted file mode 100644
index 1a8846b4..00000000
--- a/app/services/security_policies/OAuth2LockClientCounterMeasure.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace services;
-
-use Exception;
-use Log;
-use oauth2\services\IClientService;
-use utils\services\ISecurityPolicyCounterMeasure;
-
-class OAuth2LockClientCounterMeasure implements ISecurityPolicyCounterMeasure{
-
-
-	private $client_service;
-
-	public function __construct(IClientService $client_service){
-		$this->client_service = $client_service;
-	}
-
-    public function trigger(array $params = array())
-    {
-        try{
-
-            if (!isset($params["client_id"])) return;
-            $client_id       = $params['client_id'];
-	        $client = $this->client_service->getClientByIdentifier($client_id);
-            if(is_null($client))
-                return;
-            //apply lock policy
-	        $this->client_service->lockClient($client->id);
-        }
-        catch(Exception $ex){
-            Log::error($ex);
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/services/security_policies/OAuth2SecurityPolicy.php b/app/services/security_policies/OAuth2SecurityPolicy.php
deleted file mode 100644
index 45083e88..00000000
--- a/app/services/security_policies/OAuth2SecurityPolicy.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-namespace services;
-
-use DB;
-use Exception;
-use Log;
-use oauth2\services\IClientService;
-use oauth2\services\OAuth2ServiceCatalog;
-use utils\services\ISecurityPolicy;
-use utils\services\ISecurityPolicyCounterMeasure;
-use OAuth2TrailException;
-use utils\services\IServerConfigurationService;
-use utils\services\ServiceLocator;
-use utils\IPHelper;
-
-/**
- * Class OAuth2SecurityPolicy
- * @package services
- */
-class OAuth2SecurityPolicy  implements ISecurityPolicy{
-
-
-    private $exception_dictionary = array();
-    private $server_configuration_service;
-    private $client_service;
-
-    public function __construct(IServerConfigurationService $server_configuration_service, IClientService $client_service)
-    {
-        $this->server_configuration_service = $server_configuration_service;
-	    $this->client_service               = $client_service;
-
-        $this->exception_dictionary = array(
-            'auth2\exceptions\BearerTokenDisclosureAttemptException' => array('OAuth2SecurityPolicy.MaxBearerTokenDisclosureAttempts'),
-            'auth2\exceptions\InvalidClientException'                => array('OAuth2SecurityPolicy.MaxInvalidClientExceptionAttempts'),
-            'auth2\exceptions\InvalidRedeemAuthCodeException'        => array('OAuth2SecurityPolicy.MaxInvalidRedeemAuthCodeAttempts'),
-            'auth2\exceptions\InvalidClientCredentials'              => array('OAuth2SecurityPolicy.MaxInvalidClientCredentialsAttempts'),
-        );
-    }
-    /**
-     * Check if current security policy is meet or not
-     * @return boolean
-     */
-    public function check()
-    {
-        return true;
-    }
-
-    /**
-     * Apply security policy on a exception
-     * @param Exception $ex
-     * @return mixed
-     */
-    public function apply(Exception $ex)
-    {
-        try {
-            if(get_parent_class($ex)=='oauth2\\exceptions\\OAuth2ClientBaseException'){
-                $client_id = $ex->getClientId();
-                //save oauth2 exception by client id
-                if (!is_null($client_id) && !empty($client_id)){
-                    $client                = $this->client_service->getClientById($client_id);
-                    if(is_null($client)){
-                        Log::warning(sprintf("client id %s does not exists!",$client));
-                        return;
-                    }
-
-                    $exception_class       = get_class($ex);
-                    $trail                 = new OAuth2TrailException();
-                    $trail->from_ip        = IPHelper::getUserIp();
-                    $trail->exception_type = $exception_class;
-                    $trail->client_id      = $client->getId();
-                    $trail->Save();
-
-                    //check exception count by type on last "MinutesWithoutExceptions" minutes...
-                    $exception_count = intval(OAuth2TrailException::where('client_id', '=', intval($client->getId()))
-                        ->where('exception_type', '=', $exception_class)
-                        ->where('created_at', '>', DB::raw('( UTC_TIMESTAMP() - INTERVAL ' . $this->server_configuration_service->getConfigValue("OAuth2SecurityPolicy.MinutesWithoutExceptions") . ' MINUTE )'))
-                        ->count());
-
-                    if(array_key_exists($exception_class,$this->exception_dictionary)){
-                        $params                   = $this->exception_dictionary[$exception_class];
-                        $max_attempts             = !is_null($params[0]) && !empty($params[0])? intval($this->server_configuration_service->getConfigValue($params[0])):0;
-                        if ($exception_count >= $max_attempts)
-                            $this->counter_measure->trigger(array('client_id' => $client->getId()));
-                    }
-
-
-                }
-            }
-
-        } catch (Exception $ex) {
-            Log::error($ex);
-        }
-    }
-
-    public function setCounterMeasure(ISecurityPolicyCounterMeasure $counter_measure)
-    {
-        $this->counter_measure = $counter_measure;
-    }
-}
\ No newline at end of file
diff --git a/app/services/security_policies/RevokeAuthorizationCodeRelatedTokens.php b/app/services/security_policies/RevokeAuthorizationCodeRelatedTokens.php
deleted file mode 100644
index ede6e8c9..00000000
--- a/app/services/security_policies/RevokeAuthorizationCodeRelatedTokens.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace services;
-
-use Exception;
-use Log;
-use oauth2\services\ITokenService;
-use utils\services\ISecurityPolicyCounterMeasure;
-
-
-/**
- * Implements
- * http://tools.ietf.org/html/rfc6819#section-5.2.1.1
- * Automatic Revocation of Derived Tokens If Abuse Is Detected
- * If an authorization server observes multiple attempts to redeem an
- * authorization grant (e.g., such as an authorization "code"), the
- * authorization server may want to revoke all tokens granted based on
- * the authorization grant.
- * Class RevokeAuthorizationCodeRelatedTokens
- * @package services
- */
-final class RevokeAuthorizationCodeRelatedTokens implements ISecurityPolicyCounterMeasure {
-
-    /**
-     * @var ITokenService
-     */
-	private $token_service;
-
-	/**
-	 * @param ITokenService $token_service
-	 */
-	public function __construct(ITokenService $token_service){
-		$this->token_service = $token_service;
-	}
-
-    /**
-     * @param array $params
-     */
-    public function trigger(array $params = array())
-    {
-        try {
-            if (!isset($params["auth_code"])) return;
-            $auth_code      = $params["auth_code"];
-	        $this->token_service->revokeAuthCodeRelatedTokens($auth_code);
-        } catch (Exception $ex) {
-            Log::error($ex);
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/services/utils/EloquentTransactionService.php b/app/services/utils/EloquentTransactionService.php
deleted file mode 100644
index 72458fd0..00000000
--- a/app/services/utils/EloquentTransactionService.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-namespace services\utils;
-
-
-use Closure;
-use utils\db\ITransactionService;
-use DB;
-
-/**
- * Class EloquentTransactionService
- * @package services\utils
- */
-class EloquentTransactionService implements ITransactionService {
-
-	/**
-	 * Execute a Closure within a transaction.
-	 *
-	 * @param  Closure $callback
-	 * @return mixed
-	 *
-	 * @throws \Exception
-	 */
-	public function transaction(Closure $callback)
-	{
-		return DB::transaction($callback);
-	}
-}
\ No newline at end of file
diff --git a/app/services/utils/LogService.php b/app/services/utils/LogService.php
deleted file mode 100644
index 9bc0b9c0..00000000
--- a/app/services/utils/LogService.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace services\utils;
-
-use Exception;
-use Log;
-use utils\services\ILogService;
-
-/**
- * Class LogService
- * @package services\utils
- */
-final class LogService implements ILogService
-{
-
-    public function error(Exception $exception)
-    {
-        Log::error($exception);
-    }
-
-    public function warning(Exception $exception)
-    {
-        Log::warning($exception);
-    }
-
-    public function info(Exception $exception)
-    {
-        Log::info($exception);
-    }
-
-    public function warning_msg($msg)
-    {
-        Log::warning($msg);
-    }
-
-    public function error_msg($msg)
-    {
-        Log::error($msg);
-    }
-
-    public function debug_msg($msg)
-    {
-        Log::debug($msg);
-    }
-}
\ No newline at end of file
diff --git a/app/services/utils/UtilsProvider.php b/app/services/utils/UtilsProvider.php
deleted file mode 100644
index 4515c7fd..00000000
--- a/app/services/utils/UtilsProvider.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-namespace services\utils;
-
-use Illuminate\Support\ServiceProvider;
-use utils\services\UtilsServiceCatalog;
-use Illuminate\Foundation\AliasLoader;
-use App;
-
-class UtilsProvider extends ServiceProvider {
-
-    protected $defer = false;
-    /**
-     * Register the service provider.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        App::singleton(UtilsServiceCatalog::CacheService, 'services\\utils\\RedisCacheService');
-	    App::singleton(UtilsServiceCatalog::TransactionService, 'services\\utils\\EloquentTransactionService');
-
-        App::resolving('redis',function($redis){
-            $cache_service = App::make(UtilsServiceCatalog::CacheService);
-            $cache_service->boot();
-        });
-
-        $this->app['serverconfigurationservice'] = App::share(function ($app) {
-            return new ServerConfigurationService(App::make(UtilsServiceCatalog::CacheService),App::make(UtilsServiceCatalog::TransactionService));
-        });
-
-        $this->app['externalurlservice'] = App::share(function ($app) {
-            return new ExternalUrlService();
-        });
-
-        // Shortcut so developers don't need to add an Alias in app/config/app.php
-        App::booting(function () {
-            $loader = AliasLoader::getInstance();
-            $loader->alias('ServerConfigurationService', 'services\\facades\\ServerConfigurationService');
-            $loader->alias('ExternalUrlService', 'services\\facades\\ExternalUrlService');
-        });
-
-        App::singleton(UtilsServiceCatalog::LogService, 'services\\utils\\LogService');
-        App::singleton(UtilsServiceCatalog::LockManagerService, 'services\\utils\\LockManagerService');
-        App::singleton(UtilsServiceCatalog::ServerConfigurationService, 'services\\utils\\ServerConfigurationService');
-        App::singleton(UtilsServiceCatalog::BannedIpService, 'services\\utils\\BannedIPService');
-
-    }
-
-    public function provides()
-    {
-        return array('utils.services');
-    }
-
-    public function when(){
-        return array('redis');
-    }
-}
\ No newline at end of file
diff --git a/app/start/artisan.php b/app/start/artisan.php
deleted file mode 100644
index 1df850bc..00000000
--- a/app/start/artisan.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/*
-|--------------------------------------------------------------------------
-| Register The Artisan Commands
-|--------------------------------------------------------------------------
-|
-| Each available Artisan command must be registered with the console so
-| that it is available to be called. We'll register every command so
-| the console gets access to each of the command object instances.
-|
-*/
-
diff --git a/app/start/global.php b/app/start/global.php
deleted file mode 100644
index dd4728e7..00000000
--- a/app/start/global.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-/*
-|--------------------------------------------------------------------------
-| Register The Laravel Class Loader
-|--------------------------------------------------------------------------
-|
-| In addition to using Composer, you may use the Laravel class loader to
-| load your controllers and models. This is useful for keeping all of
-| your classes in the "global" namespace without Composer updating.
-|
-*/
-use openid\exceptions\InvalidOpenIdMessageException;
-use utils\services\ServiceLocator;
-use utils\services\UtilsServiceCatalog;
-use oauth2\exceptions\InvalidOAuth2Request;
-use Monolog\Handler\NativeMailerHandler;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Config;
-
-ClassLoader::addDirectories(array(
-    app_path() . '/commands',
-    app_path() . '/controllers',
-    app_path() . '/models',
-    app_path() . '/database/seeds',
-));
-
-/*
-|--------------------------------------------------------------------------
-| Application Error Logger
-|--------------------------------------------------------------------------
-|
-| Here we will configure the error logger setup for the application which
-| is built on top of the wonderful Monolog library. By default we will
-| build a rotating log file setup which creates a new file each day.
-|
-*/
-
-$logFile = 'log-' . php_sapi_name() . '.txt';
-
-Log::useDailyFiles(storage_path() . '/logs/' . $logFile, $days = 0, Config::get('server.FileLog_Level', 'warning'));
-
-//set email log
-$to          = Config::get('log.to_email');
-$from        = Config::get('log.from_email');
-
-if(!empty($to) && !empty($from)){
-    $subject     = 'openstackid error';
-    $mono_log    = Log::getMonolog();
-    $handler = new NativeMailerHandler($to, $subject, $from);
-    $handler->setLevel(Config::get('server.EmailLog_Level', 'error'));
-    $mono_log->pushHandler($handler);
-}
-
-if (Config::get('database.log', false)){
-
-    Event::listen('illuminate.query', function($query, $bindings, $time, $name)
-    {
-        $data = compact('bindings', 'time', 'name');
-
-        // Format binding data for sql insertion
-        foreach ($bindings as $i => $binding)
-        {
-            if ($binding instanceof \DateTime)
-            {
-                $bindings[$i] = $binding->format('\'Y-m-d H:i:s\'');
-            }
-            else if (is_string($binding))
-            {
-                $bindings[$i] = "'$binding'";
-            }
-        }
-
-        // Insert bindings into query
-        $query = str_replace(array('%', '?'), array('%%', '%s'), $query);
-        $query = vsprintf($query, $bindings);
-
-        Log::info($query, $data);
-    });
-}
-/*
-|--------------------------------------------------------------------------
-| Application Error Handler
-|--------------------------------------------------------------------------
-|
-| Here you may handle any errors that occur in your application, including
-| logging them or displaying custom views for specific errors. You may
-| even register several error handlers to handle different types of
-| exceptions. If nothing is returned, the default error view is
-| shown, which includes a detailed stack trace during debug.
-|
-*/
-
-App::error(function (Exception $exception, $code) {
-    Log::error($exception);
-    if(!App::runningInConsole()) {
-        $checkpoint_service = ServiceLocator::getInstance()->getService(UtilsServiceCatalog::CheckPointService);
-        if ($checkpoint_service) {
-            $checkpoint_service->trackException($exception);
-        }
-        return Response::view('404', array(), 404);
-    }
-});
-
-App::error(function (InvalidOpenIdMessageException $exception, $code) {
-    Log::warning($exception);
-    if(!App::runningInConsole()) {
-        $checkpoint_service = ServiceLocator::getInstance()->getService(UtilsServiceCatalog::CheckPointService);
-        if ($checkpoint_service) {
-            $checkpoint_service->trackException($exception);
-        }
-        return Response::view('404', array(), 404);
-    }
-});
-
-App::error(function(\Symfony\Component\HttpKernel\Exception\NotFoundHttpException $exception, $code){
-    Log::warning($exception);
-    if(!App::runningInConsole()) {
-        return Response::view('404', array(), 404);
-    }
-});
-
-App::error(function(\Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException $exception, $code){
-    Log::warning($exception);
-    if(!App::runningInConsole()) {
-        return Response::view('404', array(), 404);
-    }
-});
-
-App::error(function(Illuminate\Session\TokenMismatchException $exception, $code){
-    Log::warning($exception);
-    if(!App::runningInConsole()) {
-        return Response::view('404', array(), 404);
-    }
-});
-
-App::error(function (InvalidOAuth2Request $exception, $code) {
-    Log::warning($exception);
-    if(!App::runningInConsole()) {
-        $checkpoint_service = ServiceLocator::getInstance()->getService(UtilsServiceCatalog::CheckPointService);
-        if ($checkpoint_service) {
-            $checkpoint_service->trackException($exception);
-        }
-        return Response::view('404', array(), 404);
-    }
-});
-
-/*
-|--------------------------------------------------------------------------
-| Maintenance Mode Handler
-|--------------------------------------------------------------------------
-|
-| The "down" Artisan command gives you the ability to put an application
-| into maintenance mode. Here, you will define what is displayed back
-| to the user if maintenace mode is in effect for this application.
-|
-*/
-
-App::down(function () {
-    return Response::make("Be right back!", 503);
-});
-
-/*
-|--------------------------------------------------------------------------
-| Require The Filters File
-|--------------------------------------------------------------------------
-|
-| Next we will load the filters file for the application. This gives us
-| a nice separate location to store our route and application filter
-| definitions instead of putting them all in the main routes file.
-|
-*/
-
-require app_path() . '/filters.php';
-require app_path() . '/validators.php';
\ No newline at end of file
diff --git a/app/start/local.php b/app/start/local.php
deleted file mode 100644
index adab104c..00000000
--- a/app/start/local.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
- //
\ No newline at end of file
diff --git a/app/storage/.gitignore b/app/storage/.gitignore
deleted file mode 100755
index 35b719c6..00000000
--- a/app/storage/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-services.manifest
\ No newline at end of file
diff --git a/app/storage/.gitkeep b/app/storage/.gitkeep
deleted file mode 100755
index e69de29b..00000000
diff --git a/app/storage/cache/.gitignore b/app/storage/cache/.gitignore
deleted file mode 100755
index c96a04f0..00000000
--- a/app/storage/cache/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/app/storage/logs/.gitignore b/app/storage/logs/.gitignore
deleted file mode 100755
index c96a04f0..00000000
--- a/app/storage/logs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/app/storage/meta/.gitignore b/app/storage/meta/.gitignore
deleted file mode 100755
index c96a04f0..00000000
--- a/app/storage/meta/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/app/storage/sessions/.gitignore b/app/storage/sessions/.gitignore
deleted file mode 100755
index c96a04f0..00000000
--- a/app/storage/sessions/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/app/storage/views/.gitignore b/app/storage/views/.gitignore
deleted file mode 100755
index c96a04f0..00000000
--- a/app/storage/views/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/app/strategies/DirectResponseStrategy.php b/app/strategies/DirectResponseStrategy.php
deleted file mode 100644
index 164b2baa..00000000
--- a/app/strategies/DirectResponseStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace strategies;
-
-use utils\IHttpResponseStrategy;
-use Response;
-
-class DirectResponseStrategy implements IHttpResponseStrategy
-{
-
-    public function handle($response)
-    {
-        $http_response = Response::make($response->getContent(), $response->getHttpCode());
-        $http_response->header('Content-Type', $response->getContentType());
-        $http_response->header('Cache-Control','no-cache, no-store, max-age=0, must-revalidate');
-        $http_response->header('Pragma','no-cache');
-        return $http_response;
-    }
-}
\ No newline at end of file
diff --git a/app/strategies/IConsentStrategy.php b/app/strategies/IConsentStrategy.php
deleted file mode 100644
index 38e5ab28..00000000
--- a/app/strategies/IConsentStrategy.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace strategies;
-
-interface IConsentStrategy {
-    public function getConsent();
-    public function postConsent($trust_action);
-} 
\ No newline at end of file
diff --git a/app/strategies/IndirectResponseQueryStringStrategy.php b/app/strategies/IndirectResponseQueryStringStrategy.php
deleted file mode 100644
index af2a0f32..00000000
--- a/app/strategies/IndirectResponseQueryStringStrategy.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-
-namespace strategies;
-
-use utils\IHttpResponseStrategy;
-use Redirect;
-use Response;
-use Log;
-/**
- * Class IndirectResponseQueryStringStrategy
- * Redirect and http response using a 302 adding params on query string
- * @package strategies
- */
-class IndirectResponseQueryStringStrategy implements IHttpResponseStrategy
-{
-
-    /**
-     * @param $response
-     * @return mixed
-     */
-    public function handle($response)
-    {
-        $query_string = $response->getContent();
-        $return_to    = $response->getReturnTo();
-
-        if (is_null($return_to) || empty($return_to)) {
-            return Response::view('404', array(), 404);
-        }
-        $return_to = (strpos($return_to, "?") == false) ? $return_to . "?" . $query_string : $return_to . "&" . $query_string;
-
-        return Redirect::to($return_to)
-            ->header('Cache-Control', 'no-cache, no-store, max-age=0, must-revalidate')
-            ->header('Pragma','no-cache');
-    }
-}
\ No newline at end of file
diff --git a/app/strategies/IndirectResponseUrlFragmentStrategy.php b/app/strategies/IndirectResponseUrlFragmentStrategy.php
deleted file mode 100644
index 692d4a70..00000000
--- a/app/strategies/IndirectResponseUrlFragmentStrategy.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace strategies;
-
-use utils\IHttpResponseStrategy;
-use Redirect;
-use Response;
-use Log;
-/**
- * Class IndirectResponseUrlFragmentStrategy
- * Redirect and http response using a 302 adding params on url fragment
- * @package strategies
- */
-class IndirectResponseUrlFragmentStrategy implements IHttpResponseStrategy
-{
-
-    /**
-     * @param $response
-     * @return mixed
-     */
-    public function handle($response)
-    {
-        $fragment  = $response->getContent();
-        $return_to = $response->getReturnTo();
-
-        if (is_null($return_to) || empty($return_to)) {
-            return Response::view('404', array(), 404);;
-        }
-
-        $return_to = (strpos($return_to, "#") == false) ? $return_to . "#" . $fragment : $return_to . "&" . $fragment;
-
-        return Redirect::to($return_to)
-            ->header('Cache-Control', 'no-cache, no-store, max-age=0, must-revalidate')
-            ->header('Pragma','no-cache');
-    }
-}
\ No newline at end of file
diff --git a/app/strategies/OAuth2AuthenticationStrategy.php b/app/strategies/OAuth2AuthenticationStrategy.php
deleted file mode 100644
index 04f97e1d..00000000
--- a/app/strategies/OAuth2AuthenticationStrategy.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: smarcet
- * Date: 12/4/13
- * Time: 11:32 AM
- */
-
-namespace strategies;
-
-use oauth2\requests\OAuth2AuthorizationRequest;
-use oauth2\strategies\IOAuth2AuthenticationStrategy;
-use Redirect;
-
-class OAuth2AuthenticationStrategy implements IOAuth2AuthenticationStrategy {
-
-    public function doLogin(OAuth2AuthorizationRequest $request)
-    {
-        return Redirect::action('UserController@getLogin');
-    }
-
-    public function doConsent(OAuth2AuthorizationRequest $request)
-    {
-        return Redirect::action('UserController@getConsent');
-    }
-}
\ No newline at end of file
diff --git a/app/strategies/OpenIdLoginStrategy.php b/app/strategies/OpenIdLoginStrategy.php
deleted file mode 100644
index 2478a09b..00000000
--- a/app/strategies/OpenIdLoginStrategy.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-namespace strategies;
-
-use Auth;
-use openid\OpenIdMessage;
-use openid\OpenIdProtocol;
-use openid\requests\OpenIdAuthenticationRequest;
-use openid\services\IMementoOpenIdSerializerService;
-use Redirect;
-use services\IUserActionService;
-use utils\IPHelper;
-use utils\services\IAuthService;
-use View;
-
-/**
- * Class OpenIdLoginStrategy
- * @package strategies
- */
-final class OpenIdLoginStrategy extends DefaultLoginStrategy
-{
-
-    /**
-     * @var IMementoOpenIdSerializerService
-     */
-    private $memento_service;
-
-    /**
-     * @param IMementoOpenIdSerializerService $memento_service
-     * @param IUserActionService $user_action_service
-     * @param IAuthService $auth_service
-     */
-    public function __construct(
-        IMementoOpenIdSerializerService $memento_service,
-        IUserActionService $user_action_service,
-        IAuthService $auth_service
-    ) {
-        $this->memento_service = $memento_service;
-
-        parent::__construct($user_action_service, $auth_service);
-    }
-
-    public function getLogin()
-    {
-        if (Auth::guest()) {
-            $msg = OpenIdMessage::buildFromMemento($this->memento_service->load());
-            $auth_request = new OpenIdAuthenticationRequest($msg);
-            $params = array('realm' => $auth_request->getRealm());
-
-            if (!$auth_request->isIdentitySelectByOP()) {
-                $params['claimed_id'] = $auth_request->getClaimedId();
-                $params['identity'] = $auth_request->getIdentity();
-                $params['identity_select'] = false;
-            } else {
-                $params['identity_select'] = true;
-            }
-
-            return View::make("login", $params);
-        } else {
-            return Redirect::action("UserController@getProfile");
-        }
-    }
-
-    public function  postLogin()
-    {
-        //go to authentication flow again
-        $msg = OpenIdMessage::buildFromMemento($this->memento_service->load());
-        $this->user_action_service->addUserAction($this->auth_service->getCurrentUser(), IPHelper::getUserIp(),
-            IUserActionService::LoginAction, $msg->getParam(OpenIdProtocol::OpenIDProtocol_Realm));
-
-        return Redirect::action("OpenIdProviderController@endpoint");
-    }
-
-    public function  cancelLogin()
-    {
-        $this->auth_service->setUserAuthenticationResponse(IAuthService::AuthenticationResponse_Cancel);
-
-        return Redirect::action("OpenIdProviderController@endpoint");
-    }
-}
\ No newline at end of file
diff --git a/app/strategies/StrategyProvider.php b/app/strategies/StrategyProvider.php
deleted file mode 100644
index 2dcdc145..00000000
--- a/app/strategies/StrategyProvider.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace strategies;
-
-use App;
-use Illuminate\Support\ServiceProvider;
-use oauth2\responses\OAuth2DirectResponse;
-use oauth2\responses\OAuth2IndirectResponse;
-use oauth2\responses\OAuth2PostResponse;
-use openid\responses\OpenIdDirectResponse;
-use openid\responses\OpenIdIndirectResponse;
-use oauth2\responses\OAuth2IndirectFragmentResponse;
-use openid\services\OpenIdServiceCatalog;
-use oauth2\services\OAuth2ServiceCatalog;
-
-/**
- * Class StrategyProvider
- * @package strategies
- */
-final class StrategyProvider extends ServiceProvider
-{
-
-    public function boot()
-    {
-    }
-
-    public function register()
-    {
-        //direct response strategy
-        App::singleton(OAuth2PostResponse::OAuth2PostResponse, 'strategies\\PostResponseStrategy');
-        App::singleton(OAuth2DirectResponse::OAuth2DirectResponse, 'strategies\\DirectResponseStrategy');
-        App::singleton(OpenIdDirectResponse::OpenIdDirectResponse, 'strategies\\DirectResponseStrategy');
-        //indirect response strategy
-        App::singleton(OpenIdIndirectResponse::OpenIdIndirectResponse, 'strategies\\IndirectResponseQueryStringStrategy');
-        App::singleton(OAuth2IndirectResponse::OAuth2IndirectResponse, 'strategies\\IndirectResponseQueryStringStrategy');
-        App::singleton(OAuth2IndirectFragmentResponse::OAuth2IndirectFragmentResponse,'strategies\\IndirectResponseUrlFragmentStrategy');
-        // authentication strategies
-        App::singleton(OAuth2ServiceCatalog::AuthenticationStrategy, 'strategies\\OAuth2AuthenticationStrategy');
-        App::singleton(OpenIdServiceCatalog::AuthenticationStrategy, 'strategies\\OpenIdAuthenticationStrategy');
-    }
-
-    public function provides()
-    {
-        return array('strategies');
-    }
-}
\ No newline at end of file
diff --git a/app/tests/AssociationServiceTest.php b/app/tests/AssociationServiceTest.php
deleted file mode 100644
index 7b8bd5e2..00000000
--- a/app/tests/AssociationServiceTest.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-
-use openid\services\AssociationService;
-use openid\services\OpenIdServiceCatalog;
-use utils\services\IAuthService;
-use Way\Tests\Factory;
-use openid\helpers\AssociationFactory;
-use openid\OpenIdProtocol;
-use utils\services\UtilsServiceCatalog;
-use utils\exceptions\UnacquiredLockException;
-
-class AssociationServiceTest extends TestCase {
-
-	public function __construct(){
-
-	}
-
-	public function tearDown()
-	{
-		Mockery::close();
-	}
-
-	protected function prepareForTests()
-	{
-		parent::prepareForTests();
-	}
-
-	public function testAddPrivateAssociation(){
-
-		$cache_stub = new CacheServiceStub;
-		$this->app->instance(UtilsServiceCatalog::CacheService,$cache_stub);
-
-		$lock_manager_service_mock = Mockery::mock('utils\services\ILockManagerService');
-		$lock_manager_service_mock->shouldReceive('acquireLock')->once();
-
-		$this->app->instance(UtilsServiceCatalog::LockManagerService ,$lock_manager_service_mock);
-
-		$service = $this->app[OpenIdServiceCatalog::AssociationService];
-		$assoc   = AssociationFactory::getInstance()->buildPrivateAssociation('https://www.test.com/', 3600);
-		$res     = $service->addAssociation($assoc);
-
-		$this->assertTrue(!is_null($res));
-	}
-
-
-	public function testAddSessionAssociation(){
-
-		$cache_stub = new CacheServiceStub;
-		$this->app->instance(UtilsServiceCatalog::CacheService,$cache_stub);
-
-		$lock_manager_service_mock = Mockery::mock('utils\services\ILockManagerService');
-		$lock_manager_service_mock->shouldReceive('acquireLock')->once();
-
-		$this->app->instance(UtilsServiceCatalog::LockManagerService ,$lock_manager_service_mock);
-
-		$service = $this->app[OpenIdServiceCatalog::AssociationService];
-		$assoc   = AssociationFactory::getInstance()->buildSessionAssociation(OpenIdProtocol::AssociationSessionTypeDHSHA256, 3600);
-		$res     = $service->addAssociation($assoc);
-
-		$this->assertTrue(!is_null($res));
-	}
-
-	public function testGetSessionAssociationRedisCrash(){
-
-		$cache_mock = Mockery::mock('utils\services\ICacheService');
-		$cache_mock->shouldReceive('storeHash')->once();
-		$this->app->instance(UtilsServiceCatalog::CacheService,$cache_mock);
-
-		$lock_manager_service_mock = Mockery::mock('utils\services\ILockManagerService');
-		$lock_manager_service_mock->shouldReceive('acquireLock')->once();
-
-		$this->app->instance(UtilsServiceCatalog::LockManagerService ,$lock_manager_service_mock);
-
-		$service = $this->app[OpenIdServiceCatalog::AssociationService];
-		$assoc   = AssociationFactory::getInstance()->buildSessionAssociation(OpenIdProtocol::AssociationSessionTypeDHSHA256, 3600);
-		$res     = $service->addAssociation($assoc);
-
-		$this->assertTrue(!is_null($res));
-		$hash = null;
-		$cache_mock->shouldReceive('storeHash')->once()->andReturnUsing(function($name, $values, $ttl) use(&$hash){
-			$hash = $values;
-		});
-		$cache_mock->shouldReceive('exists')->once()->andReturn(false);
-		$cache_mock->shouldReceive('getHash')->once()->andReturnUsing(function($name, $values) use(&$hash){
-			return $hash;
-		});
-
-		$res2  = $service->getAssociation($res->getHandle());
-
-		$this->assertTrue(!is_null($res2));
-
-		$this->assertTrue($res2->getSecret()===$res->getSecret());
-	}
-
-
-	/**
-	 * @expectedException \openid\exceptions\InvalidAssociation
-	 */
-	public function testGetSessionAssociationMustFail_InvalidAssociation(){
-
-		$cache_mock = Mockery::mock('utils\services\ICacheService');
-		$cache_mock->shouldReceive('storeHash')->once();
-		$this->app->instance(UtilsServiceCatalog::CacheService,$cache_mock);
-
-		$lock_manager_service_mock = Mockery::mock('utils\services\ILockManagerService');
-		$lock_manager_service_mock->shouldReceive('acquireLock')->once();
-
-		$this->app->instance(UtilsServiceCatalog::LockManagerService ,$lock_manager_service_mock);
-
-		$repo_mock = Mockery::mock('openid\repositories\IOpenIdAssociationRepository');
-		$this->app->instance('openid\repositories\IOpenIdAssociationRepository',$repo_mock);
-		$repo_mock->shouldReceive('add')->once();
-		$repo_mock->shouldReceive('getByHandle')->once()->andReturnNull();
-
-		$service = $this->app[OpenIdServiceCatalog::AssociationService];
-		$assoc   = AssociationFactory::getInstance()->buildSessionAssociation(OpenIdProtocol::AssociationSessionTypeDHSHA256, 3600);
-		$res     = $service->addAssociation($assoc);
-
-		$this->assertTrue(!is_null($res));
-		$hash = null;
-		$cache_mock->shouldReceive('exists')->once()->andReturn(false);
-		$service->getAssociation($res->getHandle());
-	}
-
-
-	/**
-	 * @expectedException \openid\exceptions\ReplayAttackException
-	 */
-	public function testAddPrivateAssociationMustFail_ReplayAttackException(){
-
-		$cache_stub = new CacheServiceStub;
-		$this->app->instance(UtilsServiceCatalog::CacheService,$cache_stub);
-
-		$lock_manager_service_mock = Mockery::mock('utils\services\ILockManagerService');
-		$lock_manager_service_mock->shouldReceive('acquireLock')->once();
-
-		$this->app->instance(UtilsServiceCatalog::LockManagerService ,$lock_manager_service_mock);
-
-		$service = $this->app[OpenIdServiceCatalog::AssociationService];
-		$assoc   = AssociationFactory::getInstance()->buildPrivateAssociation('https://www.test.com/', 3600);
-		$res     = $service->addAssociation($assoc);
-
-		$this->assertTrue(!is_null($res));
-		$lock_manager_service_mock->shouldReceive('acquireLock')->once()->andThrow(new UnacquiredLockException);
-		$service->addAssociation($assoc);
-	}
-
-	public function testGetPrivateAssociation(){
-
-		$cache_stub = new CacheServiceStub;
-		$this->app->instance(UtilsServiceCatalog::CacheService,$cache_stub);
-
-		$lock_manager_service_mock = Mockery::mock('utils\services\ILockManagerService');
-		$lock_manager_service_mock->shouldReceive('acquireLock')->twice();
-
-		$this->app->instance(UtilsServiceCatalog::LockManagerService ,$lock_manager_service_mock);
-
-		$service = $this->app[OpenIdServiceCatalog::AssociationService];
-		$assoc   = AssociationFactory::getInstance()->buildPrivateAssociation('https://www.test.com/', 3600);
-		$res     = $service->addAssociation($assoc);
-
-		$this->assertTrue(!is_null($res));
-
-		$res2 = $service->getAssociation($res->getHandle(),'https://www.test.com/');
-
-		$this->assertTrue(!is_null($res2));
-
-		$this->assertTrue($res2->getSecret()===$res->getSecret());
-	}
-
-
-	/**
-	 * @expectedException \openid\exceptions\OpenIdInvalidRealmException
-	 */
-	public function testGetPrivateAssociationMustFail_OpenIdInvalidRealmException(){
-
-		$cache_stub = new CacheServiceStub;
-		$this->app->instance(UtilsServiceCatalog::CacheService,$cache_stub);
-
-		$lock_manager_service_mock = Mockery::mock('utils\services\ILockManagerService');
-		$lock_manager_service_mock->shouldReceive('acquireLock')->once();
-
-		$this->app->instance(UtilsServiceCatalog::LockManagerService ,$lock_manager_service_mock);
-
-		$service = $this->app[OpenIdServiceCatalog::AssociationService];
-		$assoc   = AssociationFactory::getInstance()->buildPrivateAssociation('https://www.test.com/', 3600);
-		$res     = $service->addAssociation($assoc);
-
-		$this->assertTrue(!is_null($res));
-
-		$service->getAssociation($res->getHandle(),'https://www1.test.com/');
-	}
-
-	/**
-	 * @expectedException \openid\exceptions\InvalidAssociation
-	 */
-	public function testGetPrivateAssociationMustFail_InvalidAssociation(){
-
-		$cache_stub = new CacheServiceStub;
-		$this->app->instance(UtilsServiceCatalog::CacheService,$cache_stub);
-
-		$lock_manager_service_mock = Mockery::mock('utils\services\ILockManagerService');
-		$lock_manager_service_mock->shouldReceive('acquireLock')->once();
-
-		$this->app->instance(UtilsServiceCatalog::LockManagerService ,$lock_manager_service_mock);
-
-		$service = $this->app[OpenIdServiceCatalog::AssociationService];
-		$assoc   = AssociationFactory::getInstance()->buildPrivateAssociation('https://www.test.com/', 3600);
-		$res     = $service->addAssociation($assoc);
-
-		$this->assertTrue(!is_null($res));
-
-		$service->getAssociation('123456','https://www1.test.com/');
-	}
-
-
-	/**
-	 * @expectedException \openid\exceptions\ReplayAttackException
-	 */
-	public function testGetPrivateAssociationMustFail_ReplayAttackException(){
-
-
-		$cache_stub = new CacheServiceStub;
-		$this->app->instance(UtilsServiceCatalog::CacheService,$cache_stub);
-
-		$lock_manager_service_mock = Mockery::mock('utils\services\ILockManagerService');
-		$lock_manager_service_mock->shouldReceive('acquireLock')->times(2);
-
-		$this->app->instance(UtilsServiceCatalog::LockManagerService ,$lock_manager_service_mock);
-
-		$service = $this->app[OpenIdServiceCatalog::AssociationService];
-		$assoc   = AssociationFactory::getInstance()->buildPrivateAssociation('https://www.test.com/', 3600);
-		$res     = $service->addAssociation($assoc);
-
-		$this->assertTrue(!is_null($res));
-
-		$res2 = $service->getAssociation($res->getHandle(),'https://www.test.com/');
-
-		$this->assertTrue(!is_null($res2));
-
-		$this->assertTrue($res2->getSecret()===$res->getSecret());
-		$lock_manager_service_mock->shouldReceive('acquireLock')->once()->andThrow(new UnacquiredLockException);
-		$service->getAssociation($res->getHandle(),'https://www.test.com/');
-	}
-} 
\ No newline at end of file
diff --git a/app/tests/ExceptionTest.php b/app/tests/ExceptionTest.php
deleted file mode 100644
index 0852f0b6..00000000
--- a/app/tests/ExceptionTest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: smarcet
- * Date: 11/8/13
- * Time: 1:21 PM
- */
-use openid\exceptions\ReplayAttackException;
-class ExceptionTest extends TestCase{
-
-    private function getExName(\Exception $ex){
-        return get_class($ex);
-    }
-
-    public function testExceptionTypes(){
-        $ex1 = new ReplayAttackException();
-        $class_name = $this->getExName($ex1);
-        $this->assertTrue($class_name == 'openid\exceptions\ReplayAttackException');
-    }
-} 
\ No newline at end of file
diff --git a/app/tests/OpenIdProviderControllerTest.php b/app/tests/OpenIdProviderControllerTest.php
deleted file mode 100644
index 39189de0..00000000
--- a/app/tests/OpenIdProviderControllerTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-class OpenIdProviderControllerTest extends TestCase
-{
-
-    public function testOpenIdRequest()
-    {
-        $params = array(
-            "openid.ns" => "http://specs.openid.net/auth/2.0",
-            "openid.claimed_id" => "http://specs.openid.net/auth/2.0/identifier_select",
-            "openid.identity" => "http://specs.openid.net/auth/2.0/identifier_select",
-            "openid.return_to" => "http://www.test.com",
-            "openid.realm" => "http://www.test.com/",
-            "openid.mode" => "checkid_setup"
-        );
-
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $params);
-    }
-}
\ No newline at end of file
diff --git a/app/tests/ServerExtensionTest.php b/app/tests/ServerExtensionTest.php
deleted file mode 100644
index 8cb1ecd4..00000000
--- a/app/tests/ServerExtensionTest.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-class ServerExtensionTest extends TestCase
-{
-
-    public function testAddServerExtension()
-    {
-        $new_ext = new ServerExtension();
-        $new_ext->name = 'AX';
-        $new_ext->description = 'OpenID service extension for exchanging identity information between endpoints';
-        $new_ext->namespace = 'http://openid.net/srv/ax/1.0';
-        $new_ext->active = true;
-        $new_ext->extension_class = '';
-        $new_ext->save();
-        $ax = ServerExtension::where('name', '=', 'AX')->firstOrFail();
-        $this->assertTrue($ax !== null);
-    }
-}
\ No newline at end of file
diff --git a/app/tests/TestCase.php b/app/tests/TestCase.php
deleted file mode 100644
index ea8d6de7..00000000
--- a/app/tests/TestCase.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-class TestCase extends Illuminate\Foundation\Testing\TestCase {
-
-    private $redis;
-
-    public function __construct(){
-
-    }
-
-    public function setUp()
-    {
-        parent::setUp(); // Don't forget this!
-        $this->redis = \RedisLV4::connection();
-        $this->redis->flushall();
-        $this->prepareForTests();
-    }
-
-
-     /**
-     * Migrates the database and set the mailer to 'pretend'.
-     * This will cause the tests to run quickly.
-     *
-     */
-    protected function prepareForTests()
-    {
-        Artisan::call('migrate');
-        Mail::pretend(true);
-        $this->seed('TestSeeder');
-    }
-
-	/**
-	 * Creates the application.
-	 *
-	 * @return Symfony\Component\HttpKernel\HttpKernelInterface
-	 */
-	public function createApplication()
-	{
-		$unitTesting = true;
-
-		$testEnvironment = 'testing';
-
-		return require __DIR__.'/../../bootstrap/start.php';
-	}
-
-}
diff --git a/app/validators.php b/app/validators.php
deleted file mode 100644
index edce4da5..00000000
--- a/app/validators.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-Validator::resolver(function($translator, $data, $rules, $messages)
-{
-    return new CustomValidator($translator, $data, $rules, $messages);
-});
\ No newline at end of file
diff --git a/app/views/emails/auth/user_locked.blade.php b/app/views/emails/auth/user_locked.blade.php
deleted file mode 100644
index dfdaedfe..00000000
--- a/app/views/emails/auth/user_locked.blade.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-    <meta charset="utf-8">
-</head>
-<body>
-<p>Dear {{$user_name}}, your user got blocked after {{$attempts}} failed login attempts.</p>
-<p>Please send an email to {{$support_email}} in order to reactive it again.</p>
-<p>Cheers,<br/>OpenStack Support Team</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/app/views/layout.blade.php b/app/views/layout.blade.php
deleted file mode 100644
index 3a6ba319..00000000
--- a/app/views/layout.blade.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    @yield('title')
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    @yield('meta')
-    {{ HTML::style('bower_assets/bootstrap/dist/css/bootstrap.min.css') }}
-    {{ HTML::style('assets/css/main.css') }}
-    {{ HTML::style('bower_assets/jquery-ui/themes/ui-darkness/jquery-ui.css') }}
-    {{ HTML::style('bower_assets/fontawesome/css/font-awesome.min.css') }}
-    {{ HTML::style('bower_assets/sweetalert/dist/sweetalert.css') }}
-    @yield('css')
-</head>
-<body>
-    <div class="container">
-        <header class="row header">
-            <div class="col-md-5">
-                <h1 id="logo"><a href="/">Open Stack</a></h1>
-            </div>
-            <div class="col-md-7">
-                @yield('header_right')
-            </div>
-        </header>
-        <div class="row" id="main-content">
-            @yield('content')
-        </div>
-        <footer class="row"></footer>
-    </div>
-    {{ HTML::script('bower_assets/jquery/dist/jquery.min.js')}}
-    {{ HTML::script('bower_assets/bootstrap/dist/js/bootstrap.min.js')}}
-    {{ HTML::script('bower_assets/jquery-validate/dist/jquery.validate.min.js')}}
-    {{ HTML::script('bower_assets/jquery-validate/dist/additional-methods.min.js')}}
-    {{ HTML::script('bower_assets/pure-templates/libs/pure.min.js')}}
-    {{ HTML::script('bower_assets/uri.js/src/URI.min.js')}}
-    {{ HTML::script('bower_assets/sweetalert/dist/sweetalert.min.js')}}
-    {{ HTML::script('assets/js/ajax.utils.js')}}
-    {{ HTML::script('assets/js/jquery.cleanform.js')}}
-    {{ HTML::script('assets/js/jquery.serialize.js')}}
-    {{ HTML::script('assets/js/jquery.validate.additional.custom.methods.js')}}
-    @yield('scripts')
-    <span class="version hidden">{{ Config::get('app.version') }}</span>
-</body>
-</html>
\ No newline at end of file
diff --git a/app/views/oauth2/consent.blade.php b/app/views/oauth2/consent.blade.php
deleted file mode 100644
index 94915993..00000000
--- a/app/views/oauth2/consent.blade.php
+++ /dev/null
@@ -1,43 +0,0 @@
-@extends('layout')
-@section('title')
-<title>Welcome to OpenStackId - Request for Permission </title>
-@stop
-
-@section('header_right')
-    @if(Auth::check())
-        <div class="row">
-            <div class="col-md-6 col-md-offset-8">
-                Welcome, <a href="{{ URL::action("UserController@getProfile") }}">{{Auth::user()->identifier}}</a>
-            </div>
-        </div>
-    @endif
-@stop
-
-@section('content')
-<div class="container">
-    <div class="row">
-        <div class="col-md-6 col-md-offset-3">
-            <div class="row">
-                <div class="col-md-12 col-xs-12">
-                    <h2> <a target='_blank' href="{{$website}}">{{$app_name}}</a>&nbsp;<span style="font-size: 10pt;" class="glyphicon glyphicon-info-sign pointable info" aria-hidden="true" data-content="Developer Email: <a href='mailto:{{$dev_info_email}}'>{{$dev_info_email}}</a>.<br> Clicking 'Accept' will redirect you to: <a href='{{$website}}' target='_blank'>{{$website}}</a>" title="Developer Info"></span></h2>
-                </div>
-            </div>
-            <legend>This app would like to:</legend>
-            <ul class="list-unstyled">
-            @foreach ($requested_scopes as $scope)
-                <li> {{$scope->short_description}}&nbsp;<span class="glyphicon glyphicon-info-sign pointable info" aria-hidden="true" data-content="{{ $scope->description }}" title="Scope Info"></span></li>
-            @endforeach
-            </ul>
-            {{ Form::open(array('url' => URL::action("UserController@postConsent") ,'id'=>'authorization_form', 'method' => 'post',  "autocomplete" => "off")) }}
-                <input type="hidden"  name='trust' id='trust' value=""/>
-                <button class="btn btn-default btn-md btn-consent-action" id="cancel-authorization" type="button">Cancel</button>
-                <button class="btn btn-primary btn-md btn-consent-action" id="approve-authorization" type="button">Accept</button>
-            {{ Form::close() }}
-            <p class="privacy-policy">** <b>{{$app_name}}</b> Application and <b>OpenStack</b> will use this information in accordance with their respective <a target='_blank' href="{{$tos_uri}}">terms of service</a> and <a target='_blank' href="{{$policy_uri}}">privacy policies</a>.</p>
-        </div>
-    </div>
-</div>
-@stop
-@section('scripts')
-{{ HTML::script('assets/js/oauth2/consent.js') }}
-@append
\ No newline at end of file
diff --git a/app/views/oauth2/profile/edit-client-tokens.blade.php b/app/views/oauth2/profile/edit-client-tokens.blade.php
deleted file mode 100644
index 60defd04..00000000
--- a/app/views/oauth2/profile/edit-client-tokens.blade.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<div class="row">
-    <div class="col-md-12">
-        <div class="row">
-            <div class="col-md-12">
-                <h5>Issued Access Tokens&nbsp;<span class="glyphicon glyphicon-refresh accordion-toggle refresh-access-tokens" aria-hidden="true" title="Update Access Tokens List"></span></h5>
-                <hr/>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-md-12">
-                <table id='table-access-tokens' class="table table-hover table-condensed">
-                    <thead>
-                    <tr>
-                        <th><i class="icon-info-sign accordion-toggle" title="Time is on UTC"></i>&nbsp;Issued</th>
-                        <th>Scopes</th>
-                        <th><i class="icon-info-sign accordion-toggle" title="Lifetime is on seconds"></i>&nbsp;Remaining Lifetime</th>
-                        <th>&nbsp;</th>
-                    </tr>
-                    </thead>
-                    <tbody id="body-access-tokens">
-                    @foreach ($access_tokens as $access_token)
-                        <tr id="{{ $access_token->value }}">
-                            <td>{{ $access_token->created_at }}</td>
-                            <td>{{ $access_token->scope }}</td>
-                            <td>{{ $access_token->getRemainingLifetime() }}</td>
-                            <td>{{ HTML::link(URL::action("ClientApiController@revokeToken",array("id"=>$client->id,"value"=>$access_token->value,'hint'=>'access-token')),'Revoke',array('class'=>'btn btn-default btn-md active btn-delete revoke-token revoke-access-token','title'=>'Revoke Access Token','data-value'=>$access_token->value,'data-hint'=>'access-token')) }}</td>
-                        </tr>
-                    @endforeach
-                    </tbody>
-                </table>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-md-12">
-                <span id="info-access-tokens" class="label label-info">** There are not any Access Tokens granted for this application.</span>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-md-12">
-                <h5>Issued Refresh Tokens&nbsp;<span class="glyphicon glyphicon-refresh accordion-toggle refresh-refresh-tokens" title="Update Refresh Tokens List"></span></h5>
-                <hr/>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-md-12">
-                <table id='table-refresh-tokens' class="table table-hover table-condensed">
-                    <thead>
-                    <tr>
-                        <th><i class="icon-info-sign accordion-toggle" title="Time is on UTC"></i>&nbsp;Issued</th>
-                        <th>Scopes</th>
-                        <th><i class="icon-info-sign accordion-toggle" title="Lifetime is on seconds"></i>&nbsp;Remaining Lifetime</th>
-                        <th>&nbsp;</th>
-                    </tr>
-                    </thead>
-                    <tbody id="body-refresh-tokens">
-                    @foreach ($refresh_tokens as $refresh_token)
-                        <tr id="{{ $refresh_token->value }}">
-                            <td>{{ $refresh_token->created_at }}</td>
-                            <td>{{ $refresh_token->scope }}</td>
-                            @if($refresh_token->getRemainingLifetime()===0)
-                                <td>Not Expire</td>
-                            @else
-                                <td>{{ $refresh_token->getRemainingLifetime() }}</td>
-                            @endif
-                            <td>{{ HTML::link(URL::action("ClientApiController@revokeToken",array("id"=>$client->id,"value"=>$refresh_token->value,'hint'=>'refresh-token')),'Revoke',array('class'=>'btn btn-default btn-md active btn-delete revoke-token revoke-refresh-token','title'=>'Revoke Refresh Token','data-value'=>$refresh_token->value,'data-hint'=>'refresh-token')) }}</td>
-                        </tr>
-                    @endforeach
-                    </tbody>
-                </table>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-md-12">
-                <span id="info-refresh-tokens" class="label label-info">** There are not any Refresh Tokens granted for this application.</span>
-            </div>
-        </div>
-    </div>
-</div>
-@section('scripts')
-<script type="application/javascript">
-	var TokensUrls = {
-		AccessTokenUrls : {
-			get : '{{ URL::action("ClientApiController@getAccessTokens",array("id"=>$client->id))}}',
-			delete :'{{ URL::action("ClientApiController@revokeToken",array("id"=>$client->id,"value"=>-1,"hint"=>"access-token")) }}'
-		},
-		RefreshTokenUrl : {
-			get: '{{ URL::action("ClientApiController@getRefreshTokens",array("id"=>$client->id))}}',
-			delete : '{{ URL::action("ClientApiController@revokeToken",array("id"=>$client->id,"value"=>-1,"hint"=>"refresh-token")) }}'
-		}
-	};
-</script>
-{{ HTML::script('assets/js/oauth2/profile/edit-client-tokens.js') }}
-@append
\ No newline at end of file
diff --git a/app/views/oauth2/profile/edit-user-grants.blade.php b/app/views/oauth2/profile/edit-user-grants.blade.php
deleted file mode 100644
index 06b8e73e..00000000
--- a/app/views/oauth2/profile/edit-user-grants.blade.php
+++ /dev/null
@@ -1,63 +0,0 @@
-@extends('layout')
-@section('title')
-<title>Welcome to OpenStackId - My Account</title>
-@stop
-@section('content')
-@include('menu',array('is_oauth2_admin' => $is_oauth2_admin, 'is_openstackid_admin' => $is_openstackid_admin))
-
-<legend>Authorized Access to your OpenstackId Account</legend>
-
-<h2>Connected Sites, Apps, and Services</h2>
-<p>
-    You have granted the following services access to your OpenstackId Account: <br>
-</p>
-<h4>Online Access&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true"></span></h4>
-<hr/>
-<table id="table-access-tokens" class="table table-hover table-condensed">
-    <thead>
-    <tr>
-        <th>Application Type</th>
-        <th>Application Name</th>
-        <th>Granted Scopes</th>
-        <th>&nbsp;</th>
-    </tr>
-    </thead>
-    <tbody id="body-access-tokens">
-    @foreach($access_tokens as $access_token)
-    <tr id="{{$access_token->value}}">
-        <td>{{$access_token->client()->first()->getFriendlyApplicationType()}}</td>
-        <td>{{$access_token->client()->first()->app_name}}</td>
-        <td>{{$access_token->scope}}</td>
-        <td>{{ HTML::link(URL::action("UserApiController@revokeToken",array("id"=>$user_id,"value"=>$access_token->value, "hint"=>'access_token')),'Revoke Access',array('data-value' => $access_token->value,'data-hint'=>'access_token','class'=>'btn btn-default btn-md active btn-delete revoke-access','title'=>'Revoke Access Token')) }}</td>
-    </tr>
-    @endforeach
-    </tbody>
-</table>
-<span id="info-access-tokens" class="label label-info">** There are not currently access tokens issued for this user.</span>
-<h4>Offline Access&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="In some cases, your application may need to access an API when the user is not present. Examples of this include backup services and applications that make blogger posts exactly at 8am on Monday morning. This style of access is called offline, and web server applications may request offline access from a user. The normal and default style of access is called online. "></span></h4>
-<hr/>
-<table id="table-refresh-tokens" class="table table-hover table-condensed">
-        <thead>
-        <tr>
-            <th>Application Type</th>
-            <th>Application Name</th>
-            <th>Granted Scopes</th>
-            <th>&nbsp;</th>
-        </tr>
-        </thead>
-        <tbody id="body-refresh-tokens">
-        @foreach($refresh_tokens as $refresh_token)
-        <tr id="{{$refresh_token->value}}">
-            <td>{{$refresh_token->client()->first()->getFriendlyApplicationType()}}</td>
-            <td>{{$refresh_token->client()->first()->app_name}}</td>
-            <td>{{$refresh_token->scope}}</td>
-            <td>{{ HTML::link(URL::action("UserApiController@revokeToken",array("id" => $user_id,"value" => $refresh_token->value, "hint" => 'refresh_token')),'Revoke Access',array('data-value' => $refresh_token->value,'data-hint' => 'refresh_token','class' => 'btn btn-default btn-md active btn-delete revoke-access','title' => 'Revoke Access Token')) }}</td>
-        </tr>
-        @endforeach
-        </tbody>
-</table>
-<span id="info-refresh-tokens" class="label label-info">** There are not currently refresh tokens issued for this user.</span>
-@stop
-@section('scripts')
-{{ HTML::script('assets/js/oauth2/profile/edit-user-grants.js') }}
-@append
\ No newline at end of file
diff --git a/app/views/oauth2/session/check-session.blade.php b/app/views/oauth2/session/check-session.blade.php
deleted file mode 100644
index dd361470..00000000
--- a/app/views/oauth2/session/check-session.blade.php
+++ /dev/null
@@ -1,13 +0,0 @@
-@extends('layout')
-@section('title')
-    <title>Welcome to openstackId - OpenStack ID Check Session Frame</title>
-@stop
-@section('content')
-    <div class="container">
-    </div>
-@stop
-@section('scripts')
-    {{ HTML::script('bower_assets/crypto-js/crypto-js.js')}}
-    {{ HTML::script('bower_assets/jquery-cookie/jquery.cookie.js')}}
-    {{ HTML::script('assets/js/oauth2/session/check.session.js')}}
-@append
\ No newline at end of file
diff --git a/app/views/oauth2/session/session-ended.blade.php b/app/views/oauth2/session/session-ended.blade.php
deleted file mode 100644
index dd0b2c8c..00000000
--- a/app/views/oauth2/session/session-ended.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-@extends('layout')
-
-@section('title')
-    <title>Welcome to openstackId - OpenStack ID Logout</title>
-@stop
-
-@section('content')
-    <div class="container">
-        <p>Your Session at OpenstackID had ended!</p>
-    </div>
-@stop
-@section('scripts')
-    {{ HTML::script('bower_assets/crypto-js/crypto-js.js')}}
-    {{ HTML::script('bower_assets/jquery-cookie/jquery.cookie.js')}}
-@append
\ No newline at end of file
diff --git a/app/views/openid/consent.blade.php b/app/views/openid/consent.blade.php
deleted file mode 100644
index 906feadb..00000000
--- a/app/views/openid/consent.blade.php
+++ /dev/null
@@ -1,51 +0,0 @@
-@extends('layout')
-@section('title')
-<title>Welcome to openstackId - consent </title>
-@append
-
-@section('header_right')
-@if(Auth::check())
-Welcome, <a href="{{ URL::action("UserController@getProfile") }}">{{Auth::user()->identifier}}</a>
-@endif
-@append
-
-@section('content')
-<div class="container">
-    <h4>OpenstackId - Openid verification</h4>
-    {{ Form::open(array('url' => URL::action("UserController@postConsent"),'id'=>'authorization_form', 'method' => 'post',  "autocomplete" => "off")) }}
-    <fieldset>
-    <legend>
-        Sign in to <b>{{ $realm }}</b> using your openstackid
-    </legend>
-    <p>A site identifying itself as <b>{{ $realm }}</b></p>
-    <p>has asked us for confirmation that <a href="{{ str_replace("%23","#",$openid_url) }}" target='_blank'>{{ str_replace("%23","#",$openid_url) }}</a> is your identity URL</p>
-    @foreach ($views as $partial)
-        @include($partial->getName(),$partial->getData())
-    @endforeach
-    <div>
-        <label class="radio">
-            {{ Form::radio('trust[]', 'AllowOnce','true',array('id'=>'allow_once','class'=>'input-block-level')) }}
-            Allow Once
-        </label>
-        <label class="radio">
-        {{ Form::radio('trust[]', 'AllowForever','',array('id'=>'allow_forever','class'=>'input-block-level')) }}
-        Allow Forever
-         </label>
-        <label class="radio">
-        {{ Form::radio('trust[]', 'DenyOnce','',array('id'=>'deny_once','class'=>'input-block-level')) }}
-        Deny Once
-        </label>
-        <label class="radio">
-        {{ Form::radio('trust[]', 'DenyForever','',array('id'=>'deny_forever','class'=>'input-block-level')) }}
-        Deny Forever
-        </label>
-    </div>
-    {{ Form::submit('Ok',array("id" => "send_authorization", 'class' => 'btn btn-default btn-lg active btn-consent-action')) }}
-    {{ Form::button('Cancel',array('id' => 'cancel_authorization', 'class' => 'btn active btn-lg btn-danger cancel_authorization btn-consent-action')) }}
-    </fieldset>
-    {{ Form::close() }}
-</div>
-@append
-@section('scripts')
-{{ HTML::script('assets/js/openid/consent.js') }}
-@append
\ No newline at end of file
diff --git a/artisan b/artisan
index 36bb2d98..df630d0d 100755
--- a/artisan
+++ b/artisan
@@ -15,35 +15,7 @@
 
 require __DIR__.'/bootstrap/autoload.php';
 
-/*
-|--------------------------------------------------------------------------
-| Turn On The Lights
-|--------------------------------------------------------------------------
-|
-| We need to illuminate PHP development, so let's turn on the lights.
-| This bootstrap the framework and gets it ready for use, then it
-| will load up this application so that we can run it and send
-| the responses back to the browser and delight these users.
-|
-*/
-
-$app = require_once __DIR__.'/bootstrap/start.php';
-
-/*
-|--------------------------------------------------------------------------
-| Load The Artisan Console Application
-|--------------------------------------------------------------------------
-|
-| We'll need to run the script to load and return the Artisan console
-| application. We keep this in its own script so that we will load
-| the console application independent of running commands which
-| will allow us to fire commands from Routes when we want to.
-|
-*/
-
-$app->setRequestForConsoleEnvironment();
-
-$artisan = Illuminate\Console\Application::start($app);
+$app = require_once __DIR__.'/bootstrap/app.php';
 
 /*
 |--------------------------------------------------------------------------
@@ -56,7 +28,12 @@ $artisan = Illuminate\Console\Application::start($app);
 |
 */
 
-$status = $artisan->run();
+$kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
+
+$status = $kernel->handle(
+    $input = new Symfony\Component\Console\Input\ArgvInput,
+    new Symfony\Component\Console\Output\ConsoleOutput
+);
 
 /*
 |--------------------------------------------------------------------------
@@ -69,6 +46,6 @@ $status = $artisan->run();
 |
 */
 
-$app->shutdown();
+$kernel->terminate($input, $status);
 
-exit($status);
\ No newline at end of file
+exit($status);
diff --git a/bootstrap/app.php b/bootstrap/app.php
new file mode 100644
index 00000000..f2801adf
--- /dev/null
+++ b/bootstrap/app.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Create The Application
+|--------------------------------------------------------------------------
+|
+| The first thing we will do is create a new Laravel application instance
+| which serves as the "glue" for all the components of Laravel, and is
+| the IoC container for the system binding all of the various parts.
+|
+*/
+
+$app = new Illuminate\Foundation\Application(
+    realpath(__DIR__.'/../')
+);
+
+/*
+|--------------------------------------------------------------------------
+| Bind Important Interfaces
+|--------------------------------------------------------------------------
+|
+| Next, we need to bind some important interfaces into the container so
+| we will be able to resolve them when needed. The kernels serve the
+| incoming requests to this application from both the web and CLI.
+|
+*/
+
+$app->singleton(
+    Illuminate\Contracts\Http\Kernel::class,
+    App\Http\Kernel::class
+);
+
+$app->singleton(
+    Illuminate\Contracts\Console\Kernel::class,
+    App\Console\Kernel::class
+);
+
+$app->singleton(
+    Illuminate\Contracts\Debug\ExceptionHandler::class,
+    App\Exceptions\Handler::class
+);
+
+/*
+|--------------------------------------------------------------------------
+| Return The Application
+|--------------------------------------------------------------------------
+|
+| This script returns the application instance. The instance is given to
+| the calling script so we can separate the building of the instances
+| from the actual running of the application and sending responses.
+|
+*/
+
+return $app;
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
index 4c61218c..38301379 100644
--- a/bootstrap/autoload.php
+++ b/bootstrap/autoload.php
@@ -27,49 +27,8 @@ require __DIR__.'/../vendor/autoload.php';
 |
 */
 
-if (file_exists($compiled = __DIR__.'/compiled.php'))
-{
-    require $compiled;
-}
-
-/*
-|--------------------------------------------------------------------------
-| Setup Patchwork UTF-8 Handling
-|--------------------------------------------------------------------------
-|
-| The Patchwork library provides solid handling of UTF-8 strings as well
-| as provides replacements for all mb_* and iconv type functions that
-| are not available by default in PHP. We'll setup this stuff here.
-|
-*/
-
-Patchwork\Utf8\Bootup::initMbstring();
-
-/*
-|--------------------------------------------------------------------------
-| Register The Laravel Auto Loader
-|--------------------------------------------------------------------------
-|
-| We register an auto-loader "behind" the Composer loader that can load
-| model classes on the fly, even if the autoload files have not been
-| regenerated for the application. We'll add it to the stack here.
-|
-*/
-
-Illuminate\Support\ClassLoader::register();
-
-/*
-|--------------------------------------------------------------------------
-| Register The Workbench Loaders
-|--------------------------------------------------------------------------
-|
-| The Laravel workbench provides a convenient place to develop packages
-| when working locally. However we will need to load in the Composer
-| auto-load files for the packages so that these can be used here.
-|
-*/
-
-if (is_dir($workbench = __DIR__.'/../workbench'))
-{
-    Illuminate\Workbench\Starter::start($workbench);
+$compiledPath = __DIR__.'/cache/compiled.php';
+
+if (file_exists($compiledPath)) {
+    require $compiledPath;
 }
diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore
new file mode 100644
index 00000000..d6b7ef32
--- /dev/null
+++ b/bootstrap/cache/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/bootstrap/environment.php.tpl b/bootstrap/environment.php.tpl
deleted file mode 100644
index 17aa4330..00000000
--- a/bootstrap/environment.php.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$env = $app->detectEnvironment(array(
-'local'      => array(),
-'dev'        => array(),
-'staging'    => array(),
-'production' => array(),
-));
\ No newline at end of file
diff --git a/bootstrap/paths.php b/bootstrap/paths.php
deleted file mode 100644
index 896d4b8b..00000000
--- a/bootstrap/paths.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-return array(
-
-    /*
-    |--------------------------------------------------------------------------
-    | Application Path
-    |--------------------------------------------------------------------------
-    |
-    | Here we just defined the path to the application directory. Most likely
-    | you will never need to change this value as the default setup should
-    | work perfectly fine for the vast majority of all our applications.
-    |
-    */
-
-    'app' => __DIR__.'/../app',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Public Path
-    |--------------------------------------------------------------------------
-    |
-    | The public path contains the assets for your web application, such as
-    | your JavaScript and CSS files, and also contains the primary entry
-    | point for web requests into these applications from the outside.
-    |
-    */
-
-    'public' => __DIR__.'/../public',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Base Path
-    |--------------------------------------------------------------------------
-    |
-    | The base path is the root of the Laravel installation. Most likely you
-    | will not need to change this value. But, if for some wild reason it
-    | is necessary you will do so here, just proceed with some caution.
-    |
-    */
-
-    'base' => __DIR__.'/..',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Storage Path
-    |--------------------------------------------------------------------------
-    |
-    | The storage path is used by Laravel to store cached Blade views, logs
-    | and other pieces of information. You may modify the path here when
-    | you want to change the location of this directory for your apps.
-    |
-    */
-
-    'storage' => __DIR__.'/../app/storage',
-
-);
diff --git a/bootstrap/start.php b/bootstrap/start.php
deleted file mode 100644
index 93a65dc7..00000000
--- a/bootstrap/start.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-use utils\services\UtilsServiceCatalog;
-use openid\services\OpenIdServiceCatalog;
-/*
-|--------------------------------------------------------------------------
-| Create The Application
-|--------------------------------------------------------------------------
-|
-| The first thing we will do is create a new Laravel application instance
-| which serves as the "glue" for all the components of Laravel, and is
-| the IoC container for the system binding all of the various parts.
-|
-*/
-
-$app = new Illuminate\Foundation\Application;
-
-
-/*
-|--------------------------------------------------------------------------
-| Detect The Application Environment
-|--------------------------------------------------------------------------
-|
-| Laravel takes a dead simple approach to your application environments
-| so you can just specify a machine name or HTTP host that matches a
-| given environment, then we will automatically detect it for you.
-|
-*/
-/**
- * REMARK UPGRADE FROM 4.0.* to 4.1.*
- * For security reasons, URL domains may no longer be used to detect your application environment.
- * These values are easily spoofable and allow attackers to modify the environment for a request.
- * You should convert your environment detection to use machine host names (hostname command on Mac & Ubuntu).
- */
-
-require __DIR__.'/environment.php';
-
-
-/*
-|--------------------------------------------------------------------------
-| Bind Paths
-|--------------------------------------------------------------------------
-|
-| Here we are binding the paths configured in paths.php to the app. You
-| should not be changing these here. If you need to change these you
-| may do so within the paths.php file and they will be bound here.
-|
-*/
-
-$app->bindInstallPaths(require __DIR__.'/paths.php');
-
-/*
-|--------------------------------------------------------------------------
-| Load The Application
-|--------------------------------------------------------------------------
-|
-| Here we will load the Illuminate application. We'll keep this is in a
-| separate location so we can isolate the creation of an application
-| from the actual running of the application with a given request.
-|
-*/
-
-$framework = $app['path.base'].'/vendor/laravel/framework/src';
-
-require $framework.'/Illuminate/Foundation/start.php';
-
-
-//custom authentication
-use Illuminate\Auth\Guard;
-use auth\CustomAuthProvider;
-
-Auth::extend('custom', function($app) {
-    return new Guard(
-        new CustomAuthProvider(
-	        App::make('auth\\IUserRepository'),
-	        App::make('auth\\IMemberRepository'),
-	        App::make('auth\\IAuthenticationExtensionService'),
-	        App::make(OpenIdServiceCatalog::UserService),
-	        App::make(UtilsServiceCatalog::CheckPointService),
-	        App::make(UtilsServiceCatalog::TransactionService),
-	        App::make(UtilsServiceCatalog::LogService)
-            ),
-        App::make('session.store')
-    );
-});
-
-
-/*
-|--------------------------------------------------------------------------
-| Return The Application
-|--------------------------------------------------------------------------
-|
-| This script returns the application instance. The instance is given to
-| the calling script so we can separate the building of the instances
-| from the actual running of the application and sending responses.
-|
-*/
-
-return $app;
-
-
diff --git a/composer.json b/composer.json
index 1178b468..4f09492a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,75 +1,69 @@
 {
-  "name": "OpenStackid",
-  "description": "OpenstackId Idp",
-  "keywords": [
-    "OpenStackid",
-    "OpenStack",
-    "openid",
-    "oauth2",
-    "openid connect",
-    "OIDC",
-    "OP OIDC"
-  ],
-  "license": "MIT",
-  "require": {
-    "php": ">=5.3.7",
-    "laravel/framework": "4.1.*",
-    "phpunit/phpunit": "3.7.*",
-    "zendframework/zend-crypt": "2.4.*",
-    "zendframework/zend-math": "*",
-    "ircmaxell/random-lib": "*",
-    "greggilbert/recaptcha": "1.1.*",
-    "mockery/mockery": "0.9.4",
-    "doctrine/dbal": "~2.3",
-    "way/laravel-test-helpers": "dev-master",
-    "guzzlehttp/guzzle": "3.8.1",
-    "smarcet/jose4php": "1.0.15",
-    "glenscott/url-normalizer" : "1.4.0",
-    "jenssegers/agent": "^2.3"
-  },
-  "require-dev": {
-    "squizlabs/php_codesniffer": "2.*",
-    "behat/behat": "@stable",
-    "behat/mink": "@stable",
-    "behat/mink-extension": "@stable",
-    "behat/mink-goutte-driver": "@stable",
-    "behat/mink-selenium2-driver": "@stable"
-  },
-  "autoload": {
-    "classmap": [
-      "app/commands",
-      "app/controllers",
-      "app/models",
-      "app/database/migrations",
-      "app/database/seeds",
-      "app/tests",
-      "app/tests/TestCase.php",
-      "app/libs",
-      "app/services",
-      "app/repositories",
-      "app/strategies",
-      "app/filters",
-      "app/validators",
-      "app/providers",
-      "app/factories"
-    ]
-  },
-  "scripts": {
-    "post-install-cmd": [
-      "php artisan clear-compiled",
-      "php artisan optimize"
-    ],
-    "post-update-cmd": [
-      "php artisan clear-compiled",
-      "php artisan optimize"
-    ],
-    "post-create-project-cmd": [
-      "php artisan key:generate"
-    ]
-  },
-  "config": {
-    "preferred-install": "dist"
-  },
-  "prefer-stable": true,
-  "minimum-stability": "stable"
+    "name": "laravel/laravel",
+    "description": "The Laravel Framework.",
+    "keywords": ["framework", "laravel"],
+    "license": "MIT",
+    "type": "project",
+    "require": {
+        "php": ">=5.5.9",
+        "laravel/framework": "5.2.*",
+        "zendframework/zend-crypt": "2.6.*",
+        "zendframework/zend-math": "2.7.*",
+        "ircmaxell/random-lib": "1.1.*",
+        "greggilbert/recaptcha": "2.1.*",
+        "guzzlehttp/guzzle": "5.3.0",
+        "smarcet/jose4php": "1.0.15",
+        "glenscott/url-normalizer" : "1.4.*",
+        "jenssegers/agent": "2.3.*",
+        "predis/predis": "1.0.1",
+        "laravelcollective/html": "5.2.4"
+    },
+    "require-dev": {
+        "fzaninotto/faker": "~1.4",
+        "phpunit/phpunit": "~4.0",
+        "symfony/css-selector": "2.8.*|3.0.*",
+        "symfony/dom-crawler": "2.8.*|3.0.*",
+        "doctrine/dbal": "*",
+        "mockery/mockery": "*",
+        "way/laravel-test-helpers": "dev-master"
+    },
+    "autoload": {
+        "classmap": [
+            "database",
+            "app",
+            "tests"
+        ],
+        "psr-4": {
+            "App\\"    : "app/",
+            "Auth\\"   : "app/libs/Auth/",
+            "OAuth2\\" : "app/libs/OAuth2/",
+            "OpenId\\" : "app/libs/OpenId/",
+            "Utils\\"  : "app/libs/Utils/",
+            "Models\\" : "app/Models/"
+        }
+    },
+    "autoload-dev": {
+        "classmap": [
+            "tests/TestCase.php"
+        ]
+    },
+    "scripts": {
+        "post-root-package-install": [
+            "php -r \"copy('.env.example', '.env');\""
+        ],
+        "post-create-project-cmd": [
+            "php artisan key:generate"
+        ],
+        "post-install-cmd": [
+            "Illuminate\\Foundation\\ComposerScripts::postInstall",
+            "php artisan optimize"
+        ],
+        "post-update-cmd": [
+            "Illuminate\\Foundation\\ComposerScripts::postUpdate",
+            "php artisan optimize"
+        ]
+    },
+    "config": {
+        "preferred-install": "dist"
+    }
 }
diff --git a/config/app.php b/config/app.php
new file mode 100644
index 00000000..02cd5b98
--- /dev/null
+++ b/config/app.php
@@ -0,0 +1,223 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application Environment
+    |--------------------------------------------------------------------------
+    |
+    | This value determines the "environment" your application is currently
+    | running in. This may determine how you prefer to configure various
+    | services your application utilizes. Set this in your ".env" file.
+    |
+    */
+
+    'env' => env('APP_ENV', 'production'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application Debug Mode
+    |--------------------------------------------------------------------------
+    |
+    | When your application is in debug mode, detailed error messages with
+    | stack traces will be shown on every error that occurs within your
+    | application. If disabled, a simple generic error page is shown.
+    |
+    */
+
+    'debug' => env('APP_DEBUG', false),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application URL
+    |--------------------------------------------------------------------------
+    |
+    | This URL is used by the console to properly generate URLs when using
+    | the Artisan command line tool. You should set this to the root of
+    | your application so that it is used when running Artisan tasks.
+    |
+    */
+
+    'url' => env('APP_URL', 'http://localhost'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application Timezone
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the default timezone for your application, which
+    | will be used by the PHP date and date-time functions. We have gone
+    | ahead and set this to a sensible default for you out of the box.
+    |
+    */
+
+    'timezone' => env('APP_TIMEZONE', 'UTC'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application Locale Configuration
+    |--------------------------------------------------------------------------
+    |
+    | The application locale determines the default locale that will be used
+    | by the translation service provider. You are free to set this value
+    | to any of the locales which will be supported by the application.
+    |
+    */
+
+    'locale' => env('APP_LOCALE','en'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application Fallback Locale
+    |--------------------------------------------------------------------------
+    |
+    | The fallback locale determines the locale to use when the current one
+    | is not available. You may change the value to correspond to any of
+    | the language folders that are provided through your application.
+    |
+    */
+
+    'fallback_locale' => 'en',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Encryption Key
+    |--------------------------------------------------------------------------
+    |
+    | This key is used by the Illuminate encrypter service and should be set
+    | to a random, 32 character string, otherwise these encrypted strings
+    | will not be safe. Please do this before deploying an application!
+    |
+    */
+
+    'key' => env('APP_KEY'),
+
+    'cipher' => 'AES-256-CBC',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Logging Configuration
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure the log settings for your application. Out of
+    | the box, Laravel uses the Monolog PHP logging library. This gives
+    | you a variety of powerful log handlers / formatters to utilize.
+    |
+    | Available Settings: "single", "daily", "syslog", "errorlog"
+    |
+    */
+
+    'log' => env('APP_LOG', 'single'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Autoloaded Service Providers
+    |--------------------------------------------------------------------------
+    |
+    | The service providers listed here will be automatically loaded on the
+    | request to your application. Feel free to add your own services to
+    | this array to grant expanded functionality to your applications.
+    |
+    */
+
+    'providers' => [
+
+        /*
+         * Laravel Framework Service Providers...
+         */
+        Illuminate\Auth\AuthServiceProvider::class,
+        Illuminate\Broadcasting\BroadcastServiceProvider::class,
+        Illuminate\Bus\BusServiceProvider::class,
+        Illuminate\Cache\CacheServiceProvider::class,
+        Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
+        Illuminate\Cookie\CookieServiceProvider::class,
+        Illuminate\Database\DatabaseServiceProvider::class,
+        Illuminate\Encryption\EncryptionServiceProvider::class,
+        Illuminate\Filesystem\FilesystemServiceProvider::class,
+        Illuminate\Foundation\Providers\FoundationServiceProvider::class,
+        Illuminate\Hashing\HashServiceProvider::class,
+        Illuminate\Mail\MailServiceProvider::class,
+        Illuminate\Pagination\PaginationServiceProvider::class,
+        Illuminate\Pipeline\PipelineServiceProvider::class,
+        Illuminate\Queue\QueueServiceProvider::class,
+        Illuminate\Redis\RedisServiceProvider::class,
+        Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
+        Illuminate\Session\SessionServiceProvider::class,
+        Illuminate\Translation\TranslationServiceProvider::class,
+        Illuminate\Validation\ValidationServiceProvider::class,
+        Illuminate\View\ViewServiceProvider::class,
+        /*
+         * Application Service Providers...
+         */
+        App\Providers\AppServiceProvider::class,
+        App\Providers\AuthServiceProvider::class,
+        App\Providers\EventServiceProvider::class,
+        App\Providers\RouteServiceProvider::class,
+        Services\Utils\UtilsProvider::class,
+        Repositories\RepositoriesProvider::class,
+        Factories\FactoriesProvider::class,
+        Services\OAuth2\OAuth2ServiceProvider::class,
+        Services\OpenId\OpenIdProvider::class,
+        Auth\AuthenticationServiceProvider::class,
+        Services\ServicesProvider::class,
+        Strategies\StrategyProvider::class,
+        OAuth2\OAuth2ServiceProvider::class,
+        OpenId\OpenIdServiceProvider::class,
+        App\Providers\CustomAuthProvider::class,
+        Collective\Html\HtmlServiceProvider::class,
+        \Providers\OAuth2\ClientAuthContextValidatorFactoryProvider::class,
+        Greggilbert\Recaptcha\RecaptchaServiceProvider::class,
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Class Aliases
+    |--------------------------------------------------------------------------
+    |
+    | This array of class aliases will be registered when this application
+    | is started. However, feel free to register as many as you wish as
+    | the aliases are "lazy" loaded so they don't hinder performance.
+    |
+    */
+
+    'aliases' => [
+        'App'       => Illuminate\Support\Facades\App::class,
+        'Artisan'   => Illuminate\Support\Facades\Artisan::class,
+        'Auth'      => Illuminate\Support\Facades\Auth::class,
+        'Blade'     => Illuminate\Support\Facades\Blade::class,
+        'Cache'     => Illuminate\Support\Facades\Cache::class,
+        'Config'    => Illuminate\Support\Facades\Config::class,
+        'Cookie'    => Illuminate\Support\Facades\Cookie::class,
+        'Crypt'     => Illuminate\Support\Facades\Crypt::class,
+        'DB'        => Illuminate\Support\Facades\DB::class,
+        'Eloquent'  => Illuminate\Database\Eloquent\Model::class,
+        'Event'     => Illuminate\Support\Facades\Event::class,
+        'File'      => Illuminate\Support\Facades\File::class,
+        'Gate'      => Illuminate\Support\Facades\Gate::class,
+        'Hash'      => Illuminate\Support\Facades\Hash::class,
+        'Lang'      => Illuminate\Support\Facades\Lang::class,
+        'Log'       => Illuminate\Support\Facades\Log::class,
+        'Mail'      => Illuminate\Support\Facades\Mail::class,
+        'Password'  => Illuminate\Support\Facades\Password::class,
+        'Queue'     => Illuminate\Support\Facades\Queue::class,
+        'Redirect'  => Illuminate\Support\Facades\Redirect::class,
+        'Redis'     => Illuminate\Support\Facades\Redis::class,
+        'Request'   => Illuminate\Support\Facades\Request::class,
+        'Response'  => Illuminate\Support\Facades\Response::class,
+        'Route'     => Illuminate\Support\Facades\Route::class,
+        'Schema'    => Illuminate\Support\Facades\Schema::class,
+        'Session'   => Illuminate\Support\Facades\Session::class,
+        'Storage'   => Illuminate\Support\Facades\Storage::class,
+        'URL'       => Illuminate\Support\Facades\URL::class,
+        'Validator' => Illuminate\Support\Facades\Validator::class,
+        'View'      => Illuminate\Support\Facades\View::class,
+        'Form'      => Collective\Html\FormFacade::class,
+        'HTML'      => Collective\Html\HtmlFacade::class,
+        'Input'     => Illuminate\Support\Facades\Input::class,
+        'Recaptcha' => Greggilbert\Recaptcha\Facades\Recaptcha::class,
+        'ServerConfigurationService' => \Services\Facades\ServerConfigurationService::class,
+        'ExternalUrlService'=> \Services\Facades\ExternalUrlService::class,
+    ],
+    'version' => env('APP_VERSION', 'XX.XX.XX'),
+];
diff --git a/config/auth.php b/config/auth.php
new file mode 100644
index 00000000..6321b8e4
--- /dev/null
+++ b/config/auth.php
@@ -0,0 +1,102 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Defaults
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default authentication "guard" and password
+    | reset options for your application. You may change these defaults
+    | as required, but they're a perfect start for most applications.
+    |
+    */
+
+    'defaults' => [
+        'guard'     => 'web',
+        'passwords' => 'users',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Guards
+    |--------------------------------------------------------------------------
+    |
+    | Next, you may define every authentication guard for your application.
+    | Of course, a great default configuration has been defined for you
+    | here which uses session storage and the Eloquent user provider.
+    |
+    | All authentication drivers have a user provider. This defines how the
+    | users are actually retrieved out of your database or other storage
+    | mechanisms used by this application to persist your user's data.
+    |
+    | Supported: "session", "token"
+    |
+    */
+
+    'guards' => [
+        'web' => [
+            'driver'   => 'session',
+            'provider' => 'users',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | User Providers
+    |--------------------------------------------------------------------------
+    |
+    | All authentication drivers have a user provider. This defines how the
+    | users are actually retrieved out of your database or other storage
+    | mechanisms used by this application to persist your user's data.
+    |
+    | If you have multiple user tables or models you may configure multiple
+    | sources which represent each model / table. These sources may then
+    | be assigned to any extra authentication guards you have defined.
+    |
+    | Supported: "database", "eloquent"
+    |
+    */
+
+    'providers' => [
+        'users' => [
+            'driver' => 'custom',
+            'model'  => auth\User::class,
+        ],
+
+        // 'users' => [
+        //     'driver' => 'database',
+        //     'table' => 'users',
+        // ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Resetting Passwords
+    |--------------------------------------------------------------------------
+    |
+    | Here you may set the options for resetting passwords including the view
+    | that is your password reset e-mail. You may also set the name of the
+    | table that maintains all of the reset tokens for your application.
+    |
+    | You may specify multiple password reset configurations if you have more
+    | than one user table or model in the application and you want to have
+    | separate password reset settings based on the specific user types.
+    |
+    | The expire time is the number of minutes that the reset token should be
+    | considered valid. This security feature keeps tokens short-lived so
+    | they have less time to be guessed. You may change this as needed.
+    |
+    */
+
+    'passwords' => [
+        'users' => [
+            'provider' => 'users',
+            'email' => 'auth.emails.password',
+            'table' => 'password_resets',
+            'expire' => 60,
+        ],
+    ],
+
+];
diff --git a/config/broadcasting.php b/config/broadcasting.php
new file mode 100644
index 00000000..abaaac32
--- /dev/null
+++ b/config/broadcasting.php
@@ -0,0 +1,52 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Broadcaster
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default broadcaster that will be used by the
+    | framework when an event needs to be broadcast. You may set this to
+    | any of the connections defined in the "connections" array below.
+    |
+    */
+
+    'default' => env('BROADCAST_DRIVER', 'pusher'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Broadcast Connections
+    |--------------------------------------------------------------------------
+    |
+    | Here you may define all of the broadcast connections that will be used
+    | to broadcast events to other systems or over websockets. Samples of
+    | each available type of connection are provided inside this array.
+    |
+    */
+
+    'connections' => [
+
+        'pusher' => [
+            'driver' => 'pusher',
+            'key' => env('PUSHER_KEY'),
+            'secret' => env('PUSHER_SECRET'),
+            'app_id' => env('PUSHER_APP_ID'),
+            'options' => [
+                //
+            ],
+        ],
+
+        'redis' => [
+            'driver' => 'redis',
+            'connection' => 'default',
+        ],
+
+        'log' => [
+            'driver' => 'log',
+        ],
+
+    ],
+
+];
diff --git a/config/cache.php b/config/cache.php
new file mode 100644
index 00000000..3ffa840b
--- /dev/null
+++ b/config/cache.php
@@ -0,0 +1,81 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Cache Store
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default cache connection that gets used while
+    | using this caching library. This connection is used when another is
+    | not explicitly specified when executing a given caching function.
+    |
+    */
+
+    'default' => env('CACHE_DRIVER', 'file'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Cache Stores
+    |--------------------------------------------------------------------------
+    |
+    | Here you may define all of the cache "stores" for your application as
+    | well as their drivers. You may even define multiple stores for the
+    | same cache driver to group types of items stored in your caches.
+    |
+    */
+
+    'stores' => [
+
+        'apc' => [
+            'driver' => 'apc',
+        ],
+
+        'array' => [
+            'driver' => 'array',
+        ],
+
+        'database' => [
+            'driver' => 'database',
+            'table' => 'cache',
+            'connection' => null,
+        ],
+
+        'file' => [
+            'driver' => 'file',
+            'path' => storage_path('framework/cache'),
+        ],
+
+        'memcached' => [
+            'driver' => 'memcached',
+            'servers' => [
+                [
+                    'host' => env('MEMCACHED_HOST', '127.0.0.1'),
+                    'port' => env('MEMCACHED_PORT', 11211),
+                    'weight' => 100,
+                ],
+            ],
+        ],
+
+        'redis' => [
+            'driver' => 'redis',
+            'connection' => 'default',
+        ],
+
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Cache Key Prefix
+    |--------------------------------------------------------------------------
+    |
+    | When utilizing a RAM based store such as APC or Memcached, there might
+    | be other applications utilizing the same cache. So, we'll specify a
+    | value to get prefixed to all our keys so we can avoid collisions.
+    |
+    */
+
+    'prefix' => 'laravel',
+
+];
diff --git a/config/cache_regions.php b/config/cache_regions.php
new file mode 100644
index 00000000..e781e168
--- /dev/null
+++ b/config/cache_regions.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+return [
+
+    'region_resource_server_lifetime'  => env('CACHE_REGION_RESOURCE_SERVER_LIFETIME', 60),
+    'region_access_token_lifetime'     => env('CACHE_REGION_ACCESS_TOKEN_LIFETIME', 1140),
+    'region_api_endpoint_lifetime'     => env('CACHE_REGION_API_ENDPOINT_LIFETIME', 1140),
+    'region_api_scope_lifetime'        => env('CACHE_REGION_API_SCOPE_LIFETIME', 1140),
+    'region_clients_lifetime'          => env('CACHE_REGION_CLIENT_LIFETIME', 1140),
+    'region_refresh_token_lifetime'    => env('CACHE_REGION_REFRESH_TOKEN_LIFETIME', 1140),
+    'region_white_listed_ip_lifetime'  => env('CACHE_REGION_WHITE_LISTED_IP_LIFETIME', 1140),
+    'region_users_lifetime'            => env('CACHE_USERS_LIFETIME', 10),
+];
\ No newline at end of file
diff --git a/config/compile.php b/config/compile.php
new file mode 100644
index 00000000..04807eac
--- /dev/null
+++ b/config/compile.php
@@ -0,0 +1,35 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Additional Compiled Classes
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify additional classes to include in the compiled file
+    | generated by the `artisan optimize` command. These should be classes
+    | that are included on basically every request into the application.
+    |
+    */
+
+    'files' => [
+        //
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Compiled File Providers
+    |--------------------------------------------------------------------------
+    |
+    | Here you may list service providers which define a "compiles" function
+    | that returns additional files that should be compiled, providing an
+    | easy way to get common files from any packages you are utilizing.
+    |
+    */
+
+    'providers' => [
+        //
+    ],
+
+];
diff --git a/config/curl.php b/config/curl.php
new file mode 100644
index 00000000..17b11a98
--- /dev/null
+++ b/config/curl.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+return array(
+    'timeout'         => env('CURL_TIMEOUT', 60),
+    'allow_redirects' => env('CURL_ALLOWS_REDIRECT', false),
+    'verify_ssl_cert' => env('CURL_VERIFY_SSL_CERT', true),
+);
\ No newline at end of file
diff --git a/config/database.php b/config/database.php
new file mode 100644
index 00000000..680366f4
--- /dev/null
+++ b/config/database.php
@@ -0,0 +1,110 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | PDO Fetch Style
+    |--------------------------------------------------------------------------
+    |
+    | By default, database results will be returned as instances of the PHP
+    | stdClass object; however, you may desire to retrieve records in an
+    | array format for simplicity. Here you can tweak the fetch style.
+    |
+    */
+
+    'fetch' => PDO::FETCH_CLASS,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Database Connection Name
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify which of the database connections below you wish
+    | to use as your default connection for all database work. Of course
+    | you may use many connections at once using the Database library.
+    |
+    */
+
+    'default' => 'openstackid',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Database Connections
+    |--------------------------------------------------------------------------
+    |
+    | Here are each of the database connections setup for your application.
+    | Of course, examples of configuring each database platform that is
+    | supported by Laravel is shown below to make development simple.
+    |
+    |
+    | All database work in Laravel is done through the PHP PDO facilities
+    | so make sure you have the driver for your particular database of
+    | choice installed on your machine before you begin development.
+    |
+    */
+
+    'connections' => [
+        //primary DB
+        'openstackid' => array(
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST'),
+            'database'  => env('DB_DATABASE'),
+            'username'  => env('DB_USERNAME'),
+            'password'  => env('DB_PASSWORD'),
+            'port'      => env('DB_PORT', 3306),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+        ),
+        //secondary DB (SS OS)
+        'ss' => array(
+            'driver'    => env('SS_DB_DRIVER'),
+            'host'      => env('SS_DB_HOST'),
+            'database'  => env('SS_DATABASE'),
+            'username'  => env('SS_DB_USERNAME'),
+            'password'  => env('SS_DB_PASSWORD'),
+            'port'      => env('SS_DB_PORT', 3306),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+        ),
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Migration Repository Table
+    |--------------------------------------------------------------------------
+    |
+    | This table keeps track of all the migrations that have already run for
+    | your application. Using this information, we can determine which of
+    | the migrations on disk haven't actually been run in the database.
+    |
+    */
+
+    'migrations' => 'migrations',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Redis Databases
+    |--------------------------------------------------------------------------
+    |
+    | Redis is an open source, fast, and advanced key-value store that also
+    | provides a richer set of commands than a typical key-value systems
+    | such as APC or Memcached. Laravel makes it easy to dig right in.
+    |
+    */
+
+    'redis' => [
+
+        'cluster' => false,
+
+        'default' => [
+            'host'     => env('REDIS_HOST'),
+            'port'     => env('REDIS_PORT'),
+            'database' => env('REDIS_DB', 0),
+            'password' => env('REDIS_PASSWORD'),
+        ],
+
+    ],
+];
diff --git a/config/filesystems.php b/config/filesystems.php
new file mode 100644
index 00000000..75b50022
--- /dev/null
+++ b/config/filesystems.php
@@ -0,0 +1,67 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Filesystem Disk
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the default filesystem disk that should be used
+    | by the framework. A "local" driver, as well as a variety of cloud
+    | based drivers are available for your choosing. Just store away!
+    |
+    | Supported: "local", "ftp", "s3", "rackspace"
+    |
+    */
+
+    'default' => 'local',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Cloud Filesystem Disk
+    |--------------------------------------------------------------------------
+    |
+    | Many applications store files both locally and in the cloud. For this
+    | reason, you may specify a default "cloud" driver here. This driver
+    | will be bound as the Cloud disk implementation in the container.
+    |
+    */
+
+    'cloud' => 's3',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Filesystem Disks
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure as many filesystem "disks" as you wish, and you
+    | may even configure multiple disks of the same driver. Defaults have
+    | been setup for each driver as an example of the required options.
+    |
+    */
+
+    'disks' => [
+
+        'local' => [
+            'driver' => 'local',
+            'root' => storage_path('app'),
+        ],
+
+        'public' => [
+            'driver' => 'local',
+            'root' => storage_path('app/public'),
+            'visibility' => 'public',
+        ],
+
+        's3' => [
+            'driver' => 's3',
+            'key' => 'your-key',
+            'secret' => 'your-secret',
+            'region' => 'your-region',
+            'bucket' => 'your-bucket',
+        ],
+
+    ],
+
+];
diff --git a/config/log.php b/config/log.php
new file mode 100644
index 00000000..8f8ad7bd
--- /dev/null
+++ b/config/log.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+return array(
+    /**
+     * EMAIL ERROR LOG CONFIGURATION
+     */
+    //The receiver of the mail
+    'to_email'   => env('LOG_EMAIL_TO'),
+    //The sender of the mail
+    'from_email'  => env('LOG_EMAIL_FROM'),
+    //Log Level (debug, info, notice, warning, error, critical, alert)
+    'level'       => env('LOG_LEVEL', 'error'),
+    'email_level' => env('LOG_EMAIL_LEVEL', 'error'),
+);
\ No newline at end of file
diff --git a/config/mail.php b/config/mail.php
new file mode 100644
index 00000000..1bf5c54f
--- /dev/null
+++ b/config/mail.php
@@ -0,0 +1,112 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Mail Driver
+    |--------------------------------------------------------------------------
+    |
+    | Laravel supports both SMTP and PHP's "mail" function as drivers for the
+    | sending of e-mail. You may specify which one you're using throughout
+    | your application here. By default, Laravel is setup for SMTP mail.
+    |
+    | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill",
+    |            "ses", "sparkpost", "log"
+    |
+    */
+
+    'driver' => env('MAIL_DRIVER', 'log'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Host Address
+    |--------------------------------------------------------------------------
+    |
+    | Here you may provide the host address of the SMTP server used by your
+    | applications. A default option is provided that is compatible with
+    | the Mailgun mail service which will provide reliable deliveries.
+    |
+    */
+
+    'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Host Port
+    |--------------------------------------------------------------------------
+    |
+    | This is the SMTP port used by your application to deliver e-mails to
+    | users of the application. Like the host we have set this value to
+    | stay compatible with the Mailgun e-mail application by default.
+    |
+    */
+
+    'port' => env('MAIL_PORT', 587),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Global "From" Address
+    |--------------------------------------------------------------------------
+    |
+    | You may wish for all e-mails sent by your application to be sent from
+    | the same address. Here, you may specify a name and address that is
+    | used globally for all e-mails that are sent by your application.
+    |
+    */
+
+    'from' => ['address' => null, 'name' => null],
+
+    /*
+    |--------------------------------------------------------------------------
+    | E-Mail Encryption Protocol
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the encryption protocol that should be used when
+    | the application send e-mail messages. A sensible default using the
+    | transport layer security protocol should provide great security.
+    |
+    */
+
+    'encryption' => env('MAIL_ENCRYPTION', 'tls'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Server Username
+    |--------------------------------------------------------------------------
+    |
+    | If your SMTP server requires a username for authentication, you should
+    | set it here. This will get used to authenticate with your server on
+    | connection. You may also set the "password" value below this one.
+    |
+    */
+
+    'username' => env('MAIL_USERNAME'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Server Password
+    |--------------------------------------------------------------------------
+    |
+    | Here you may set the password required by your SMTP server to send out
+    | messages from your application. This will be given to the server on
+    | connection so that the application will be able to send messages.
+    |
+    */
+
+    'password' => env('MAIL_PASSWORD'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Sendmail System Path
+    |--------------------------------------------------------------------------
+    |
+    | When using the "sendmail" driver to send e-mails, we will need to know
+    | the path to where Sendmail lives on this server. A default path has
+    | been provided here, which will work well on most of your systems.
+    |
+    */
+
+    'sendmail' => '/usr/sbin/sendmail -bs',
+
+];
diff --git a/config/queue.php b/config/queue.php
new file mode 100644
index 00000000..a2f3888c
--- /dev/null
+++ b/config/queue.php
@@ -0,0 +1,86 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Queue Driver
+    |--------------------------------------------------------------------------
+    |
+    | The Laravel queue API supports a variety of back-ends via an unified
+    | API, giving you convenient access to each back-end using the same
+    | syntax for each one. Here you may set the default queue driver.
+    |
+    | Supported: "null", "sync", "database", "beanstalkd",
+    |            "sqs", "redis"
+    |
+    */
+
+    'default' => env('QUEUE_DRIVER', 'sync'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Queue Connections
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure the connection information for each server that
+    | is used by your application. A default configuration has been added
+    | for each back-end shipped with Laravel. You are free to add more.
+    |
+    */
+
+    'connections' => [
+
+        'sync' => [
+            'driver' => 'sync',
+        ],
+
+        'database' => [
+            'driver' => 'database',
+            'table' => 'jobs',
+            'queue' => 'default',
+            'expire' => 60,
+        ],
+
+        'beanstalkd' => [
+            'driver' => 'beanstalkd',
+            'host' => 'localhost',
+            'queue' => 'default',
+            'ttr' => 60,
+        ],
+
+        'sqs' => [
+            'driver' => 'sqs',
+            'key' => 'your-public-key',
+            'secret' => 'your-secret-key',
+            'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id',
+            'queue' => 'your-queue-name',
+            'region' => 'us-east-1',
+        ],
+
+        'redis' => [
+            'driver' => 'redis',
+            'connection' => 'default',
+            'queue' => 'default',
+            'expire' => 60,
+        ],
+
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Failed Queue Jobs
+    |--------------------------------------------------------------------------
+    |
+    | These options configure the behavior of failed queue job logging so you
+    | can control which database and table are used to store the jobs that
+    | have failed. You may change them to any database / table you wish.
+    |
+    */
+
+    'failed' => [
+        'database' => env('DB_CONNECTION', 'mysql'),
+        'table' => 'failed_jobs',
+    ],
+
+];
diff --git a/config/recaptcha.php b/config/recaptcha.php
new file mode 100644
index 00000000..5dfccd24
--- /dev/null
+++ b/config/recaptcha.php
@@ -0,0 +1,65 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | API Keys
+    |--------------------------------------------------------------------------
+    |
+    | Set the public and private API keys as provided by reCAPTCHA.
+    |
+    | In version 2 of reCAPTCHA, public_key is the Site key,
+    | and private_key is the Secret key.
+    |
+    */
+    'public_key'     => env('RECAPTCHA_PUBLIC_KEY', ''),
+    'private_key'    => env('RECAPTCHA_PRIVATE_KEY', ''),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Template
+    |--------------------------------------------------------------------------
+    |
+    | Set a template to use if you don't want to use the standard one.
+    |
+    */
+    'template'    => env('RECAPTCHA_TEMPLATE', ''),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Driver
+    |--------------------------------------------------------------------------
+    |
+    | Determine how to call out to get response; values are 'curl' or 'native'.
+    | Only applies to v2.
+    |
+    */
+    'driver'      => 'curl',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Options
+    |--------------------------------------------------------------------------
+    |
+    | Various options for the driver
+    |
+    */
+    'options'     => [
+
+        'curl_timeout' => 1,
+
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Version
+    |--------------------------------------------------------------------------
+    |
+    | Set which version of ReCaptcha to use.
+    |
+    */
+
+    'version'     => 2,
+
+];
diff --git a/config/server.php b/config/server.php
new file mode 100644
index 00000000..cd09f9c9
--- /dev/null
+++ b/config/server.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+return array
+(
+    'ssl_enabled'     => env('SSL_ENABLED', false),
+    'db_log_enabled'  => env('DB_LOG_ENABLED', false),
+    'assets_base_url' => env('ASSETS_BASE_URL', null),
+    'banning_enable'  => env('BANNING_ENABLE', true),
+);
\ No newline at end of file
diff --git a/config/services.php b/config/services.php
new file mode 100644
index 00000000..287b1186
--- /dev/null
+++ b/config/services.php
@@ -0,0 +1,38 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Third Party Services
+    |--------------------------------------------------------------------------
+    |
+    | This file is for storing the credentials for third party services such
+    | as Stripe, Mailgun, Mandrill, and others. This file provides a sane
+    | default location for this type of information, allowing packages
+    | to have a conventional place to find your various credentials.
+    |
+    */
+
+    'mailgun' => [
+        'domain' => env('MAILGUN_DOMAIN'),
+        'secret' => env('MAILGUN_SECRET'),
+    ],
+
+    'ses' => [
+        'key' => env('SES_KEY'),
+        'secret' => env('SES_SECRET'),
+        'region' => 'us-east-1',
+    ],
+
+    'sparkpost' => [
+        'secret' => env('SPARKPOST_SECRET'),
+    ],
+
+    'stripe' => [
+        'model' => App\User::class,
+        'key' => env('STRIPE_KEY'),
+        'secret' => env('STRIPE_SECRET'),
+    ],
+
+];
diff --git a/config/session.php b/config/session.php
new file mode 100644
index 00000000..94603fe7
--- /dev/null
+++ b/config/session.php
@@ -0,0 +1,166 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Session Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default session "driver" that will be used on
+    | requests. By default, we will use the lightweight native driver but
+    | you may specify any of the other wonderful drivers provided here.
+    |
+    | Supported: "file", "cookie", "database", "apc",
+    |            "memcached", "redis", "array"
+    |
+    */
+
+    'driver' => env('SESSION_DRIVER', 'file'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Lifetime
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the number of minutes that you wish the session
+    | to be allowed to remain idle before it expires. If you want them
+    | to immediately expire on the browser closing, set that option.
+    |
+    */
+
+    'lifetime' => env('SESSION_LIFETIME', 120),
+
+    'expire_on_close' => env('SESSION_EXPIRE_ON_CLOSE', false),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Encryption
+    |--------------------------------------------------------------------------
+    |
+    | This option allows you to easily specify that all of your session data
+    | should be encrypted before it is stored. All encryption will be run
+    | automatically by Laravel and you can use the Session like normal.
+    |
+    */
+
+    'encrypt' => env('SESSION_ENCRYPT' , false),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session File Location
+    |--------------------------------------------------------------------------
+    |
+    | When using the native session driver, we need a location where session
+    | files may be stored. A default has been set for you but a different
+    | location may be specified. This is only needed for file sessions.
+    |
+    */
+
+    'files' => storage_path('framework/sessions'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Database Connection
+    |--------------------------------------------------------------------------
+    |
+    | When using the "database" or "redis" session drivers, you may specify a
+    | connection that should be used to manage these sessions. This should
+    | correspond to a connection in your database configuration options.
+    |
+    */
+
+    'connection' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Database Table
+    |--------------------------------------------------------------------------
+    |
+    | When using the "database" session driver, you may specify the table we
+    | should use to manage the sessions. Of course, a sensible default is
+    | provided for you; however, you are free to change this as needed.
+    |
+    */
+
+    'table' => 'sessions',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Sweeping Lottery
+    |--------------------------------------------------------------------------
+    |
+    | Some session drivers must manually sweep their storage location to get
+    | rid of old sessions from storage. Here are the chances that it will
+    | happen on a given request. By default, the odds are 2 out of 100.
+    |
+    */
+
+    'lottery' => [2, 100],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Name
+    |--------------------------------------------------------------------------
+    |
+    | Here you may change the name of the cookie used to identify a session
+    | instance by ID. The name specified here will get used every time a
+    | new session cookie is created by the framework for every driver.
+    |
+    */
+
+    'cookie' => env('SESSION_COOKIE_NAME', 'openstackid_session'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Path
+    |--------------------------------------------------------------------------
+    |
+    | The session cookie path determines the path for which the cookie will
+    | be regarded as available. Typically, this will be the root path of
+    | your application but you are free to change this when necessary.
+    |
+    */
+
+    'path' => env('SESSION_COOKIE_PATH', '/'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Domain
+    |--------------------------------------------------------------------------
+    |
+    | Here you may change the domain of the cookie used to identify a session
+    | in your application. This will determine which domains the cookie is
+    | available to in your application. A sensible default has been set.
+    |
+    */
+
+    'domain' => env('SESSION_COOKIE_DOMAIN', null),
+
+    /*
+    |--------------------------------------------------------------------------
+    | HTTPS Only Cookies
+    |--------------------------------------------------------------------------
+    |
+    | By setting this option to true, session cookies will only be sent back
+    | to the server if the browser has a HTTPS connection. This will keep
+    | the cookie from being sent to you if it can not be done securely.
+    |
+    */
+
+    'secure' => env('SESSION_COOKIE_SECURE', false),
+
+    /*
+    |--------------------------------------------------------------------------
+    | HTTP Access Only
+    |--------------------------------------------------------------------------
+    |
+    | Setting this value to true will prevent JavaScript from accessing the
+    | value of the cookie and the cookie will only be accessible through
+    | the HTTP protocol. You are free to modify this option if needed.
+    |
+    */
+
+    'http_only' => env('SESSION_COOKIE_HTTP_ONLY', true),
+
+];
diff --git a/config/view.php b/config/view.php
new file mode 100644
index 00000000..e193ab61
--- /dev/null
+++ b/config/view.php
@@ -0,0 +1,33 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | View Storage Paths
+    |--------------------------------------------------------------------------
+    |
+    | Most templating systems load templates from disk. Here you may specify
+    | an array of paths that should be checked for your views. Of course
+    | the usual Laravel view path has already been registered for you.
+    |
+    */
+
+    'paths' => [
+        realpath(base_path('resources/views')),
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Compiled View Path
+    |--------------------------------------------------------------------------
+    |
+    | This option determines where all the compiled Blade templates will be
+    | stored for your application. Typically, this is within the storage
+    | directory. However, as usual, you are free to change this value.
+    |
+    */
+
+    'compiled' => realpath(storage_path('framework/views')),
+
+];
diff --git a/database/.gitignore b/database/.gitignore
new file mode 100644
index 00000000..9b1dffd9
--- /dev/null
+++ b/database/.gitignore
@@ -0,0 +1 @@
+*.sqlite
diff --git a/app/config/packages/greggilbert/recaptcha/staging/.gitkeep b/database/migrations/.gitkeep
similarity index 100%
rename from app/config/packages/greggilbert/recaptcha/staging/.gitkeep
rename to database/migrations/.gitkeep
diff --git a/app/database/migrations/2013_10_14_155702_create_extension_table.php b/database/migrations/2013_10_14_155702_create_extension_table.php
similarity index 100%
rename from app/database/migrations/2013_10_14_155702_create_extension_table.php
rename to database/migrations/2013_10_14_155702_create_extension_table.php
diff --git a/app/database/migrations/2013_10_17_210518_create_users_table.php b/database/migrations/2013_10_17_210518_create_users_table.php
similarity index 100%
rename from app/database/migrations/2013_10_17_210518_create_users_table.php
rename to database/migrations/2013_10_17_210518_create_users_table.php
diff --git a/app/database/migrations/2013_10_17_210730_create_associations_table.php b/database/migrations/2013_10_17_210730_create_associations_table.php
similarity index 100%
rename from app/database/migrations/2013_10_17_210730_create_associations_table.php
rename to database/migrations/2013_10_17_210730_create_associations_table.php
diff --git a/app/database/migrations/2013_10_17_211051_create_trusted_sites_table.php b/database/migrations/2013_10_17_211051_create_trusted_sites_table.php
similarity index 100%
rename from app/database/migrations/2013_10_17_211051_create_trusted_sites_table.php
rename to database/migrations/2013_10_17_211051_create_trusted_sites_table.php
diff --git a/app/database/migrations/2013_10_17_211839_alter_trusted_sites_table.php b/database/migrations/2013_10_17_211839_alter_trusted_sites_table.php
similarity index 100%
rename from app/database/migrations/2013_10_17_211839_alter_trusted_sites_table.php
rename to database/migrations/2013_10_17_211839_alter_trusted_sites_table.php
diff --git a/app/database/migrations/2013_10_30_203940_create_banned_ips.php b/database/migrations/2013_10_30_203940_create_banned_ips.php
similarity index 100%
rename from app/database/migrations/2013_10_30_203940_create_banned_ips.php
rename to database/migrations/2013_10_30_203940_create_banned_ips.php
diff --git a/app/database/migrations/2013_11_04_152850_create_server_configuration.php b/database/migrations/2013_11_04_152850_create_server_configuration.php
similarity index 100%
rename from app/database/migrations/2013_11_04_152850_create_server_configuration.php
rename to database/migrations/2013_11_04_152850_create_server_configuration.php
diff --git a/app/database/migrations/2013_11_05_134406_create_user_activity_table.php b/database/migrations/2013_11_05_134406_create_user_activity_table.php
similarity index 100%
rename from app/database/migrations/2013_11_05_134406_create_user_activity_table.php
rename to database/migrations/2013_11_05_134406_create_user_activity_table.php
diff --git a/app/database/migrations/2013_11_07_185914_alter_users_table.php b/database/migrations/2013_11_07_185914_alter_users_table.php
similarity index 100%
rename from app/database/migrations/2013_11_07_185914_alter_users_table.php
rename to database/migrations/2013_11_07_185914_alter_users_table.php
diff --git a/app/database/migrations/2013_11_08_160828_create_exceptions_table.php b/database/migrations/2013_11_08_160828_create_exceptions_table.php
similarity index 100%
rename from app/database/migrations/2013_11_08_160828_create_exceptions_table.php
rename to database/migrations/2013_11_08_160828_create_exceptions_table.php
diff --git a/app/database/migrations/2013_11_08_184949_alter_banned_ips_table.php b/database/migrations/2013_11_08_184949_alter_banned_ips_table.php
similarity index 100%
rename from app/database/migrations/2013_11_08_184949_alter_banned_ips_table.php
rename to database/migrations/2013_11_08_184949_alter_banned_ips_table.php
diff --git a/app/database/migrations/2013_12_04_181145_create_oauth2_clients_table.php b/database/migrations/2013_12_04_181145_create_oauth2_clients_table.php
similarity index 100%
rename from app/database/migrations/2013_12_04_181145_create_oauth2_clients_table.php
rename to database/migrations/2013_12_04_181145_create_oauth2_clients_table.php
diff --git a/app/database/migrations/2013_12_04_182836_create_oauth2_clients_authorized_uris.php b/database/migrations/2013_12_04_182836_create_oauth2_clients_authorized_uris.php
similarity index 100%
rename from app/database/migrations/2013_12_04_182836_create_oauth2_clients_authorized_uris.php
rename to database/migrations/2013_12_04_182836_create_oauth2_clients_authorized_uris.php
diff --git a/app/database/migrations/2013_12_04_183057_create_oauth2_api.php b/database/migrations/2013_12_04_183057_create_oauth2_api.php
similarity index 100%
rename from app/database/migrations/2013_12_04_183057_create_oauth2_api.php
rename to database/migrations/2013_12_04_183057_create_oauth2_api.php
diff --git a/app/database/migrations/2013_12_04_183247_create_oauth2_api_scope.php b/database/migrations/2013_12_04_183247_create_oauth2_api_scope.php
similarity index 100%
rename from app/database/migrations/2013_12_04_183247_create_oauth2_api_scope.php
rename to database/migrations/2013_12_04_183247_create_oauth2_api_scope.php
diff --git a/app/database/migrations/2013_12_04_183522_create_oauth2_client_api_scope.php b/database/migrations/2013_12_04_183522_create_oauth2_client_api_scope.php
similarity index 100%
rename from app/database/migrations/2013_12_04_183522_create_oauth2_client_api_scope.php
rename to database/migrations/2013_12_04_183522_create_oauth2_client_api_scope.php
diff --git a/app/database/migrations/2013_12_10_132036_create_oauth2_refresh_token_table.php b/database/migrations/2013_12_10_132036_create_oauth2_refresh_token_table.php
similarity index 100%
rename from app/database/migrations/2013_12_10_132036_create_oauth2_refresh_token_table.php
rename to database/migrations/2013_12_10_132036_create_oauth2_refresh_token_table.php
diff --git a/app/database/migrations/2013_12_12_173310_create_table_oauth2_access_token.php b/database/migrations/2013_12_12_173310_create_table_oauth2_access_token.php
similarity index 100%
rename from app/database/migrations/2013_12_12_173310_create_table_oauth2_access_token.php
rename to database/migrations/2013_12_12_173310_create_table_oauth2_access_token.php
diff --git a/app/database/migrations/2014_01_02_142153_create_table_oauth2_resource_server.php b/database/migrations/2014_01_02_142153_create_table_oauth2_resource_server.php
similarity index 100%
rename from app/database/migrations/2014_01_02_142153_create_table_oauth2_resource_server.php
rename to database/migrations/2014_01_02_142153_create_table_oauth2_resource_server.php
diff --git a/app/database/migrations/2014_01_02_142222_update_table_oauth2_api.php b/database/migrations/2014_01_02_142222_update_table_oauth2_api.php
similarity index 100%
rename from app/database/migrations/2014_01_02_142222_update_table_oauth2_api.php
rename to database/migrations/2014_01_02_142222_update_table_oauth2_api.php
diff --git a/app/database/migrations/2014_01_08_205120_alter_table_oauth2_client.php b/database/migrations/2014_01_08_205120_alter_table_oauth2_client.php
similarity index 100%
rename from app/database/migrations/2014_01_08_205120_alter_table_oauth2_client.php
rename to database/migrations/2014_01_08_205120_alter_table_oauth2_client.php
diff --git a/app/database/migrations/2014_01_22_191553_create_table_oauth2_api_endpoints.php b/database/migrations/2014_01_22_191553_create_table_oauth2_api_endpoints.php
similarity index 100%
rename from app/database/migrations/2014_01_22_191553_create_table_oauth2_api_endpoints.php
rename to database/migrations/2014_01_22_191553_create_table_oauth2_api_endpoints.php
diff --git a/app/database/migrations/2014_01_22_191614_create_table_oauth2_api_endpoints_api_scopes.php b/database/migrations/2014_01_22_191614_create_table_oauth2_api_endpoints_api_scopes.php
similarity index 100%
rename from app/database/migrations/2014_01_22_191614_create_table_oauth2_api_endpoints_api_scopes.php
rename to database/migrations/2014_01_22_191614_create_table_oauth2_api_endpoints_api_scopes.php
diff --git a/app/database/migrations/2014_02_03_125954_alter_table_oauth2_access_token.php b/database/migrations/2014_02_03_125954_alter_table_oauth2_access_token.php
similarity index 100%
rename from app/database/migrations/2014_02_03_125954_alter_table_oauth2_access_token.php
rename to database/migrations/2014_02_03_125954_alter_table_oauth2_access_token.php
diff --git a/app/database/migrations/2014_02_03_130006_alter_refresh_oauth2_access_token.php b/database/migrations/2014_02_03_130006_alter_refresh_oauth2_access_token.php
similarity index 100%
rename from app/database/migrations/2014_02_03_130006_alter_refresh_oauth2_access_token.php
rename to database/migrations/2014_02_03_130006_alter_refresh_oauth2_access_token.php
diff --git a/app/database/migrations/2014_02_03_130027_alter_user_exceptions_trail.php b/database/migrations/2014_02_03_130027_alter_user_exceptions_trail.php
similarity index 100%
rename from app/database/migrations/2014_02_03_130027_alter_user_exceptions_trail.php
rename to database/migrations/2014_02_03_130027_alter_user_exceptions_trail.php
diff --git a/app/database/migrations/2014_02_03_130043_alter_banned_ips.php b/database/migrations/2014_02_03_130043_alter_banned_ips.php
similarity index 100%
rename from app/database/migrations/2014_02_03_130043_alter_banned_ips.php
rename to database/migrations/2014_02_03_130043_alter_banned_ips.php
diff --git a/app/database/migrations/2014_02_03_130201_create_table_oauth2_exceptions_trail.php b/database/migrations/2014_02_03_130201_create_table_oauth2_exceptions_trail.php
similarity index 100%
rename from app/database/migrations/2014_02_03_130201_create_table_oauth2_exceptions_trail.php
rename to database/migrations/2014_02_03_130201_create_table_oauth2_exceptions_trail.php
diff --git a/app/database/migrations/2014_02_04_000856_create_table_oauth2_user_consents.php b/database/migrations/2014_02_04_000856_create_table_oauth2_user_consents.php
similarity index 100%
rename from app/database/migrations/2014_02_04_000856_create_table_oauth2_user_consents.php
rename to database/migrations/2014_02_04_000856_create_table_oauth2_user_consents.php
diff --git a/app/database/migrations/2014_02_07_141946_create_oauth2_client_allowed_origin.php b/database/migrations/2014_02_07_141946_create_oauth2_client_allowed_origin.php
similarity index 100%
rename from app/database/migrations/2014_02_07_141946_create_oauth2_client_allowed_origin.php
rename to database/migrations/2014_02_07_141946_create_oauth2_client_allowed_origin.php
diff --git a/app/database/migrations/2014_02_07_142007_update_oauth2_client.php b/database/migrations/2014_02_07_142007_update_oauth2_client.php
similarity index 100%
rename from app/database/migrations/2014_02_07_142007_update_oauth2_client.php
rename to database/migrations/2014_02_07_142007_update_oauth2_client.php
diff --git a/app/database/migrations/2014_02_07_142031_update_oauth2_api_endpoint.php b/database/migrations/2014_02_07_142031_update_oauth2_api_endpoint.php
similarity index 100%
rename from app/database/migrations/2014_02_07_142031_update_oauth2_api_endpoint.php
rename to database/migrations/2014_02_07_142031_update_oauth2_api_endpoint.php
diff --git a/app/database/migrations/2014_10_01_201522_update_users_table_laravel_4126.php b/database/migrations/2014_10_01_201522_update_users_table_laravel_4126.php
similarity index 100%
rename from app/database/migrations/2014_10_01_201522_update_users_table_laravel_4126.php
rename to database/migrations/2014_10_01_201522_update_users_table_laravel_4126.php
diff --git a/app/database/migrations/2015_03_17_153315_alter_table_oauth2_api_endpoint.php b/database/migrations/2015_03_17_153315_alter_table_oauth2_api_endpoint.php
similarity index 100%
rename from app/database/migrations/2015_03_17_153315_alter_table_oauth2_api_endpoint.php
rename to database/migrations/2015_03_17_153315_alter_table_oauth2_api_endpoint.php
diff --git a/database/migrations/2015_03_19_190534_insert_marketplace_api_endpoints_scopes.php b/database/migrations/2015_03_19_190534_insert_marketplace_api_endpoints_scopes.php
new file mode 100644
index 00000000..298bbe07
--- /dev/null
+++ b/database/migrations/2015_03_19_190534_insert_marketplace_api_endpoints_scopes.php
@@ -0,0 +1,274 @@
+<?php
+
+
+use Illuminate\Database\Migrations\Migration;
+use Models\OAuth2\ResourceServer;
+
+/**
+ * Class InsertMarketplaceApiEndpointsScopes
+ */
+class InsertMarketplaceApiEndpointsScopes extends Migration
+{
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+
+        $resource_server = ResourceServer::first();
+
+        if (!$resource_server) return;
+        // public clouds
+        Api::create(
+            array(
+                'name' => 'public-clouds',
+                'logo' => null,
+                'active' => true,
+                'Description' => 'Marketplace Public Clouds',
+                'resource_server_id' => $resource_server->id,
+                'logo' => asset('/assets/img/apis/server.png')
+            )
+        );
+        // private clouds
+        Api::create(
+            array(
+                'name' => 'private-clouds',
+                'logo' => null,
+                'active' => true,
+                'Description' => 'Marketplace Private Clouds',
+                'resource_server_id' => $resource_server->id,
+                'logo' => asset('/assets/img/apis/server.png')
+            )
+        );
+        // consultants
+        Api::create(
+            array(
+                'name' => 'consultants',
+                'logo' => null,
+                'active' => true,
+                'Description' => 'Marketplace Consultants',
+                'resource_server_id' => $resource_server->id,
+                'logo' => asset('/assets/img/apis/server.png')
+            )
+        );
+
+        $this->seedPublicCloudScopes();
+        $this->seedPrivateCloudScopes();
+        $this->seedConsultantScopes();
+        $this->seedPublicCloudsEndpoints();
+        $this->seedPrivateCloudsEndpoints();
+        $this->seedConsultantsEndpoints();
+    }
+
+
+    private function seedPublicCloudScopes()
+    {
+
+        $current_realm = Config::get('app.url');
+        $public_clouds = Api::where('name', '=', 'public-clouds')->first();
+
+        ApiScope::create(
+            array(
+                'name' => sprintf('%s/public-clouds/read', $current_realm),
+                'short_description' => 'Get Public Clouds',
+                'description' => 'Grants read only access for Public Clouds',
+                'api_id' => $public_clouds->id,
+                'system' => false,
+            )
+        );
+    }
+
+    private function seedPrivateCloudScopes()
+    {
+
+        $current_realm = Config::get('app.url');
+        $private_clouds = Api::where('name', '=', 'private-clouds')->first();
+
+        ApiScope::create(
+            array(
+                'name' => sprintf('%s/private-clouds/read', $current_realm),
+                'short_description' => 'Get Private Clouds',
+                'description' => 'Grants read only access for Private Clouds',
+                'api_id' => $private_clouds->id,
+                'system' => false,
+            )
+        );
+    }
+
+    private function seedConsultantScopes()
+    {
+
+        $current_realm = Config::get('app.url');
+        $consultants = Api::where('name', '=', 'consultants')->first();
+
+        ApiScope::create(
+            array(
+                'name' => sprintf('%s/consultants/read', $current_realm),
+                'short_description' => 'Get Consultants',
+                'description' => 'Grants read only access for Consultants',
+                'api_id' => $consultants->id,
+                'system' => false,
+            )
+        );
+    }
+
+    private function seedPublicCloudsEndpoints()
+    {
+        $public_clouds = Api::where('name', '=', 'public-clouds')->first();
+        $current_realm = Config::get('app.url');
+        // endpoints scopes
+
+        ApiEndpoint::create(
+            array(
+                'name' => 'get-public-clouds',
+                'active' => true,
+                'api_id' => $public_clouds->id,
+                'route' => '/api/v1/marketplace/public-clouds',
+                'http_method' => 'GET'
+            )
+        );
+
+        ApiEndpoint::create(
+            array(
+                'name' => 'get-public-cloud',
+                'active' => true,
+                'api_id' => $public_clouds->id,
+                'route' => '/api/v1/marketplace/public-clouds/{id}',
+                'http_method' => 'GET'
+            )
+        );
+
+        ApiEndpoint::create(
+            array(
+                'name' => 'get-public-cloud-datacenters',
+                'active' => true,
+                'api_id' => $public_clouds->id,
+                'route' => '/api/v1/marketplace/public-clouds/{id}/data-centers',
+                'http_method' => 'GET'
+            )
+        );
+
+        $public_cloud_read_scope = ApiScope::where('name', '=', sprintf('%s/public-clouds/read', $current_realm))->first();
+
+        $endpoint_get_public_clouds = ApiEndpoint::where('name', '=', 'get-public-clouds')->first();
+        $endpoint_get_public_clouds->scopes()->attach($public_cloud_read_scope->id);
+
+        $endpoint_get_public_cloud = ApiEndpoint::where('name', '=', 'get-public-cloud')->first();
+        $endpoint_get_public_cloud->scopes()->attach($public_cloud_read_scope->id);
+
+        $endpoint_get_public_cloud_datacenters = ApiEndpoint::where('name', '=', 'get-public-cloud-datacenters')->first();
+        $endpoint_get_public_cloud_datacenters->scopes()->attach($public_cloud_read_scope->id);
+    }
+
+    private function seedPrivateCloudsEndpoints()
+    {
+        $private_clouds = Api::where('name', '=', 'private-clouds')->first();
+        $current_realm = Config::get('app.url');
+        // endpoints scopes
+
+        ApiEndpoint::create(
+            array(
+                'name' => 'get-private-clouds',
+                'active' => true,
+                'api_id' => $private_clouds->id,
+                'route' => '/api/v1/marketplace/private-clouds',
+                'http_method' => 'GET'
+            )
+        );
+
+        ApiEndpoint::create(
+            array(
+                'name' => 'get-private-cloud',
+                'active' => true,
+                'api_id' => $private_clouds->id,
+                'route' => '/api/v1/marketplace/private-clouds/{id}',
+                'http_method' => 'GET'
+            )
+        );
+
+        ApiEndpoint::create(
+            array(
+                'name' => 'get-private-cloud-datacenters',
+                'active' => true,
+                'api_id' => $private_clouds->id,
+                'route' => '/api/v1/marketplace/private-clouds/{id}/data-centers',
+                'http_method' => 'GET'
+            )
+        );
+
+        $private_cloud_read_scope = ApiScope::where('name', '=', sprintf('%s/private-clouds/read', $current_realm))->first();
+
+        $endpoint_get_private_clouds = ApiEndpoint::where('name', '=', 'get-private-clouds')->first();
+        $endpoint_get_private_clouds->scopes()->attach($private_cloud_read_scope->id);
+
+        $endpoint_get_private_cloud = ApiEndpoint::where('name', '=', 'get-private-cloud')->first();
+        $endpoint_get_private_cloud->scopes()->attach($private_cloud_read_scope->id);
+
+        $endpoint_get_private_cloud_datacenters = ApiEndpoint::where('name', '=', 'get-private-cloud-datacenters')->first();
+        $endpoint_get_private_cloud_datacenters->scopes()->attach($private_cloud_read_scope->id);
+
+    }
+
+    private function seedConsultantsEndpoints()
+    {
+
+        $consultants = Api::where('name', '=', 'consultants')->first();
+        $current_realm = Config::get('app.url');
+        // endpoints scopes
+
+        ApiEndpoint::create(
+            array(
+                'name' => 'get-consultants',
+                'active' => true,
+                'api_id' => $consultants->id,
+                'route' => '/api/v1/marketplace/consultants',
+                'http_method' => 'GET'
+            )
+        );
+
+        ApiEndpoint::create(
+            array(
+                'name' => 'get-consultant',
+                'active' => true,
+                'api_id' => $consultants->id,
+                'route' => '/api/v1/marketplace/consultants/{id}',
+                'http_method' => 'GET'
+            )
+        );
+
+        ApiEndpoint::create(
+            array(
+                'name' => 'get-consultant-offices',
+                'active' => true,
+                'api_id' => $consultants->id,
+                'route' => '/api/v1/marketplace/consultants/{id}/offices',
+                'http_method' => 'GET'
+            )
+        );
+
+        $consultant_read_scope = ApiScope::where('name', '=', sprintf('%s/consultants/read', $current_realm))->first();
+
+        $endpoint = ApiEndpoint::where('name', '=', 'get-consultants')->first();
+        $endpoint->scopes()->attach($consultant_read_scope->id);
+
+        $endpoint = ApiEndpoint::where('name', '=', 'get-consultant')->first();
+        $endpoint->scopes()->attach($consultant_read_scope->id);
+
+        $endpoint = ApiEndpoint::where('name', '=', 'get-consultant-offices')->first();
+        $endpoint->scopes()->attach($consultant_read_scope->id);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+
+}
diff --git a/app/database/migrations/2015_04_15_151846_update_openid_users_table.php b/database/migrations/2015_04_15_151846_update_openid_users_table.php
similarity index 100%
rename from app/database/migrations/2015_04_15_151846_update_openid_users_table.php
rename to database/migrations/2015_04_15_151846_update_openid_users_table.php
diff --git a/app/database/migrations/2015_04_15_152300_update_identifier_on_openid_users_table.php b/database/migrations/2015_04_15_152300_update_identifier_on_openid_users_table.php
similarity index 98%
rename from app/database/migrations/2015_04_15_152300_update_identifier_on_openid_users_table.php
rename to database/migrations/2015_04_15_152300_update_identifier_on_openid_users_table.php
index 7257b71b..97f18453 100644
--- a/app/database/migrations/2015_04_15_152300_update_identifier_on_openid_users_table.php
+++ b/database/migrations/2015_04_15_152300_update_identifier_on_openid_users_table.php
@@ -2,7 +2,7 @@
 
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
-use auth\User;
+use Auth\User;
 
 class UpdateIdentifierOnOpenidUsersTable extends Migration {
 
diff --git a/app/database/migrations/2015_04_15_153123_update__drop_external_id_openid_users_table.php b/database/migrations/2015_04_15_153123_update__drop_external_id_openid_users_table.php
similarity index 100%
rename from app/database/migrations/2015_04_15_153123_update__drop_external_id_openid_users_table.php
rename to database/migrations/2015_04_15_153123_update__drop_external_id_openid_users_table.php
diff --git a/app/database/migrations/2015_04_28_194733_update_oauth2_api_table.php b/database/migrations/2015_04_28_194733_update_oauth2_api_table.php
similarity index 100%
rename from app/database/migrations/2015_04_28_194733_update_oauth2_api_table.php
rename to database/migrations/2015_04_28_194733_update_oauth2_api_table.php
diff --git a/app/database/migrations/2015_04_28_195254_update_oauth2_api_endpoint_table.php b/database/migrations/2015_04_28_195254_update_oauth2_api_endpoint_table.php
similarity index 100%
rename from app/database/migrations/2015_04_28_195254_update_oauth2_api_endpoint_table.php
rename to database/migrations/2015_04_28_195254_update_oauth2_api_endpoint_table.php
diff --git a/database/migrations/2015_05_06_142958_delete_marketplace_api_endpoints_scopes.php b/database/migrations/2015_05_06_142958_delete_marketplace_api_endpoints_scopes.php
new file mode 100644
index 00000000..9b79ddb2
--- /dev/null
+++ b/database/migrations/2015_05_06_142958_delete_marketplace_api_endpoints_scopes.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Models\OAuth2\Api;
+
+class DeleteMarketplaceApiEndpointsScopes extends Migration
+{
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $public_clouds = Api::where('name', '=', 'public-clouds')->first();
+        if ($public_clouds) $public_clouds->delete();
+        $private_clouds = Api::where('name', '=', 'private-clouds')->first();
+        if ($private_clouds) $private_clouds->delete();
+        $consultants = Api::where('name', '=', 'consultants')->first();
+        if ($consultants) $consultants->delete();
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+
+}
diff --git a/app/database/migrations/2015_06_30_192410_update_oauth2_client_oidc.php b/database/migrations/2015_06_30_192410_update_oauth2_client_oidc.php
similarity index 98%
rename from app/database/migrations/2015_06_30_192410_update_oauth2_client_oidc.php
rename to database/migrations/2015_06_30_192410_update_oauth2_client_oidc.php
index a52256a2..39bb0ea7 100644
--- a/app/database/migrations/2015_06_30_192410_update_oauth2_client_oidc.php
+++ b/database/migrations/2015_06_30_192410_update_oauth2_client_oidc.php
@@ -1,8 +1,9 @@
 <?php
 
 use Illuminate\Database\Migrations\Migration;
-use oauth2\OAuth2Protocol;
-use oauth2\models\IClient;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Models\IClient;
+use Models\OAuth2\Client;
 use jwa\JSONWebSignatureAndEncryptionAlgorithms;
 /**
  * Class UpdateOauth2Client
diff --git a/app/database/migrations/2015_07_09_044730_create_assymetric_keys.php b/database/migrations/2015_07_09_044730_create_assymetric_keys.php
similarity index 92%
rename from app/database/migrations/2015_07_09_044730_create_assymetric_keys.php
rename to database/migrations/2015_07_09_044730_create_assymetric_keys.php
index 05886e0b..13bee6f4 100644
--- a/app/database/migrations/2015_07_09_044730_create_assymetric_keys.php
+++ b/database/migrations/2015_07_09_044730_create_assymetric_keys.php
@@ -18,7 +18,7 @@ final class CreateAssymetricKeys extends Migration
      */
     public function up()
     {
-        Schema::create('oauth2_assymetric_keys', function ($table) {
+        Schema::create('oauth2_asymmetric_keys', function ($table) {
             $table->bigIncrements('id');
             $table->timestamps();
             $table->text('pem_content');
@@ -78,10 +78,10 @@ final class CreateAssymetricKeys extends Migration
      */
     public function down()
     {
-        Schema::table('oauth2_assymetric_keys', function ($table) {
+        Schema::table('oauth2_asymmetric_keys', function ($table) {
             $table->dropForeign('oauth2_client_id');
         });
-        Schema::dropIfExists('oauth2_assymetric_keys');
+        Schema::dropIfExists('oauth2_asymmetric_keys');
     }
 
 }
diff --git a/app/database/migrations/2015_07_23_151507_migrate_redirect_uris.php b/database/migrations/2015_07_23_151507_migrate_redirect_uris.php
similarity index 100%
rename from app/database/migrations/2015_07_23_151507_migrate_redirect_uris.php
rename to database/migrations/2015_07_23_151507_migrate_redirect_uris.php
diff --git a/app/database/migrations/2015_07_23_151520_add_new_default_scopes.php b/database/migrations/2015_07_23_151520_add_new_default_scopes.php
similarity index 96%
rename from app/database/migrations/2015_07_23_151520_add_new_default_scopes.php
rename to database/migrations/2015_07_23_151520_add_new_default_scopes.php
index b9680e83..a14dc584 100644
--- a/app/database/migrations/2015_07_23_151520_add_new_default_scopes.php
+++ b/database/migrations/2015_07_23_151520_add_new_default_scopes.php
@@ -1,7 +1,8 @@
 <?php
 
 use Illuminate\Database\Migrations\Migration;
-use oauth2\OAuth2Protocol;
+use OAuth2\OAuth2Protocol;
+use Models\OAuth2\ApiScope;
 
 class AddNewDefaultScopes extends Migration
 {
diff --git a/app/database/migrations/2015_07_23_151541_update_oauth2_client_scopes.php b/database/migrations/2015_07_23_151541_update_oauth2_client_scopes.php
similarity index 91%
rename from app/database/migrations/2015_07_23_151541_update_oauth2_client_scopes.php
rename to database/migrations/2015_07_23_151541_update_oauth2_client_scopes.php
index 3f75ba9a..5c6010f3 100644
--- a/app/database/migrations/2015_07_23_151541_update_oauth2_client_scopes.php
+++ b/database/migrations/2015_07_23_151541_update_oauth2_client_scopes.php
@@ -1,8 +1,10 @@
 <?php
 
 use Illuminate\Database\Migrations\Migration;
-use oauth2\OAuth2Protocol;
-use oauth2\models\IClient;
+use OAuth2\OAuth2Protocol;
+use OAuth2\Models\IClient;
+use Models\OAuth2\Client;
+use Models\OAuth2\ApiScope;
 
 class UpdateOauth2ClientScopes extends Migration
 {
diff --git a/app/database/migrations/2015_07_30_221758_oauth2_clients_update_secret_expiration_date.php b/database/migrations/2015_07_30_221758_oauth2_clients_update_secret_expiration_date.php
similarity index 92%
rename from app/database/migrations/2015_07_30_221758_oauth2_clients_update_secret_expiration_date.php
rename to database/migrations/2015_07_30_221758_oauth2_clients_update_secret_expiration_date.php
index 47ba9498..87ff9980 100644
--- a/app/database/migrations/2015_07_30_221758_oauth2_clients_update_secret_expiration_date.php
+++ b/database/migrations/2015_07_30_221758_oauth2_clients_update_secret_expiration_date.php
@@ -1,7 +1,8 @@
 <?php
 
 use Illuminate\Database\Migrations\Migration;
-use oauth2\models\IClient;
+use OAuth2\Models\IClient;
+use Models\OAuth2\Client;
 
 class Oauth2ClientsUpdateSecretExpirationDate extends Migration
 {
diff --git a/app/database/migrations/2015_08_10_205534_add_user_info_OIDC_endpoint.php b/database/migrations/2015_08_10_205534_add_user_info_OIDC_endpoint.php
similarity index 95%
rename from app/database/migrations/2015_08_10_205534_add_user_info_OIDC_endpoint.php
rename to database/migrations/2015_08_10_205534_add_user_info_OIDC_endpoint.php
index a5617c38..af71d4e0 100644
--- a/app/database/migrations/2015_08_10_205534_add_user_info_OIDC_endpoint.php
+++ b/database/migrations/2015_08_10_205534_add_user_info_OIDC_endpoint.php
@@ -1,6 +1,9 @@
 <?php
 
 use Illuminate\Database\Migrations\Migration;
+use Models\OAuth2\Api;
+use Models\OAuth2\ApiEndpoint;
+use Models\OAuth2\ApiScope;
 
 class AddUserInfoOIDCEndpoint extends Migration
 {
diff --git a/app/database/migrations/2015_12_14_203852_add_api_scopes_groups.php b/database/migrations/2015_12_14_203852_add_api_scopes_groups.php
similarity index 100%
rename from app/database/migrations/2015_12_14_203852_add_api_scopes_groups.php
rename to database/migrations/2015_12_14_203852_add_api_scopes_groups.php
diff --git a/app/database/migrations/2015_12_15_201400_update_api_scope.php b/database/migrations/2015_12_15_201400_update_api_scope.php
similarity index 100%
rename from app/database/migrations/2015_12_15_201400_update_api_scope.php
rename to database/migrations/2015_12_15_201400_update_api_scope.php
diff --git a/app/database/migrations/2016_02_23_154940_update_resource_server.php b/database/migrations/2016_02_23_154940_update_resource_server.php
similarity index 100%
rename from app/database/migrations/2016_02_23_154940_update_resource_server.php
rename to database/migrations/2016_02_23_154940_update_resource_server.php
diff --git a/app/database/migrations/2016_02_23_155022_create_white_listed_ips.php b/database/migrations/2016_02_23_155022_create_white_listed_ips.php
similarity index 100%
rename from app/database/migrations/2016_02_23_155022_create_white_listed_ips.php
rename to database/migrations/2016_02_23_155022_create_white_listed_ips.php
diff --git a/app/database/migrations/2016_02_24_205808_add_oauth_app_admins.php b/database/migrations/2016_02_24_205808_add_oauth_app_admins.php
similarity index 100%
rename from app/database/migrations/2016_02_24_205808_add_oauth_app_admins.php
rename to database/migrations/2016_02_24_205808_add_oauth_app_admins.php
diff --git a/app/database/migrations/2016_02_25_132724_update_oauth2_client_admin_users.php b/database/migrations/2016_02_25_132724_update_oauth2_client_admin_users.php
similarity index 100%
rename from app/database/migrations/2016_02_25_132724_update_oauth2_client_admin_users.php
rename to database/migrations/2016_02_25_132724_update_oauth2_client_admin_users.php
diff --git a/app/database/migrations/2016_03_15_124319_update_table_user_exceptions_trail.php b/database/migrations/2016_03_15_124319_update_table_user_exceptions_trail.php
similarity index 100%
rename from app/database/migrations/2016_03_15_124319_update_table_user_exceptions_trail.php
rename to database/migrations/2016_03_15_124319_update_table_user_exceptions_trail.php
diff --git a/database/migrations/2016_09_23_193631_rename_table_oauth2_assymetric_keys.php b/database/migrations/2016_09_23_193631_rename_table_oauth2_assymetric_keys.php
new file mode 100644
index 00000000..00bb7f27
--- /dev/null
+++ b/database/migrations/2016_09_23_193631_rename_table_oauth2_assymetric_keys.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+class RenameTableOauth2AssymetricKeys extends Migration
+{
+    /**
+     * Run the migrations.
+     *N
+     * @return void
+     */
+    public function up()
+    {
+        Schema::rename("oauth2_assymetric_keys", "oauth2_asymmetric_keys");
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/database/migrations/2016_09_26_133648_update_server_extensions.php b/database/migrations/2016_09_26_133648_update_server_extensions.php
new file mode 100644
index 00000000..8c08b1e7
--- /dev/null
+++ b/database/migrations/2016_09_26_133648_update_server_extensions.php
@@ -0,0 +1,63 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Models\OpenId\ServerExtension;
+use Illuminate\Support\Facades\DB;
+
+class UpdateServerExtensions extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        DB::table('server_extensions')->delete();
+
+        ServerExtension::create(
+            array(
+                'name'            => 'AX',
+                'namespace'       => 'http://openid.net/srv/ax/1.0',
+                'active'          => true,
+                'extension_class' => \OpenId\Extensions\Implementations\OpenIdAXExtension::class,
+                'description'     => 'OpenID service extension for exchanging identity information between endpoints',
+                'view_name'       =>'extensions.ax',
+            )
+        );
+
+        ServerExtension::create(
+            array(
+                'name'            => 'SREG',
+                'namespace'       => 'http://openid.net/extensions/sreg/1.1',
+                'active'          => true,
+                'extension_class' => \OpenId\Extensions\Implementations\OpenIdSREGExtension::class,
+                'description'     => 'OpenID Simple Registration is an extension to the OpenID Authentication protocol that allows for very light-weight profile exchange.',
+                'view_name'       => 'extensions.sreg',
+            )
+        );
+
+
+        ServerExtension::create(
+            array(
+                'name'            => 'OAUTH2',
+                'namespace'       => 'http://specs.openid.net/extensions/oauth/2.0',
+                'active'          => true,
+                'extension_class' => \OpenId\Extensions\Implementations\OpenIdOAuth2Extension::class,
+                'description'     => 'The OpenID OAuth2 Extension describes how to make the OpenID Authentication and OAuth2 Core specifications work well together.',
+                'view_name'       => 'extensions.oauth2',
+            )
+        );
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/app/config/packages/greggilbert/recaptcha/testing/.gitkeep b/database/seeds/.gitkeep
similarity index 100%
rename from app/config/packages/greggilbert/recaptcha/testing/.gitkeep
rename to database/seeds/.gitkeep
diff --git a/app/database/seeds/ApiEndpointSeeder.php b/database/seeds/ApiEndpointSeeder.php
similarity index 96%
rename from app/database/seeds/ApiEndpointSeeder.php
rename to database/seeds/ApiEndpointSeeder.php
index b03a3c96..0d5aa13e 100644
--- a/app/database/seeds/ApiEndpointSeeder.php
+++ b/database/seeds/ApiEndpointSeeder.php
@@ -1,5 +1,9 @@
 <?php
 
+use Models\OAuth2\Api;
+use Models\OAuth2\ApiEndpoint;
+use Illuminate\Database\Seeder;
+
 /**
  * Class ApiEndpointSeeder
  */
diff --git a/app/database/seeds/ApiScopeSeeder.php b/database/seeds/ApiScopeSeeder.php
similarity index 97%
rename from app/database/seeds/ApiScopeSeeder.php
rename to database/seeds/ApiScopeSeeder.php
index 7d320b96..01420f0d 100644
--- a/app/database/seeds/ApiScopeSeeder.php
+++ b/database/seeds/ApiScopeSeeder.php
@@ -1,7 +1,9 @@
 <?php
 
 use oauth2\OAuth2Protocol;
-
+use Models\OAuth2\Api;
+use Models\OAuth2\ApiScope;
+use Illuminate\Database\Seeder;
 /**
  * Class ApiScopeSeeder
  */
diff --git a/app/database/seeds/ApiSeeder.php b/database/seeds/ApiSeeder.php
similarity index 89%
rename from app/database/seeds/ApiSeeder.php
rename to database/seeds/ApiSeeder.php
index 4fc4d81f..d66cbaf1 100644
--- a/app/database/seeds/ApiSeeder.php
+++ b/database/seeds/ApiSeeder.php
@@ -1,5 +1,8 @@
 <?php
 
+use Models\OAuth2\ResourceServer;
+use Models\OAuth2\Api;
+use Illuminate\Database\Seeder;
 /**
  * Class ApiSeeder
  */
diff --git a/app/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
similarity index 96%
rename from app/database/seeds/DatabaseSeeder.php
rename to database/seeds/DatabaseSeeder.php
index 244640d1..4f32a16d 100644
--- a/app/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -1,5 +1,5 @@
 <?php
-
+use Illuminate\Database\Seeder;
 /**
  * Class DatabaseSeeder
  */
diff --git a/app/database/seeds/OpenIdExtensionsSeeder.php b/database/seeds/OpenIdExtensionsSeeder.php
similarity index 73%
rename from app/database/seeds/OpenIdExtensionsSeeder.php
rename to database/seeds/OpenIdExtensionsSeeder.php
index 67761d37..8ef34d54 100644
--- a/app/database/seeds/OpenIdExtensionsSeeder.php
+++ b/database/seeds/OpenIdExtensionsSeeder.php
@@ -1,5 +1,14 @@
 <?php
 
+use Models\OpenId\ServerExtension;
+use Illuminate\Database\Seeder;
+use OpenId\Extensions\Implementations\OpenIdAXExtension;
+use OpenId\Extensions\Implementations\OpenIdSREGExtension;
+use OpenId\Extensions\Implementations\OpenIdOAuth2Extension;
+
+/**
+ * Class OpenIdExtensionsSeeder
+ */
 class OpenIdExtensionsSeeder extends Seeder {
 
     public function run()
@@ -10,8 +19,8 @@ class OpenIdExtensionsSeeder extends Seeder {
             array(
                 'name'            => 'AX',
                 'namespace'       => 'http://openid.net/srv/ax/1.0',
-                'active'          => false,
-                'extension_class' => 'openid\extensions\implementations\OpenIdAXExtension',
+                'active'          => true,
+                'extension_class' => OpenIdAXExtension::class,
                 'description'     => 'OpenID service extension for exchanging identity information between endpoints',
                 'view_name'       =>'extensions.ax',
             )
@@ -22,7 +31,7 @@ class OpenIdExtensionsSeeder extends Seeder {
                 'name'            => 'SREG',
                 'namespace'       => 'http://openid.net/extensions/sreg/1.1',
                 'active'          => true,
-                'extension_class' => 'openid\extensions\implementations\OpenIdSREGExtension',
+                'extension_class' => OpenIdSREGExtension::class,
                 'description'     => 'OpenID Simple Registration is an extension to the OpenID Authentication protocol that allows for very light-weight profile exchange.',
                 'view_name'       => 'extensions.sreg',
             )
@@ -34,7 +43,7 @@ class OpenIdExtensionsSeeder extends Seeder {
                 'name'            => 'OAUTH2',
                 'namespace'       => 'http://specs.openid.net/extensions/oauth/2.0',
                 'active'          => true,
-                'extension_class' => 'openid\extensions\implementations\OpenIdOAuth2Extension',
+                'extension_class' => OpenIdOAuth2Extension::class,
                 'description'     => 'The OpenID OAuth2 Extension describes how to make the OpenID Authentication and OAuth2 Core specifications work well together.',
                 'view_name'       => 'extensions.oauth2',
             )
diff --git a/app/database/seeds/ResourceServerSeeder.php b/database/seeds/ResourceServerSeeder.php
similarity index 81%
rename from app/database/seeds/ResourceServerSeeder.php
rename to database/seeds/ResourceServerSeeder.php
index 7d017249..f41266f1 100644
--- a/app/database/seeds/ResourceServerSeeder.php
+++ b/database/seeds/ResourceServerSeeder.php
@@ -1,5 +1,10 @@
 <?php
+use Models\OAuth2\ResourceServer;
+use Illuminate\Database\Seeder;
 
+/**
+ * Class ResourceServerSeeder
+ */
 class ResourceServerSeeder extends Seeder {
 
     public function run()
diff --git a/app/database/seeds/ServerConfigurationSeeder.php b/database/seeds/ServerConfigurationSeeder.php
similarity index 98%
rename from app/database/seeds/ServerConfigurationSeeder.php
rename to database/seeds/ServerConfigurationSeeder.php
index a0f3751f..192ede89 100644
--- a/app/database/seeds/ServerConfigurationSeeder.php
+++ b/database/seeds/ServerConfigurationSeeder.php
@@ -1,11 +1,11 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: smarcet
- * Date: 11/4/13
- * Time: 12:31 PM
- */
 
+use Models\ServerConfiguration;
+use Illuminate\Database\Seeder;
+
+/**
+ * Class ServerConfigurationSeeder
+ */
 class ServerConfigurationSeeder extends Seeder {
 
     public function run()
diff --git a/app/database/seeds/TestSeeder.php b/database/seeds/TestSeeder.php
similarity index 97%
rename from app/database/seeds/TestSeeder.php
rename to database/seeds/TestSeeder.php
index 1144d90c..b03a634d 100644
--- a/app/database/seeds/TestSeeder.php
+++ b/database/seeds/TestSeeder.php
@@ -1,12 +1,28 @@
 <?php
 
-use oauth2\models\IClient;
-use auth\User;
-use utils\services\IAuthService;
+use OAuth2\Models\IClient;
+use OAuth2\OAuth2Protocol;
+use Auth\User;
+use Utils\Services\IAuthService;
+use Models\OAuth2\Client;
+use Models\Member;
+use Models\OAuth2\ResourceServer;
+use Models\OAuth2\ApiScope;
+use Models\OAuth2\Api;
+use Models\OAuth2\ApiEndpoint;
+use Models\ServerConfiguration;
+use Models\OpenId\ServerExtension;
 use \jwk\JSONWebKeyPublicKeyUseValues;
 use \jwk\JSONWebKeyTypes;
-use \oauth2\OAuth2Protocol;
 use \jwa\JSONWebSignatureAndEncryptionAlgorithms;
+use Illuminate\Database\Seeder;
+use Models\OpenId\OpenIdTrustedSite;
+use Models\OAuth2\ClientPublicKey;
+use Models\OAuth2\ServerPrivateKey;
+use OpenId\Extensions\Implementations\OpenIdAXExtension;
+use OpenId\Extensions\Implementations\OpenIdSREGExtension;
+use OpenId\Extensions\Implementations\OpenIdOAuth2Extension;
+use Models\Group;
 /**
  * Class OAuth2ApplicationSeeder
  * This seeder is only for testing purposes
@@ -67,7 +83,7 @@ sMxkIDGm1b1YX3BHbuF55yApF6w9hBrkHx3s6J8DrbYjML/R31dZaBMzPXd/fdZl
 -----END RSA PRIVATE KEY-----
 PPK;
 
-    static $client_public_key_1 = <<<PPK
+static $client_public_key_1 = <<<PPK
 -----BEGIN PUBLIC KEY-----
 MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAkjiUI6n3Fq140AipaLxN
 IPCzEItQFcY8G5Xd17u7InM3H542+34PdBpwR66miQUgJK+rtfaot/v4QPj4/0Bn
@@ -84,8 +100,7 @@ TaE5jLBAwxm+wF6Ue/nRPJMCAwEAAQ==
 -----END PUBLIC KEY-----
 PPK;
 
-
-    static $client_private_key_2 = <<<PPK
+static $client_private_key_2 = <<<PPK
 -----BEGIN RSA PRIVATE KEY-----
 MIIJJwIBAAKCAgBHhlSRoBMo9uYJyHPr0g54EzzKrpjNBUDqnTztggsIfXR3A73T
 olGmeXTECu+QIAyEtGGDylp4cJhyworIwzdAfMCY9Xux5B+Vo0Kyte2JMvwzanNL
@@ -139,7 +154,7 @@ pedgcMaklTsqGgEkbCKQ9VlJUWQuhkSRGhYzg4qucl1uoU2VU2d2X/qOWg==
 -----END RSA PRIVATE KEY-----
 PPK;
 
-    static $client_public_key_2 = <<<PPK
+static $client_public_key_2 = <<<PPK
 -----BEGIN PUBLIC KEY-----
 MIICITANBgkqhkiG9w0BAQEFAAOCAg4AMIICCQKCAgBHhlSRoBMo9uYJyHPr0g54
 EzzKrpjNBUDqnTztggsIfXR3A73TolGmeXTECu+QIAyEtGGDylp4cJhyworIwzdA
@@ -167,6 +182,7 @@ PPK;
       (
           ID integer primary key,
           FirstName varchar(50),
+          ClassName varchar(255),
           Surname varchar(50),
           Email varchar(254),
           Password varchar(254),
@@ -181,11 +197,38 @@ PPK;
           Country varchar(2),
           Gender varchar(32),
           EmailVerified integer,
-          Active integer
+          Active integer,
+          LastEdited datetime,
+          Created datetime
       );
 SQL;
 
-        DB::connection('os_members')->statement($member_table);
+        DB::connection('ss')->statement($member_table);
+
+        $groups_table = <<<SQL
+CREATE TABLE `Group` (
+   ID integer primary key,
+   ClassName varchar(255),
+   Title varchar(255),
+   Description  varchar(255),
+   Code  varchar(255),
+   LastEdited datetime,
+   Created datetime
+);
+SQL;
+
+        DB::connection('ss')->statement($groups_table);
+
+        $groups_members_table = <<<SQL
+CREATE TABLE Group_Members (
+   ID integer primary key,
+   GroupID integer,
+   MemberID integer
+);
+
+SQL;
+
+        DB::connection('ss')->statement($groups_members_table);
 
         Member::create(
             array(
@@ -209,6 +252,34 @@ SQL;
             )
         );
 
+        Group::create(
+            array(
+                'ID'   => 1,
+                'Title' => \OAuth2\Models\IOAuth2User::OAuth2ServerAdminGroup,
+                'Code' => \OAuth2\Models\IOAuth2User::OAuth2ServerAdminGroup,
+            )
+        );
+
+        Group::create(
+            array(
+                'ID'   => 2,
+                'Title' => \OAuth2\Models\IOAuth2User::OAuth2SystemScopeAdminGroup,
+                'Code' => \OAuth2\Models\IOAuth2User::OAuth2SystemScopeAdminGroup,
+            )
+        );
+
+        Group::create(
+            array(
+                'ID'   => 3,
+                'Title' => \OpenId\Models\IOpenIdUser::OpenStackIdServerAdminGroup,
+                'Code' => \OpenId\Models\IOpenIdUser::OpenStackIdServerAdminGroup,
+            )
+        );
+
+        $member = Member::find(1);
+
+        $member->groups()->attach([1,2,3]);
+
         Member::create(
             array(
                 'ID'   => 2,
@@ -350,7 +421,7 @@ SQL;
         DB::table('oauth2_client_authorized_uri')->delete();
         DB::table('oauth2_access_token')->delete();
         DB::table('oauth2_refresh_token')->delete();
-        DB::table('oauth2_assymetric_keys')->delete();
+        DB::table('oauth2_asymmetric_keys')->delete();
         DB::table('oauth2_client')->delete();
 
         DB::table('openid_trusted_sites')->delete();
@@ -633,7 +704,7 @@ SQL;
                 'name'            => 'AX',
                 'namespace'       => 'http://openid.net/srv/ax/1.0',
                 'active'          => false,
-                'extension_class' => 'openid\extensions\implementations\OpenIdAXExtension',
+                'extension_class' => OpenIdAXExtension::class,
                 'description'     => 'OpenID service extension for exchanging identity information between endpoints',
                 'view_name'       =>'extensions.ax',
             )
@@ -644,7 +715,7 @@ SQL;
                 'name'            => 'SREG',
                 'namespace'       => 'http://openid.net/extensions/sreg/1.1',
                 'active'          => true,
-                'extension_class' => 'openid\extensions\implementations\OpenIdSREGExtension',
+                'extension_class' => OpenIdSREGExtension::class,
                 'description'     => 'OpenID Simple Registration is an extension to the OpenID Authentication protocol that allows for very light-weight profile exchange.',
                 'view_name'       => 'extensions.sreg',
             )
@@ -655,7 +726,7 @@ SQL;
                 'name'            => 'OAUTH2',
                 'namespace'       => 'http://specs.openid.net/extensions/oauth/2.0',
                 'active'          => true,
-                'extension_class' => 'openid\extensions\implementations\OpenIdOAuth2Extension',
+                'extension_class' => OpenIdOAuth2Extension::class,
                 'description'     => 'The OpenID OAuth2 Extension describes how to make the OpenID Authentication and OAuth2 Core specifications work well together.',
                 'view_name'       => 'extensions.oauth2',
             )
diff --git a/gulpfile.js b/gulpfile.js
new file mode 100644
index 00000000..dc6f1ebb
--- /dev/null
+++ b/gulpfile.js
@@ -0,0 +1,16 @@
+var elixir = require('laravel-elixir');
+
+/*
+ |--------------------------------------------------------------------------
+ | Elixir Asset Management
+ |--------------------------------------------------------------------------
+ |
+ | Elixir provides a clean, fluent API for defining some basic Gulp tasks
+ | for your Laravel application. By default, we are compiling the Sass
+ | file for our application, as well as publishing vendor resources.
+ |
+ */
+
+elixir(function(mix) {
+    mix.sass('app.scss');
+});
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..b8363c2f
--- /dev/null
+++ b/package.json
@@ -0,0 +1,10 @@
+{
+  "private": true,
+  "devDependencies": {
+    "gulp": "^3.9.1"
+  },
+  "dependencies": {
+    "laravel-elixir": "^5.0.0",
+    "bootstrap-sass": "^3.0.0"
+  }
+}
diff --git a/phpunit.xml b/phpunit.xml
index c42dc4f7..b22af540 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -8,11 +8,13 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
->
+         syntaxCheck="false">
     <testsuites>
         <testsuite name="Application Test Suite">
-            <directory>./app/tests/</directory>
+            <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-</phpunit>
\ No newline at end of file
+    <php>
+        <env name="APP_ENV" value="testing"/>
+    </php>
+</phpunit>
diff --git a/public/.htaccess b/public/.htaccess
index 77827ae7..903f6392 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -5,11 +5,16 @@
 
     RewriteEngine On
 
-    # Redirect Trailing Slashes...
+    # Redirect Trailing Slashes If Not A Folder...
+    RewriteCond %{REQUEST_FILENAME} !-d
     RewriteRule ^(.*)/$ /$1 [L,R=301]
 
     # Handle Front Controller...
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteRule ^ index.php [L]
+
+    # Handle Authorization Header
+    RewriteCond %{HTTP:Authorization} .
+    RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
 </IfModule>
diff --git a/public/assets/js/jquery.serialize.js b/public/assets/js/jquery.serialize.js
index 242186fd..905e4465 100644
--- a/public/assets/js/jquery.serialize.js
+++ b/public/assets/js/jquery.serialize.js
@@ -16,7 +16,8 @@
                 }
                 o[this.name].push(this.value || '');
             } else {
-                o[this.name] = this.value || '';
+                if(this.value)
+                    o[this.name] = this.value;
             }
         });
         //add missing checkboxes (non checked ones)
diff --git a/public/assets/js/oauth2/profile/edit-client-tokens.js b/public/assets/js/oauth2/profile/edit-client-tokens.js
index 13ea63cf..ca01b677 100644
--- a/public/assets/js/oauth2/profile/edit-client-tokens.js
+++ b/public/assets/js/oauth2/profile/edit-client-tokens.js
@@ -1,15 +1,14 @@
-
-function updateAccessTokenList(){
+function updateAccessTokenList(page, page_size){
     //reload access tokens
     $.ajax({
             type: "GET",
-            url: TokensUrls.AccessTokenUrls.get ,
+            url: TokensUrls.AccessTokenUrls.get +'?offset='+page+'&limit='+page_size,
             dataType: "json",
             timeout:60000,
             success: function (data,textStatus,jqXHR) {
                 //load data...
 
-                if(data.access_tokens.length===0){
+                if(data.items.length === 0){
                     $('#table-access-tokens').hide();
                     $('#info-access-tokens').show();
                 }
@@ -33,8 +32,13 @@ function updateAccessTokenList(){
                             }
                         }
                     };
-                    var html = template.render(data.access_tokens, directives);
+                    var html = template.render(data.items, directives);
                     $('#body-access-tokens').html(html.html());
+                    var pages_html = '';
+                    for(var i = 0 ; i <  data.pages ; i++){
+                        pages_html += "<li><a class='access_token_page' href='#' data-page-nbr='"+(i+1)+"'>"+(i+1)+"</a></li>";
+                    }
+                    $('#access_token_paginator').html(pages_html)
                 }
             },
             error: function (jqXHR, textStatus, errorThrown) {
@@ -43,17 +47,17 @@ function updateAccessTokenList(){
     });
 }
 
-function updateRefreshTokenList(){
+function updateRefreshTokenList(page, page_size){
     //reload access tokens
     $.ajax({
             type: "GET",
-            url: TokensUrls.RefreshTokenUrl.get,
+            url: TokensUrls.RefreshTokenUrl.get+'?offset='+page+'&limit='+page_size,
             dataType: "json",
             timeout:60000,
             success: function (data,textStatus,jqXHR) {
                 //load data...
 
-                if(data.refresh_tokens.length===0){
+                if(data.items.length===0){
                     $('#table-refresh-tokens').hide();
                     $('#info-refresh-tokens').show();
                 }
@@ -80,8 +84,12 @@ function updateRefreshTokenList(){
                             }
                         }
                     };
-                    var html = template.render(data.refresh_tokens, directives);
+                    var html = template.render(data.items, directives);
                     $('#body-refresh-tokens').html(html.html());
+                    for(var i = 0 ; i <  data.pages ; i++){
+                        pages_html += "<li><a class='refresh_token_page' href='#' data-page-nbr='"+(i+1)+"'>"+(i+1)+"</a></li>";
+                    }
+                    $('#refresh_token_paginator').html(pages_html)
                     updateAccessTokenList();
                 }
             },
@@ -93,7 +101,9 @@ function updateRefreshTokenList(){
 
 jQuery(document).ready(function($){
 
-    if($('#table-access-tokens tr').length===1){
+    var pageSize = 25;
+
+    if($('#table-access-tokens tr').length == 1){
         $('#info-access-tokens').show();
         $('#table-access-tokens').hide();
     }
@@ -102,7 +112,7 @@ jQuery(document).ready(function($){
         $('#table-access-tokens').show();
     }
 
-    if($('#table-refresh-tokens tr').length===1){
+    if($('#table-refresh-tokens tr').length == 1){
         $('#info-refresh-tokens').show();
         $('#table-refresh-tokens').hide();
     }
@@ -111,18 +121,36 @@ jQuery(document).ready(function($){
         $('#table-refresh-tokens').show();
     }
 
-    $("body").on('click','.refresh-refresh-tokens',function(event){
-        updateRefreshTokenList();
+    $("body").on('click','.refresh-access-tokens',function(event){
+        updateAccessTokenList(1, pageSize);
         event.preventDefault();
         return false;
     });
 
     $("body").on('click','.refresh-access-tokens',function(event){
-        updateAccessTokenList();
+        updateRefreshTokenList(1, pageSize);
         event.preventDefault();
         return false;
     });
 
+    $("body").on("click",".access_token_page", function(event){
+        event.preventDefault();
+        var page = $(this).data('page-nbr');
+
+        updateAccessTokenList(page, pageSize);
+
+        return false;
+    });
+
+    $("body").on("click",".refresh_token_page", function(event){
+        event.preventDefault();
+        var page = $(this).data('page-nbr');
+
+        updateRefreshTokenList(page, pageSize);
+
+        return false;
+    });
+
     $("body").on('click',".revoke-token",function(event){
 
         var link        = $(this);
diff --git a/public/assets/js/oauth2/profile/edit-user-grants.js b/public/assets/js/oauth2/profile/edit-user-grants.js
index 2053a72f..75899d9e 100644
--- a/public/assets/js/oauth2/profile/edit-user-grants.js
+++ b/public/assets/js/oauth2/profile/edit-user-grants.js
@@ -1,5 +1,108 @@
+function updateAccessTokenList(page, page_size){
+    //reload access tokens
+    $.ajax({
+        type: "GET",
+        url: TokensUrls.AccessTokenUrls.get +'?offset='+page+'&limit='+page_size,
+        dataType: "json",
+        timeout:60000,
+        success: function (data,textStatus,jqXHR) {
+            //load data...
+
+            if(data.items.length === 0){
+                $('#table-access-tokens').hide();
+                $('#info-access-tokens').show();
+            }
+            else{
+                $('#info-access-tokens').hide();
+                $('#table-access-tokens').show();
+                var template   = $('<tbody><tr><td class="issued"></td><td class="scope"></td><td class="lifetime"></td><td><a title="Revoke Access Token" class="btn btn-default btn-md active btn-delete revoke-token revoke-access-token" data-hint="access-token">Revoke</a></td></tr></tbody>');
+                var directives = {
+                    'tr':{
+                        'token<-context':{
+                            '@id'        :'token.value',
+                            'td.issued'  :'token.issued',
+                            'td.scope'   :'token.scope',
+                            'td.lifetime':'token.lifetime',
+                            'a@href':function(arg){
+                                var token_value = arg.item.value;
+                                var href = TokensUrls.AccessTokenUrls.delete;
+                                return href.replace('-1',token_value);
+                            },
+                            'a@data-value' :'token.value'
+                        }
+                    }
+                };
+                var html = template.render(data.items, directives);
+                $('#body-access-tokens').html(html.html());
+                var pages_html = '';
+                for(var i = 0 ; i <  data.pages ; i++){
+                    pages_html += "<li><a class='access_token_page' href='#' data-page-nbr='"+(i+1)+"'>"+(i+1)+"</a></li>";
+                }
+                $('#access_token_paginator').html(pages_html)
+            }
+        },
+        error: function (jqXHR, textStatus, errorThrown) {
+            ajaxError(jqXHR, textStatus, errorThrown);
+        }
+    });
+}
+
+function updateRefreshTokenList(page, page_size){
+    //reload access tokens
+    $.ajax({
+        type: "GET",
+        url: TokensUrls.RefreshTokenUrl.get+'?offset='+page+'&limit='+page_size,
+        dataType: "json",
+        timeout:60000,
+        success: function (data,textStatus,jqXHR) {
+            //load data...
+
+            if(data.items.length===0){
+                $('#table-refresh-tokens').hide();
+                $('#info-refresh-tokens').show();
+            }
+            else{
+                $('#info-refresh-tokens').hide();
+                $('#table-refresh-tokens').show();
+                var template   = $('<tbody><tr><td class="issued"></td><td class="scope"></td><td class="lifetime"></td><td><a title="Revoke Refresh Token" class="btn btn-default btn-md active btn-delete revoke-token revoke-refresh-token" data-hint="refresh-token">Revoke</a></td></tr></tbody>');
+                var directives = {
+                    'tr':{
+                        'token<-context':{
+                            '@id'        :'token.value',
+                            'td.issued'  :'token.issued',
+                            'td.scope'   :'token.scope',
+                            'td.lifetime':function(arg){
+                                var token_lifetime = arg.item.lifetime;
+                                return token_lifetime===0?'Not Expire':token_lifetime;
+                            },
+                            'a@href':function(arg){
+                                var token_value = arg.item.value;
+                                var href = TokensUrls.RefreshTokenUrl.delete;
+                                return href.replace('-1',token_value);
+                            },
+                            'a@data-value' :'token.value'
+                        }
+                    }
+                };
+                var html = template.render(data.items, directives);
+                $('#body-refresh-tokens').html(html.html());
+                for(var i = 0 ; i <  data.pages ; i++){
+                    pages_html += "<li><a class='refresh_token_page' href='#' data-page-nbr='"+(i+1)+"'>"+(i+1)+"</a></li>";
+                }
+                $('#refresh_token_paginator').html(pages_html)
+                updateAccessTokenList();
+            }
+        },
+        error: function (jqXHR, textStatus, errorThrown) {
+            ajaxError(jqXHR, textStatus, errorThrown);
+        }
+    });
+}
+
 jQuery(document).ready(function($){
 
+    var pageSize = 25;
+
     $('#oauth2-console','#main-menu').addClass('active');
 
     if($('#table-access-tokens tr').length===1){
@@ -20,14 +123,35 @@ jQuery(document).ready(function($){
         $('#table-refresh-tokens').show();
     }
 
-    $("body").on('click',".revoke-access",function(event){
-        if(confirm("Are you sure to revoke this grant?")){
-            var url   = $(this).attr('href');
-            var value = $(this).attr('data-value');
-            var hint  = $(this).attr('data-hint');
-            var body  = hint=='access_token'?'body-access-tokens':'body-refresh-tokens'
-            var table = hint=='access_token'?'table-access-tokens':'table-refresh-tokens'
-            var info  = hint=='access_token'?'info-access-tokens':'info-refresh-tokens'
+    $("body").on("click",".access_token_page", function(event){
+        event.preventDefault();
+        var page = $(this).data('page-nbr');
+
+        updateAccessTokenList(page, pageSize);
+
+        return false;
+    });
+
+    $("body").on("click",".refresh_token_page", function(event){
+        event.preventDefault();
+        var page = $(this).data('page-nbr');
+
+        updateRefreshTokenList(page, pageSize);
+
+        return false;
+    });
+
+    $("body").on('click',".revoke-token",function(event){
+
+        var link        = $(this);
+        var value       = link.attr('data-value');
+        var hint        = link.attr('data-hint');
+        var url         = link.attr('href');
+        var table_id    = hint ==='refresh-token'? 'table-refresh-tokens':'table-access-tokens';
+        var info_id     = hint ==='refresh-token'? 'info-refresh-tokens':'info-access-tokens';
+        var confirm_msg = hint ==='refresh-token'? 'Are you sure?, revoking this refresh token also will become void all related Access Tokens':'Are you sure?';
+        if(confirm(confirm_msg)){
+
             $.ajax(
                 {
                     type: "DELETE",
@@ -36,11 +160,15 @@ jQuery(document).ready(function($){
                     timeout:60000,
                     success: function (data,textStatus,jqXHR) {
                         //load data...
-                        $('#'+value,'#'+body).remove();
-
-                        if($('#'+table+' tr').length===1){
-                            $('#'+info).show();
-                            $('#'+table).hide();
+                        var row = $('#'+value);
+                        row.remove();
+                        var row_qty = $('#'+table_id+' tr').length;
+                        if(row_qty===1){ //only we have the header ...
+                            $('#'+table_id).hide();
+                            $('#'+info_id).show();
+                        }
+                        if(hint=='refresh-token'){
+                            updateAccessTokenList();
                         }
                     },
                     error: function (jqXHR, textStatus, errorThrown) {
diff --git a/public/index.php b/public/index.php
index f08822d9..c5820533 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Laravel - A PHP Framework For Web Artisans
  *
@@ -11,10 +12,10 @@
 | Register The Auto Loader
 |--------------------------------------------------------------------------
 |
-| Composer provides a convenient, automatically generated class loader
-| for our application. We just need to utilize it! We'll require it
-| into the script here so that we do not have to worry about the
-| loading of any our classes "manually". Feels great to relax.
+| Composer provides a convenient, automatically generated class loader for
+| our application. We just need to utilize it! We'll simply require it
+| into the script here so that we don't have to worry about manual
+| loading any of our classes later on. It feels nice to relax.
 |
 */
 
@@ -25,25 +26,33 @@ require __DIR__.'/../bootstrap/autoload.php';
 | Turn On The Lights
 |--------------------------------------------------------------------------
 |
-| We need to illuminate PHP development, so let's turn on the lights.
+| We need to illuminate PHP development, so let us turn on the lights.
 | This bootstraps the framework and gets it ready for use, then it
 | will load up this application so that we can run it and send
-| the responses back to the browser and delight these users.
+| the responses back to the browser and delight our users.
 |
 */
 
-$app = require_once __DIR__.'/../bootstrap/start.php';
+$app = require_once __DIR__.'/../bootstrap/app.php';
 
 /*
 |--------------------------------------------------------------------------
 | Run The Application
 |--------------------------------------------------------------------------
 |
-| Once we have the application, we can simply call the run method,
-| which will execute the request and send the response back to
+| Once we have the application, we can handle the incoming request
+| through the kernel, and send the associated response back to
 | the client's browser allowing them to enjoy the creative
-| and wonderful application we have whipped up for them.
+| and wonderful application we have prepared for them.
 |
 */
 
-$app->run();
+$kernel = $app->make(Illuminate\Contracts\Http\Kernel::class);
+
+$response = $kernel->handle(
+    $request = Illuminate\Http\Request::capture()
+);
+
+$response->send();
+
+$kernel->terminate($request, $response);
diff --git a/public/packages/.gitkeep b/public/packages/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/public/robots.txt b/public/robots.txt
index 9e60f970..eb053628 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1,2 +1,2 @@
 User-agent: *
-Disallow: 
+Disallow:
diff --git a/public/web.config b/public/web.config
new file mode 100644
index 00000000..624c1760
--- /dev/null
+++ b/public/web.config
@@ -0,0 +1,23 @@
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="Imported Rule 1" stopProcessing="true">
+          <match url="^(.*)/$" ignoreCase="false" />
+          <conditions>
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" negate="true" />
+          </conditions>
+          <action type="Redirect" redirectType="Permanent" url="/{R:1}" />
+        </rule>
+        <rule name="Imported Rule 2" stopProcessing="true">
+          <match url="^" ignoreCase="false" />
+          <conditions>
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" ignoreCase="false" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="index.php" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>
diff --git a/readme.md b/readme.md
index 0da1bb02..317e7646 100644
--- a/readme.md
+++ b/readme.md
@@ -13,6 +13,7 @@ run following commands on root folder
    * curl -s https://getcomposer.org/installer | php
    * php composer.phar install --prefer-dist
    * php composer.phar dump-autoload --optimize
+   * php artisan vendor:publish --provider="Greggilbert\Recaptcha\RecaptchaServiceProvider"
    * php artisan migrate --env=YOUR_ENVIRONMENT
    * php artisan db:seed --env=YOUR_ENVIRONMENT
    * phpunit --bootstrap vendor/autoload.php
diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
new file mode 100644
index 00000000..e5506df2
--- /dev/null
+++ b/resources/lang/en/auth.php
@@ -0,0 +1,19 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during authentication for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+    'failed' => 'These credentials do not match our records.',
+    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+
+];
diff --git a/app/lang/en/messages.php b/resources/lang/en/messages.php
similarity index 100%
rename from app/lang/en/messages.php
rename to resources/lang/en/messages.php
diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php
new file mode 100644
index 00000000..fcab34b2
--- /dev/null
+++ b/resources/lang/en/pagination.php
@@ -0,0 +1,19 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used by the paginator library to build
+    | the simple pagination links. You are free to change them to anything
+    | you want to customize your views to better match your application.
+    |
+    */
+
+    'previous' => '&laquo; Previous',
+    'next'     => 'Next &raquo;',
+
+];
diff --git a/app/lang/en/reminders.php b/resources/lang/en/passwords.php
similarity index 53%
rename from app/lang/en/reminders.php
rename to resources/lang/en/passwords.php
index b35b56e9..e5544d20 100644
--- a/app/lang/en/reminders.php
+++ b/resources/lang/en/passwords.php
@@ -1,10 +1,10 @@
 <?php
 
-return array(
+return [
 
     /*
     |--------------------------------------------------------------------------
-    | Password Reminder Language Lines
+    | Password Reset Language Lines
     |--------------------------------------------------------------------------
     |
     | The following language lines are the default lines which match reasons
@@ -13,12 +13,10 @@ return array(
     |
     */
 
-    "password" => "Passwords must be at least six characters and match the confirmation.",
+    'password' => 'Passwords must be at least six characters and match the confirmation.',
+    'reset' => 'Your password has been reset!',
+    'sent' => 'We have e-mailed your password reset link!',
+    'token' => 'This password reset token is invalid.',
+    'user' => "We can't find a user with that e-mail address.",
 
-    "user" => "We can't find a user with that e-mail address.",
-
-    "token" => "This password reset token is invalid.",
-
-    "sent" => "Password reminder sent!",
-
-);
+];
diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
new file mode 100644
index 00000000..b1e61204
--- /dev/null
+++ b/resources/lang/en/validation.php
@@ -0,0 +1,113 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | as the size rules. Feel free to tweak each of these messages here.
+    |
+    */
+
+    'accepted'             => 'The :attribute must be accepted.',
+    'active_url'           => 'The :attribute is not a valid URL.',
+    'after'                => 'The :attribute must be a date after :date.',
+    'alpha'                => 'The :attribute may only contain letters.',
+    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
+    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
+    'array'                => 'The :attribute must be an array.',
+    'before'               => 'The :attribute must be a date before :date.',
+    'between'              => [
+        'numeric' => 'The :attribute must be between :min and :max.',
+        'file'    => 'The :attribute must be between :min and :max kilobytes.',
+        'string'  => 'The :attribute must be between :min and :max characters.',
+        'array'   => 'The :attribute must have between :min and :max items.',
+    ],
+    'boolean'              => 'The :attribute field must be true or false.',
+    'confirmed'            => 'The :attribute confirmation does not match.',
+    'date'                 => 'The :attribute is not a valid date.',
+    'date_format'          => 'The :attribute does not match the format :format.',
+    'different'            => 'The :attribute and :other must be different.',
+    'digits'               => 'The :attribute must be :digits digits.',
+    'digits_between'       => 'The :attribute must be between :min and :max digits.',
+    'distinct'             => 'The :attribute field has a duplicate value.',
+    'email'                => 'The :attribute must be a valid email address.',
+    'exists'               => 'The selected :attribute is invalid.',
+    'filled'               => 'The :attribute field is required.',
+    'image'                => 'The :attribute must be an image.',
+    'in'                   => 'The selected :attribute is invalid.',
+    'in_array'             => 'The :attribute field does not exist in :other.',
+    'integer'              => 'The :attribute must be an integer.',
+    'ip'                   => 'The :attribute must be a valid IP address.',
+    'json'                 => 'The :attribute must be a valid JSON string.',
+    'max'                  => [
+        'numeric' => 'The :attribute may not be greater than :max.',
+        'file'    => 'The :attribute may not be greater than :max kilobytes.',
+        'string'  => 'The :attribute may not be greater than :max characters.',
+        'array'   => 'The :attribute may not have more than :max items.',
+    ],
+    'mimes'                => 'The :attribute must be a file of type: :values.',
+    'min'                  => [
+        'numeric' => 'The :attribute must be at least :min.',
+        'file'    => 'The :attribute must be at least :min kilobytes.',
+        'string'  => 'The :attribute must be at least :min characters.',
+        'array'   => 'The :attribute must have at least :min items.',
+    ],
+    'not_in'               => 'The selected :attribute is invalid.',
+    'numeric'              => 'The :attribute must be a number.',
+    'present'              => 'The :attribute field must be present.',
+    'regex'                => 'The :attribute format is invalid.',
+    'required'             => 'The :attribute field is required.',
+    'required_if'          => 'The :attribute field is required when :other is :value.',
+    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
+    'required_with'        => 'The :attribute field is required when :values is present.',
+    'required_with_all'    => 'The :attribute field is required when :values is present.',
+    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'required_without_all' => 'The :attribute field is required when none of :values are present.',
+    'same'                 => 'The :attribute and :other must match.',
+    'size'                 => [
+        'numeric' => 'The :attribute must be :size.',
+        'file'    => 'The :attribute must be :size kilobytes.',
+        'string'  => 'The :attribute must be :size characters.',
+        'array'   => 'The :attribute must contain :size items.',
+    ],
+    'string'               => 'The :attribute must be a string.',
+    'timezone'             => 'The :attribute must be a valid zone.',
+    'unique'               => 'The :attribute has already been taken.',
+    'url'                  => 'The :attribute format is invalid.',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => [
+        'attribute-name' => [
+            'rule-name' => 'custom-message',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => [],
+
+];
diff --git a/app/views/admin/banned-ips.blade.php b/resources/views/admin/banned-ips.blade.php
similarity index 67%
rename from app/views/admin/banned-ips.blade.php
rename to resources/views/admin/banned-ips.blade.php
index e72085d9..a9f9935e 100644
--- a/app/views/admin/banned-ips.blade.php
+++ b/resources/views/admin/banned-ips.blade.php
@@ -23,20 +23,20 @@
             </thead>
             <tbody id="body-ips">
             @foreach($ips as $ip)
-            <tr id="{{$ip->id}}">
-                <td>{{$ip->ip}}</td>
-                <td>{{$ip->created_at}}</td>
-                <td>{{$ip->hits}}</td>
-                <td>{{$ip->exception_type}}</td>
+            <tr id="{!!$ip->id!!}">
+                <td>{!!$ip->ip!!}</td>
+                <td>{!!$ip->created_at!!}</td>
+                <td>{!!$ip->hits!!}</td>
+                <td>{!!$ip->exception_type!!}</td>
                 <td>
                     @if(!is_null($ip->user()->first()))
-                    {{ $ip->user()->first()->getEmail() }}
+                    {!! $ip->user()->first()->getEmail() !!}
                     @else
                     N\A
                     @endif
                 </td>
                 <td>
-                    {{ HTML::link(URL::action("ApiBannedIPController@delete",array("id"=>$ip->id)),'Revoke',array('data-ip-id'=>$ip->id,'class'=>'btn btn-default btn-md active revoke-ip','title'=>'Revoke given banned ip address')) }}
+                    {!! HTML::link(URL::action("Api\\ApiBannedIPController@delete",array("id"=>$ip->id)),'Revoke',array('data-ip-id'=>$ip->id,'class'=>'btn btn-default btn-md active revoke-ip','title'=>'Revoke given banned ip address')) !!}
                 </td>
             </tr>
             @endforeach
@@ -48,5 +48,5 @@
 @stop
 
 @section('scripts')
-{{ HTML::script('assets/js/admin/banned-ips.js') }}
+{!! HTML::script('assets/js/admin/banned-ips.js') !!}
 @append
diff --git a/app/views/admin/server-config.blade.php b/resources/views/admin/server-config.blade.php
similarity index 82%
rename from app/views/admin/server-config.blade.php
rename to resources/views/admin/server-config.blade.php
index b8439dbd..a7157d0c 100644
--- a/app/views/admin/server-config.blade.php
+++ b/resources/views/admin/server-config.blade.php
@@ -12,74 +12,74 @@
             <legend>General Configuration</legend>
             <div class="form-group">
                 <label for="general-max-failed-login-attempts">MaximunFailed Login Attempts&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="in seconds"></span></label>
-                <input class="form-control" type="number" min="5" step="1" id="general-max-failed-login-attempts" name="general-max-failed-login-attempts" value="{{$config_values['MaxFailed.Login.Attempts']}}"/>
+                <input class="form-control" type="number" min="5" step="1" id="general-max-failed-login-attempts" name="general-max-failed-login-attempts" value="{!!$config_values['MaxFailed.Login.Attempts']!!}"/>
             </div>
             <div class="form-group">
                 <label for="general-max-failed-login-attempts-captcha">MaximunFailed Login Attempts To Show Captcha&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="in seconds"></span></label>
-                <input class="form-control" type="number" min="3" step="1" id="general-max-failed-login-attempts-captcha" name="general-max-failed-login-attempts-captcha" value="{{$config_values['MaxFailed.LoginAttempts.2ShowCaptcha']}}"/>
+                <input class="form-control" type="number" min="3" step="1" id="general-max-failed-login-attempts-captcha" name="general-max-failed-login-attempts-captcha" value="{!!$config_values['MaxFailed.LoginAttempts.2ShowCaptcha']!!}"/>
             </div>
             <legend>OPENID Configuration</legend>
             <div class="form-group">
                 <label for="openid-private-association-lifetime">Private Association Lifetime&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="in seconds"></span></label>
-                <input class="form-control" type="number" min="240" max="512" step="1" id="openid-private-association-lifetime" name="openid-private-association-lifetime" value="{{$config_values['OpenId.Private.Association.Lifetime']}}"/>
+                <input class="form-control" type="number" min="240" max="512" step="1" id="openid-private-association-lifetime" name="openid-private-association-lifetime" value="{!!$config_values['OpenId.Private.Association.Lifetime']!!}"/>
             </div>
             <div class="form-group">
                 <label for="openid-session-association-lifetime">Session Association Lifetime&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="in seconds"></span></label>
-                <input class="form-control" type="number" min="21600" step="1"  id="openid-session-association-lifetime" name="openid-session-association-lifetime" value="{{$config_values['OpenId.Session.Association.Lifetime']}}"/>
+                <input class="form-control" type="number" min="21600" step="1"  id="openid-session-association-lifetime" name="openid-session-association-lifetime" value="{!!$config_values['OpenId.Session.Association.Lifetime']!!}"/>
             </div>
             <div class="form-group">
                 <label for="openid-nonce-lifetime">Nonce Lifetime&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="in seconds"></span></label>
-                <input class="form-control" type="number" min="360" max="512" step="1"  id="openid-nonce-lifetime" name="openid-nonce-lifetime" value="{{$config_values['OpenId.Nonce.Lifetime']}}"/>
+                <input class="form-control" type="number" min="360" max="512" step="1"  id="openid-nonce-lifetime" name="openid-nonce-lifetime" value="{!!$config_values['OpenId.Nonce.Lifetime']!!}"/>
             </div>
             <legend>OAUTH2 Configuration</legend>
             <div class="form-group">
                 <label for="oauth2-auth-code-lifetime">Authorization Code Lifetime&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="in seconds"></span></label>
-                <input class="form-control" type="number" min="60" max="600" step="1" id="oauth2-auth-code-lifetime" name="oauth2-auth-code-lifetime" value="{{$config_values['OAuth2.AuthorizationCode.Lifetime']}}"/>
+                <input class="form-control" type="number" min="60" max="600" step="1" id="oauth2-auth-code-lifetime" name="oauth2-auth-code-lifetime" value="{!!$config_values['OAuth2.AuthorizationCode.Lifetime']!!}"/>
             </div>
             <div class="form-group">
                 <label for="oauth2-access-token-lifetime">Access Token Lifetime&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="in seconds"></span></label>
-                <input class="form-control" type="number" min="60" step="1" id="oauth2-access-token-lifetime" name="oauth2-access-token-lifetime" value="{{$config_values['OAuth2.AccessToken.Lifetime']}}"/>
+                <input class="form-control" type="number" min="60" step="1" id="oauth2-access-token-lifetime" name="oauth2-access-token-lifetime" value="{!!$config_values['OAuth2.AccessToken.Lifetime']!!}"/>
             </div>
             <div class="form-group">
                 <label for="oauth2-id-token-lifetime">Id Token Lifetime&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="in seconds"></span></label>
-                <input class="form-control" type="number" min="60" step="1" id="oauth2-id-token-lifetime" name="oauth2-id-token-lifetime" value="{{$config_values['OAuth2.IdToken.Lifetime']}}"/>
+                <input class="form-control" type="number" min="60" step="1" id="oauth2-id-token-lifetime" name="oauth2-id-token-lifetime" value="{!!$config_values['OAuth2.IdToken.Lifetime']!!}"/>
             </div>
             <div class="form-group">
                 <label for="oauth2-refresh-token-lifetime">Refresh Token Lifetime&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="in seconds - zero value means infinite"></span></label>
-                <input class="form-control" type="number" min="0" step="1" id="oauth2-refresh-token-lifetime" name="oauth2-refresh-token-lifetime" value="{{$config_values['OAuth2.RefreshToken.Lifetime']}}"/>
+                <input class="form-control" type="number" min="0" step="1" id="oauth2-refresh-token-lifetime" name="oauth2-refresh-token-lifetime" value="{!!$config_values['OAuth2.RefreshToken.Lifetime']!!}"/>
             </div>
             <div class="form-group">
                 <label for="oauth2-id-access-token-revoked-lifetime">Revoked Access Token Lifetime&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="in seconds"></span></label>
-                <input class="form-control" type="number" min="600" step="1" id="oauth2-id-access-token-revoked-lifetime" name="oauth2-id-access-token-revoked-lifetime" value="{{$config_values['OAuth2.AccessToken.Revoked.Lifetime']}}"/>
+                <input class="form-control" type="number" min="600" step="1" id="oauth2-id-access-token-revoked-lifetime" name="oauth2-id-access-token-revoked-lifetime" value="{!!$config_values['OAuth2.AccessToken.Revoked.Lifetime']!!}"/>
             </div>
             <div class="form-group">
                 <label for="oauth2-id-access-token-void-lifetime">Void Access Token Lifetime&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="in seconds"></span></label>
-                <input class="form-control" type="number" min="600" step="1" id="oauth2-id-access-token-void-lifetime" name="oauth2-id-access-token-void-lifetime" value="{{$config_values['OAuth2.AccessToken.Void.Lifetime']}}"/>
+                <input class="form-control" type="number" min="600" step="1" id="oauth2-id-access-token-void-lifetime" name="oauth2-id-access-token-void-lifetime" value="{!!$config_values['OAuth2.AccessToken.Void.Lifetime']!!}"/>
             </div>
             <div class="form-group">
                 <label for="oauth2-id-refresh-token-revoked-lifetime">Revoked Refresh Token Lifetime&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="in seconds"></span></label>
-                <input class="form-control" type="number" min="600" step="1" id="oauth2-id-refresh-token-revoked-lifetime" name="oauth2-id-refresh-token-revoked-lifetime" value="{{$config_values['OAuth2.RefreshToken.Revoked.Lifetime']}}"/>
+                <input class="form-control" type="number" min="600" step="1" id="oauth2-id-refresh-token-revoked-lifetime" name="oauth2-id-refresh-token-revoked-lifetime" value="{!!$config_values['OAuth2.RefreshToken.Revoked.Lifetime']!!}"/>
             </div>
             <legend>OAUTH2 Security Policies Configuration</legend>
             <div class="form-group">
                 <label for="oauth2-id-security-policy-minutes-without-exceptions">Minutes without exceptions rate&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="in minutes"></span></label>
-                <input class="form-control" type="number" min="1" step="1" id="oauth2-id-security-policy-minutes-without-exceptions" name="oauth2-id-security-policy-minutes-without-exceptions" value="{{$config_values['OAuth2SecurityPolicy.MinutesWithoutExceptions']}}"/>
+                <input class="form-control" type="number" min="1" step="1" id="oauth2-id-security-policy-minutes-without-exceptions" name="oauth2-id-security-policy-minutes-without-exceptions" value="{!!$config_values['OAuth2SecurityPolicy.MinutesWithoutExceptions']!!}"/>
             </div>
             <div class="form-group">
                 <label for="oauth2-id-security-policy-max-bearer-token-disclosure-attempts">Max. Bearer token disclousure exceptions attemps&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="in attemps"></span></label>
-                <input class="form-control" type="number" min="3" step="1" id="oauth2-id-security-policy-max-bearer-token-disclosure-attempts" name="oauth2-id-security-policy-max-bearer-token-disclosure-attempts" value="{{$config_values['OAuth2SecurityPolicy.MaxBearerTokenDisclosureAttempts']}}"/>
+                <input class="form-control" type="number" min="3" step="1" id="oauth2-id-security-policy-max-bearer-token-disclosure-attempts" name="oauth2-id-security-policy-max-bearer-token-disclosure-attempts" value="{!!$config_values['OAuth2SecurityPolicy.MaxBearerTokenDisclosureAttempts']!!}"/>
             </div>
             <div class="form-group">
                 <label for="oauth2-id-security-policy-max-invalid-client-exception-attempts">Max. invalid client exception attemps&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="in attemps"></span></label>
-                <input class="form-control" type="number" min="3" step="1" id="oauth2-id-security-policy-max-invalid-client-exception-attempts" name="oauth2-id-security-policy-max-invalid-client-exception-attempts" value="{{$config_values['OAuth2SecurityPolicy.MaxInvalidClientExceptionAttempts']}}"/>
+                <input class="form-control" type="number" min="3" step="1" id="oauth2-id-security-policy-max-invalid-client-exception-attempts" name="oauth2-id-security-policy-max-invalid-client-exception-attempts" value="{!!$config_values['OAuth2SecurityPolicy.MaxInvalidClientExceptionAttempts']!!}"/>
             </div>
             <div class="form-group">
                 <label for="oauth2-id-security-policy-max-invalid-redeem-auth-code-attempts">Max. invalid redeem Auth Code exception attemps&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="in attemps"></span></label>
-                <input class="form-control" type="number" min="3" step="1" id="oauth2-id-security-policy-max-invalid-redeem-auth-code-attempts" name="oauth2-id-security-policy-max-invalid-redeem-auth-code-attempts" value="{{$config_values['OAuth2SecurityPolicy.MaxInvalidRedeemAuthCodeAttempts']}}"/>
+                <input class="form-control" type="number" min="3" step="1" id="oauth2-id-security-policy-max-invalid-redeem-auth-code-attempts" name="oauth2-id-security-policy-max-invalid-redeem-auth-code-attempts" value="{!!$config_values['OAuth2SecurityPolicy.MaxInvalidRedeemAuthCodeAttempts']!!}"/>
             </div>
             <div class="form-group">
                 <label for="oauth2-id-security-policy-max-invalid-client-credentials-attempts">Max. invalid client credentials exception attemps&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="in attemps"></span></label>
-                <input class="form-control" type="number" min="3" step="1" id="oauth2-id-security-policy-max-invalid-client-credentials-attempts" name="oauth2-id-security-policy-max-invalid-client-credentials-attempts" value="{{$config_values['OAuth2SecurityPolicy.MaxInvalidClientCredentialsAttempts']}}"/>
+                <input class="form-control" type="number" min="3" step="1" id="oauth2-id-security-policy-max-invalid-client-credentials-attempts" name="oauth2-id-security-policy-max-invalid-client-credentials-attempts" value="{!!$config_values['OAuth2SecurityPolicy.MaxInvalidClientCredentialsAttempts']!!}"/>
             </div>
 
             <button type="submit" class="btn btn-default btn-md active">Submit</button>
@@ -90,12 +90,12 @@
 @foreach($errors->all() as $message)
 <div class="alert alert-danger alert-dismissible" role="alert">
     <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-    {{ $message }}
+    {!! $message !!}
 </div>
 @endforeach
 
 @stop
 
 @section('scripts')
-{{ HTML::script('assets/js/admin/server-config.js') }}
+{!! HTML::script('assets/js/admin/server-config.js') !!}
 @append
\ No newline at end of file
diff --git a/app/views/admin/users.blade.php b/resources/views/admin/users.blade.php
similarity index 72%
rename from app/views/admin/users.blade.php
rename to resources/views/admin/users.blade.php
index 4182ffd5..57419ae0 100644
--- a/app/views/admin/users.blade.php
+++ b/resources/views/admin/users.blade.php
@@ -19,19 +19,19 @@
             </thead>
             <tbody id="body-locked-users">
             @foreach($users as $user)
-            <tr id="{{$user->id}}">
+            <tr id="{!!$user->id!!}">
                 <td>
                     <div style="min-width: 400px">
-                        {{ $user->getFullName() }}
+                        {!! $user->getFullName() !!}
                     </div>
                 </td>
                 <td>
                     <div style="min-width: 100px">
-                        {{ $user->getEmail() }}
+                        {!! $user->getEmail() !!}
                     </div>
                 </td>
                 <td>
-                    {{ HTML::link(URL::action("UserApiController@unlock", array("id"=>$user->id)),'Unlock',array('data-user-id'=>$user->id,'class'=>'btn btn-default btn-md active  unlock-user','title'=>'Unlocks given user')) }}
+                    {!! HTML::link(URL::action("Api\UserApiController@unlock", array("id"=>$user->id)),'Unlock',array('data-user-id'=>$user->id,'class'=>'btn btn-default btn-md active  unlock-user','title'=>'Unlocks given user')) !!}
                 </td>
             </tr>
             @endforeach
@@ -42,5 +42,5 @@
 </div>
 @stop
 @section('scripts')
-{{ HTML::script('assets/js/admin/users.js') }}
+{!! HTML::script('assets/js/admin/users.js') !!}
 @append
\ No newline at end of file
diff --git a/app/views/emails/auth/reminder.blade.php b/resources/views/emails/auth/reminder.blade.php
similarity index 57%
rename from app/views/emails/auth/reminder.blade.php
rename to resources/views/emails/auth/reminder.blade.php
index 2976327b..037ccb5d 100644
--- a/app/views/emails/auth/reminder.blade.php
+++ b/resources/views/emails/auth/reminder.blade.php
@@ -7,7 +7,7 @@
 		<h2>Password Reset</h2>
 
 		<div>
-			To reset your password, complete this form: {{ URL::to('password/reset', array($token)) }}.
+			To reset your password, complete this form: {!! URL::to('password/reset', array($token)) !!}.
 		</div>
 	</body>
 </html>
\ No newline at end of file
diff --git a/resources/views/emails/auth/user_locked.blade.php b/resources/views/emails/auth/user_locked.blade.php
new file mode 100644
index 00000000..c9a07202
--- /dev/null
+++ b/resources/views/emails/auth/user_locked.blade.php
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+    <meta charset="utf-8">
+</head>
+<body>
+<p>Dear {!!$user_name!!}, your user got blocked after {!!$attempts!!} failed login attempts.</p>
+<p>Please send an email to {!!$support_email!!} in order to reactive it again.</p>
+<p>Cheers,<br/>OpenStack Support Team</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/app/views/error.blade.php b/resources/views/error.blade.php
similarity index 73%
rename from app/views/error.blade.php
rename to resources/views/error.blade.php
index 9a5762ba..5fe8e50e 100644
--- a/app/views/error.blade.php
+++ b/resources/views/error.blade.php
@@ -1,6 +1,6 @@
 @extends('layout')
 @section('content')
     <div class="error-msg">
-        {{{ $error }}}
+        {!! $error !!}
     </div>
 @stop
\ No newline at end of file
diff --git a/app/views/400.blade.php b/resources/views/errors/400.blade.php
similarity index 72%
rename from app/views/400.blade.php
rename to resources/views/errors/400.blade.php
index c8177121..e6d3452e 100644
--- a/app/views/400.blade.php
+++ b/resources/views/errors/400.blade.php
@@ -6,10 +6,10 @@
             400. That’s an error.
         </p>
         <p>
-            <b>{{ $error_code }}</b>
+            <b>{!! $error_code !!}</b>
         </p>
         <p>
-            {{ $error_description }}
+            {!! $error_description !!}
         </p>
     </div>
 @stop
\ No newline at end of file
diff --git a/app/views/404.blade.php b/resources/views/errors/404.blade.php
similarity index 100%
rename from app/views/404.blade.php
rename to resources/views/errors/404.blade.php
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php
new file mode 100644
index 00000000..669dcb80
--- /dev/null
+++ b/resources/views/errors/503.blade.php
@@ -0,0 +1,41 @@
+<html>
+	<head>
+		<link href='//fonts.googleapis.com/css?family=Lato:100' rel='stylesheet' type='text/css'>
+
+		<style>
+			body {
+				margin: 0;
+				padding: 0;
+				width: 100%;
+				height: 100%;
+				color: #B0BEC5;
+				display: table;
+				font-weight: 100;
+				font-family: 'Lato';
+			}
+
+			.container {
+				text-align: center;
+				display: table-cell;
+				vertical-align: middle;
+			}
+
+			.content {
+				text-align: center;
+				display: inline-block;
+			}
+
+			.title {
+				font-size: 72px;
+				margin-bottom: 40px;
+			}
+		</style>
+	</head>
+	<body>
+		<div class="container">
+			<div class="content">
+				<div class="title">Be right back.</div>
+			</div>
+		</div>
+	</body>
+</html>
diff --git a/app/views/extensions/ax.blade.php b/resources/views/extensions/ax.blade.php
similarity index 62%
rename from app/views/extensions/ax.blade.php
rename to resources/views/extensions/ax.blade.php
index 06b13c61..5e40c73e 100644
--- a/app/views/extensions/ax.blade.php
+++ b/resources/views/extensions/ax.blade.php
@@ -4,7 +4,7 @@
     </label>
     <ul class="unstyled list-inline">
     @foreach ($attributes as $attr)
-        <li>{{$attr}}&nbsp;<span class="glyphicon glyphicon-info-sign pointable" aria-hidden="true" title=""></span></li>
+        <li>{!!$attr!!}&nbsp;<span class="glyphicon glyphicon-info-sign pointable" aria-hidden="true" title=""></span></li>
     @endforeach
     </ul>
 @endif
\ No newline at end of file
diff --git a/app/views/extensions/oauth2.blade.php b/resources/views/extensions/oauth2.blade.php
similarity index 65%
rename from app/views/extensions/oauth2.blade.php
rename to resources/views/extensions/oauth2.blade.php
index 5bbe4fee..7fc2bcf2 100644
--- a/app/views/extensions/oauth2.blade.php
+++ b/resources/views/extensions/oauth2.blade.php
@@ -7,20 +7,20 @@
         <div class="col-md-6">
             <div class="row">
                 <div class="col-md-2">
-                    <img src="{{$app_logo}}" border="0"/>
+                    <img src="{!!$app_logo!!}" border="0"/>
                 </div>
                 <div class="col-md-10">
-                    <h2>{{$app_name}}&nbsp;<span class="glyphicon glyphicon-info-sign pointable" aria-hidden="true" data-content="Developer Email: <a href='mailto:{{$dev_info_email}}'>{{$dev_info_email}}</a>.<br> Clicking 'Accept' will redirect you to: <a href='{{$website}}' target='_blank'>{{$website}}</a>" title="Developer Info"></span></h2>
+                    <h2>{!!$app_name!!}&nbsp;<span class="glyphicon glyphicon-info-sign pointable" aria-hidden="true" data-content="Developer Email: <a href='mailto:{!!$dev_info_email!!}'>{!!$dev_info_email!!}</a>.<br> Clicking 'Accept' will redirect you to: <a href='{!!$website!!}' target='_blank'>{!!$website!!}</a>" title="Developer Info"></span></h2>
                 </div>
             </div>
             <legend>This app would like to:</legend>
             <ul class="unstyled list-inline">
                 @foreach ($requested_scopes as $scope)
-                <li> {{$scope->short_description}}&nbsp;<span class="glyphicon glyphicon-info-sign pointable" aria-hidden="true" data-content="{{$scope->description}}" title="Scope Info"></span></li>
+                <li> {!!$scope->short_description!!}&nbsp;<span class="glyphicon glyphicon-info-sign pointable" aria-hidden="true" data-content="{!!$scope->description!!}" title="Scope Info"></span></li>
                 @endforeach
             </ul>
             <p class="privacy-policy">
-                ** <b>{{$app_name}}</b> Application and <b>Openstack</b> will use this information in accordance with their respective terms of service and privacy policies.
+                ** <b>{!!$app_name!!}</b> Application and <b>Openstack</b> will use this information in accordance with their respective terms of service and privacy policies.
             </p>
         </div>
     </div>
diff --git a/app/views/extensions/pape.blade.php b/resources/views/extensions/pape.blade.php
similarity index 50%
rename from app/views/extensions/pape.blade.php
rename to resources/views/extensions/pape.blade.php
index 7dabe852..2fc754b3 100644
--- a/app/views/extensions/pape.blade.php
+++ b/resources/views/extensions/pape.blade.php
@@ -1,4 +1,4 @@
 <p>PAPE</p>
 @foreach ($links as $link)
-<a href="#">{{$link}}</a>
+<a href="#">{!!$link!!}</a>
 @endforeach
\ No newline at end of file
diff --git a/app/views/extensions/sreg.blade.php b/resources/views/extensions/sreg.blade.php
similarity index 52%
rename from app/views/extensions/sreg.blade.php
rename to resources/views/extensions/sreg.blade.php
index 13ef06c9..27432b4a 100644
--- a/app/views/extensions/sreg.blade.php
+++ b/resources/views/extensions/sreg.blade.php
@@ -4,10 +4,10 @@
 </label>
 <ul class="unstyled list-inline">
     @foreach ($attributes as $attr)
-    <li>{{$attr}}&nbsp;<span class="glyphicon glyphicon-info-sign pointable" aria-hidden="true" title=""></span></li>
+    <li>{!!$attr!!}&nbsp;<span class="glyphicon glyphicon-info-sign pointable" aria-hidden="true" title=""></span></li>
     @endforeach
 </ul>
 @endif
 @if(!empty($policy_url))
-<a href='{{$policy_url}}' title="how the profile data will be used">Policy Url</a>
+<a href='{!!$policy_url!!}' title="how the profile data will be used">Policy Url</a>
 @endif
\ No newline at end of file
diff --git a/app/views/home.blade.php b/resources/views/home.blade.php
similarity index 74%
rename from app/views/home.blade.php
rename to resources/views/home.blade.php
index c439605b..5d052232 100644
--- a/app/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -3,7 +3,7 @@
     <title>Welcome to openStackId</title>
 @stop
 @section('meta')
-    <meta http-equiv="X-XRDS-Location" content="{{ URL::action("DiscoveryController@idp")}}" />
+    <meta http-equiv="X-XRDS-Location" content="{!! URL::action("OpenId\DiscoveryController@idp") !!}" />
 @append
 @section('content')
     <div class="container">
@@ -16,12 +16,12 @@
                         <div class="col-md-12">
                             <div class="row" style="padding-top: 5px;padding-bottom: 5px;">
                                 <div class="col-md-12">
-                                    <a href="{{ URL::action("UserController@getLogin")}}" class="btn btn-default btn-md active">Sign in to your account</a>
+                                    <a href="{!! URL::action("UserController@getLogin") !!}" class="btn btn-default btn-md active">Sign in to your account</a>
                                 </div>
                             </div>
                             <div class="row" style="padding-top: 5px;padding-bottom: 5px;">
                                 <div class="col-md-12">
-                                    <a href="{{ ExternalUrlService::getCreateAccountUrl() }}" class="btn btn-default btn-md active">Register for an OpenStack ID</a>
+                                    <a href="{!! ExternalUrlService::getCreateAccountUrl() !!}" class="btn btn-default btn-md active">Register for an OpenStack ID</a>
                                 </div>
                             </div>
                         </div>
diff --git a/app/views/identity.blade.php b/resources/views/identity.blade.php
similarity index 75%
rename from app/views/identity.blade.php
rename to resources/views/identity.blade.php
index 6f057398..0a8b41ea 100644
--- a/app/views/identity.blade.php
+++ b/resources/views/identity.blade.php
@@ -3,7 +3,7 @@
 <title>Welcome to OpenStackId</title>
 @stop
 @section('meta')
-    <meta http-equiv="X-XRDS-Location" content="{{ URL::action("DiscoveryController@user", ['identifier'=> $identifier ])}}" />
+<meta http-equiv="X-XRDS-Location" content="{!! URL::action("OpenId\DiscoveryController@user", ['identifier'=> $identifier ]) !!}" />
 @append
 @section('content')
 <div class="container">
@@ -12,12 +12,12 @@
         <p>This is an OpenID Identity page. This user has chosen not to display any information on this page.</p>
         @else
                 @if( $show_fullname )
-                <legend>{{ $username }}</legend>
+                <legend>{!! $username !!}</legend>
                 @endif
                 @if( $show_pic && !empty($pic))
                 <div class="row">
                     <div class="col-md-4">
-                        <img src="{{ $pic }}" class="img-thumbnail">
+                        <img src="{!!$pic !!}" class="img-thumbnail">
                     </div>
                 </div>
                 @endif
@@ -25,7 +25,7 @@
                     <div class="row email-row">
                         <div class="col-md-4">
                             <span class="glyphicon glyphicon-envelope" aria-hidden="true"></span>
-                            <a href="mailto:{{ $email }}">{{ $email }}</a>
+                            <a href="mailto:{!! $email !!}">{!! $email !!}</a>
                         </div>
                     </div>
                 @endif
@@ -33,13 +33,13 @@
     @else
         <div class="row">
             <div class="col-md-12">
-                Welcome, {{{ $username }}}.
+                Welcome, {!! $username !!} .
             </div>
         </div>
         <div class="row">
             <div class="col-md-12">
-                <a class="btn btn-default btn-sm active" href="{{ URL::action('UserController@getProfile') }}">edit your profile</a>
-                <a class="btn btn-default btn-sm active" href="{{ URL::action('UserController@logout') }}">logout</a>
+                <a class="btn btn-default btn-sm active" href="{!! URL::action('UserController@getProfile') !!}">edit your profile</a>
+                <a class="btn btn-default btn-sm active" href="{!! URL::action('UserController@logout') !!}">logout</a>
             </div>
         </div>
         @if( $show_fullname === 0 && $show_email===0 && $show_pic === 0)
@@ -48,12 +48,12 @@
         </p>
         @else
             @if( $show_fullname )
-            <legend>{{ $username }}</legend>
+            <legend>{!! $username !!}</legend>
             @endif
             @if( $show_pic && !empty($pic))
             <div class="row">
                 <div class="col-md-4">
-                    <img src="{{ $pic }}" class="img-thumbnail">
+                    <img src="{!! $pic !!}" class="img-thumbnail">
                 </div>
             </div>
             @endif
@@ -61,7 +61,7 @@
             <div class="row email-row">
                 <div class="col-md-4">
                     <span class="glyphicon glyphicon-envelope" aria-hidden="true"></span>
-                    <a href="mailto:{{ $email }}">{{ $email }}</a>
+                    <a href="mailto:{!! $email !!}">{!! $email !!}</a>
                 </div>
             </div>
             @endif
diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
new file mode 100644
index 00000000..0a2d4a91
--- /dev/null
+++ b/resources/views/layout.blade.php
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    @yield('title')
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    @yield('meta')
+    {!! HTML::style('bower_assets/bootstrap/dist/css/bootstrap.min.css') !!}
+    {!! HTML::style('assets/css/main.css') !!}
+    {!! HTML::style('bower_assets/jquery-ui/themes/ui-darkness/jquery-ui.css') !!}
+    {!! HTML::style('bower_assets/fontawesome/css/font-awesome.min.css') !!}
+    {!! HTML::style('bower_assets/sweetalert/dist/sweetalert.css') !!}
+    @yield('css')
+</head>
+<body>
+    <div class="container">
+        <header class="row header">
+            <div class="col-md-5">
+                <h1 id="logo"><a href="/">Open Stack</a></h1>
+            </div>
+            <div class="col-md-7">
+                @yield('header_right')
+            </div>
+        </header>
+        <div class="row" id="main-content">
+            @yield('content')
+        </div>
+        <footer class="row"></footer>
+    </div>
+    {!! HTML::script('bower_assets/jquery/dist/jquery.min.js')!!}
+    {!! HTML::script('bower_assets/bootstrap/dist/js/bootstrap.min.js')!!}
+    {!! HTML::script('bower_assets/jquery-validate/dist/jquery.validate.min.js')!!}
+    {!! HTML::script('bower_assets/jquery-validate/dist/additional-methods.min.js')!!}
+    {!! HTML::script('bower_assets/pure-templates/libs/pure.min.js')!!}
+    {!! HTML::script('bower_assets/uri.js/src/URI.min.js')!!}
+    {!! HTML::script('bower_assets/sweetalert/dist/sweetalert.min.js')!!}
+    {!! HTML::script('assets/js/ajax.utils.js')!!}
+    {!! HTML::script('assets/js/jquery.cleanform.js')!!}
+    {!! HTML::script('assets/js/jquery.serialize.js')!!}
+    {!! HTML::script('assets/js/jquery.validate.additional.custom.methods.js')!!}
+    @yield('scripts')
+    <span class="version hidden">{!! Config::get('app.version') !!}</span>
+</body>
+</html>
\ No newline at end of file
diff --git a/app/views/login.blade.php b/resources/views/login.blade.php
similarity index 60%
rename from app/views/login.blade.php
rename to resources/views/login.blade.php
index fdefc4b7..ff19b852 100644
--- a/app/views/login.blade.php
+++ b/resources/views/login.blade.php
@@ -3,89 +3,89 @@
     <title>Welcome to OpenStackId - Sign in </title>
 @append
 @section('meta')
-    <meta http-equiv="X-XRDS-Location" content="{{ URL::action("DiscoveryController@idp")}}" />
+    <meta http-equiv="X-XRDS-Location" content="{!! URL::action("OpenId\DiscoveryController@idp") !!}" />
 @append
 @section('content')
     @if(isset($identity_select))
         <legend style="margin-left: 15px;">
         @if(!$identity_select)
-        Sign in to <b>{{$realm}}</b> using <b>{{$identity}}</b>
+        Sign in to <b>{!! $realm !!}</b> using <b>{!! $identity !!}</b>
         @else
-        Sign in to <b>{{$realm}}</b> using your OpenStackID
+        Sign in to <b>{!! $realm !!} </b> using your OpenStackID
         @endif
         </legend>
     @endif
     <div class="col-md-4" id="sidebar">
         <div class="well">
-            {{ Form::open(array('id'=>'login_form','url' => URL::action('UserController@postLogin'), 'method' => 'post',  "autocomplete" => "off")) }}
+            {!! Form::open(array('id'=>'login_form','url' => URL::action('UserController@postLogin'), 'method' => 'post',  "autocomplete" => "off")) !!}
                 <legend>Welcome&nbsp;to&nbsp;OpenStackId!&nbsp;<span aria-hidden="true" style="font-size: 10pt;" class="glyphicon glyphicon-info-sign pointable" title="Please use your OpenStack ID to log in"></span></legend>
                 <div class="form-group">
-                    {{ Form::email('username',Session::has('username')? Session::get('username'):null, array
+                    {!! Form::email('username',Session::has('username')? Session::get('username'):null, array
                     (
                         'placeholder'  => 'Username',
                         'class'        =>'form-control',
                         'required'     => 'true',
                         'autocomplete' => 'off'
-                    )) }}
+                    )) !!}
                 </div>
                 <div class="form-group">
-                    {{ Form::password('password', array
+                    {!! Form::password('password', array
                     (
                         'placeholder'  => 'Password',
                         'class'        => 'form-control',
                         'required'     => 'true',
                         'autocomplete' => 'off'
-                    )) }}
+                    )) !!}
                 </div>
                 <div class="form-group">
                     @if(Session::has('flash_notice'))
-                            <span class="error-message"><i class="fa fa-exclamation-triangle">&nbsp;{{ Session::get('flash_notice') }}</i></span>
+                            <span class="error-message"><i class="fa fa-exclamation-triangle">&nbsp;{!! Session::get('flash_notice') !!}</i></span>
                     @else
                         @foreach($errors->all() as $message)
-                                <span class="error-message"><i class="fa fa-exclamation-triangle">&nbsp;{{ $message }}</i></span>
+                                <span class="error-message"><i class="fa fa-exclamation-triangle">&nbsp;{!! $message !!}</i></span>
                         @endforeach
                     @endif
                 </div>
                 @if(Session::has('login_attempts') && Session::has('max_login_attempts_2_show_captcha') && Session::get('login_attempts') > Session::get('max_login_attempts_2_show_captcha'))
-                    {{ Form::captcha(array('id'=>'captcha','class'=>'input-block-level')) }}
-                    {{ Form::hidden('login_attempts', Session::get('login_attempts')) }}
+                    {!! Recaptcha::render(array('id'=>'captcha','class'=>'input-block-level')) !!}
+                    {!! Form::hidden('login_attempts', Session::get('login_attempts')) !!}
                 @else
-                    {{ Form::hidden('login_attempts', '0') }}
+                    {!! Form::hidden('login_attempts', '0') !!}
                 @endif
 
                 <div class="checkbox">
                     <label class="checkbox">
-                        {{ Form::checkbox('remember', '1', false) }}Remember me
-                        for @if(ServerConfigurationService::getConfigValue("Remember.ExpirationTime")<60) }}
-                        {{ ServerConfigurationService::getConfigValue("Remember.ExpirationTime") }} Minutes
+                        {!! Form::checkbox('remember', '1', false) !!}Remember me
+                        for @if(ServerConfigurationService::getConfigValue("Remember.ExpirationTime")<60) !!}
+                        {!! ServerConfigurationService::getConfigValue("Remember.ExpirationTime") !!} Minutes
                         @elseif(ServerConfigurationService::getConfigValue("Remember.ExpirationTime")>60 && ServerConfigurationService::getConfigValue("Remember.ExpirationTime")< (24*60))
-                            {{ intval(ServerConfigurationService::getConfigValue("Remember.ExpirationTime")/60) }} Hours
+                            {!! intval(ServerConfigurationService::getConfigValue("Remember.ExpirationTime")/60) !!} Hours
                         @elseif(ServerConfigurationService::getConfigValue("Remember.ExpirationTime")> (24*60) )
-                            {{ intval(ServerConfigurationService::getConfigValue("Remember.ExpirationTime")/(24*60)) }} Days
+                            {!! intval(ServerConfigurationService::getConfigValue("Remember.ExpirationTime")/(24*60)) !!} Days
                         @endif
                     </label>
                 </div>
                 <div class="pull-right">
-                    {{ Form::submit('Sign In',array('id'=>'login','class'=>'btn btn-primary')) }}
-                    <a class="btn btn-primary" href="{{ URL::action('UserController@cancelLogin') }}">Cancel</a>
+                    {!! Form::submit('Sign In',array('id'=>'login','class'=>'btn btn-primary')) !!}
+                    <a class="btn btn-primary" href="{!! URL::action('UserController@cancelLogin') !!} ">Cancel</a>
                 </div>
                 <div style="clear:both;padding-top:15px;" class="row">
                     <div class="col-md-12">
-                        <a title="forgot password" target="_blank" href="{{ ExternalUrlService::getForgotPasswordUrl() }}">Forgot password?</a>
+                        <a title="forgot password" target="_blank" href="{!! ExternalUrlService::getForgotPasswordUrl() !!}">Forgot password?</a>
                     </div>
                 </div>
             <div style="clear:both;padding-top:15px;" class="row">
                 <div class="col-md-12">
-                    <a title="register new account" target="_blank" href="{{ ExternalUrlService::getCreateAccountUrl() }}">Register for an OpenStack ID</a>
+                    <a title="register new account" target="_blank" href="{!! ExternalUrlService::getCreateAccountUrl() !!}">Register for an OpenStack ID</a>
                 </div>
             </div>
             <div style="clear:both;padding-top:15px;" class="row">
                 <div class="col-md-12">
-                    <a title="verify account" target="_blank" href="{{ ExternalUrlService::getVerifyAccountUrl() }}">Verify OpenStack ID</a>
+                    <a title="verify account" target="_blank" href="{!! ExternalUrlService::getVerifyAccountUrl() !!}">Verify OpenStack ID</a>
                 </div>
             </div>
             </fieldset>
-            {{ Form::close() }}
+            {!! Form::close() !!}
         </div>
 
     </div>
@@ -93,5 +93,5 @@
     </div>
 @append
 @section('scripts')
-    {{ HTML::script('assets/js/login.js') }}
+    {!! HTML::script('assets/js/login.js') !!}
 @append
\ No newline at end of file
diff --git a/app/views/menu.blade.php b/resources/views/menu.blade.php
similarity index 50%
rename from app/views/menu.blade.php
rename to resources/views/menu.blade.php
index c6bcd7f1..180bd2b1 100644
--- a/app/views/menu.blade.php
+++ b/resources/views/menu.blade.php
@@ -11,21 +11,14 @@
         </div>
         <div id="navbar" class="navbar-collapse collapse">
             <ul id='main-menu' class="nav navbar-nav">
-                <li id="profile"><a href='{{ URL::action("UserController@getProfile") }}'>Settings</a></li>
-                @if( ServerConfigurationService::getConfigValue("OAuth2.Enable") == true)
-                    <li id="oauth2-console" class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                            OAUTH2 Console
-                            <b class="caret"></b>
-                        </a>
+                <li id="profile"><a href='{!! URL::action("UserController@getProfile") !!}'>Settings</a></li>
+                <li id="oauth2-console" class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">OAUTH2 Console<b class="caret"></b></a>
                         <ul class="dropdown-menu">
-                            <li><a href='{{URL::action("AdminController@listOAuth2Clients")}}'>OAUTH2 Applications</a>
-                            </li>
-                            <li><a href='{{URL::action("AdminController@editIssuedGrants")}}'>Issued OAUTH2 Grants</a>
-                            </li>
+                            <li><a href='{!!URL::action("AdminController@listOAuth2Clients")!!}'>OAUTH2 Applications</a></li>
+                            <li><a href='{!!URL::action("AdminController@editIssuedGrants")!!}'>Issued OAUTH2 Grants</a></li>
                         </ul>
-                    </li>
-                @endif
+               </li>
                 @if($is_oauth2_admin || $is_openstackid_admin)
                     <li id='server-admin' class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -35,23 +28,22 @@
                         <ul class="dropdown-menu">
                             @if($is_oauth2_admin)
                                 <li class="dropdown-header">OAUTH2</li>
-                                <li><a href='{{URL::action("AdminController@listServerPrivateKeys")}}'>Private Keys</a></li>
-                                <li><a href='{{URL::action("AdminController@listResourceServers")}}'>Resource Servers</a></li>
-                                <li><a href='{{URL::action("AdminController@listApiScopeGroups")}}'>Api Scope Groups</a></li>
-                                <li><a href='{{URL::action("AdminController@listLockedClients")}}'>Clients</a></li>
+                                <li><a href='{!!URL::action("AdminController@listServerPrivateKeys")!!}'>Private Keys</a></li>
+                                <li><a href='{!!URL::action("AdminController@listResourceServers")!!}'>Resource Servers</a></li>
+                                <li><a href='{!!URL::action("AdminController@listApiScopeGroups")!!}'>Api Scope Groups</a></li>
+                                <li><a href='{!!URL::action("AdminController@listLockedClients")!!}'>Clients</a></li>
                                 <li role="separator" class="divider"></li>
                             @endif
                             @if($is_openstackid_admin)
                                 <li class="dropdown-header">Server</li>
-                                <li><a href='{{URL::action("AdminController@listLockedUsers")}}'>Users</a></li>
-                                <li><a href='{{URL::action("AdminController@listBannedIPs")}}'>Banned IPs</a></li>
-                                <li><a href='{{URL::action("AdminController@listServerConfig")}}'>Server
-                                        Configuration</a></li>
+                                <li><a href='{!!URL::action("AdminController@listLockedUsers")!!}'>Users</a></li>
+                                <li><a href='{!!URL::action("AdminController@listBannedIPs")!!}'>Banned IPs</a></li>
+                                <li><a href='{!!URL::action("AdminController@listServerConfig")!!}'>Server Configuration</a></li>
                             @endif
                         </ul>
                     </li>
                 @endif
-                <li><a href='{{ URL::action("UserController@logout") }}'>Logout</a></li>
+                <li><a href='{!! URL::action("UserController@logout") !!}'>Logout</a></li>
             </ul>
         </div><!--/.nav-collapse -->
     </div>
diff --git a/app/views/modal.blade.php b/resources/views/modal.blade.php
similarity index 64%
rename from app/views/modal.blade.php
rename to resources/views/modal.blade.php
index 06899b7b..ca79fa1a 100644
--- a/app/views/modal.blade.php
+++ b/resources/views/modal.blade.php
@@ -1,17 +1,17 @@
 <!-- Modal -->
-<div class="modal fade" id="{{$modal_id}}" tabindex="-1" role="dialog" aria-labelledby="{{$modal_id}}Label">
+<div class="modal fade" id="{!!$modal_id!!}" tabindex="-1" role="dialog" aria-labelledby="{!!$modal_id!!}Label">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="{{$modal_id}}Label">{{$modal_title}}</h4>
+                <h4 class="modal-title" id="{!!$modal_id!!}Label">{!!$modal_title!!}</h4>
             </div>
             <div class="modal-body">
                 @include($modal_form, $modal_form_data )
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                <button type="button" class="btn btn-primary {{$modal_save_css_class}}">{{$modal_save_text}}</button>
+                <button type="button" class="btn btn-primary {!!$modal_save_css_class!!}">{!!$modal_save_text!!}</button>
             </div>
         </div>
     </div>
diff --git a/resources/views/oauth2/consent.blade.php b/resources/views/oauth2/consent.blade.php
new file mode 100644
index 00000000..cd389904
--- /dev/null
+++ b/resources/views/oauth2/consent.blade.php
@@ -0,0 +1,43 @@
+@extends('layout')
+@section('title')
+<title>Welcome to OpenStackId - Request for Permission </title>
+@stop
+
+@section('header_right')
+    @if(Auth::check())
+        <div class="row">
+            <div class="col-md-6 col-md-offset-8">
+                Welcome, <a href="{!! URL::action("UserController@getProfile") !!}">{!!Auth::user()->identifier!!}</a>
+            </div>
+        </div>
+    @endif
+@stop
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-6 col-md-offset-3">
+            <div class="row">
+                <div class="col-md-12 col-xs-12">
+                    <h2> <a target='_blank' href="{!!$website!!}">{!!$app_name!!}</a>&nbsp;<span style="font-size: 10pt;" class="glyphicon glyphicon-info-sign pointable info" aria-hidden="true" data-content="Developer Email: <a href='mailto:{!!$dev_info_email!!}'>{!!$dev_info_email!!}</a>.<br> Clicking 'Accept' will redirect you to: <a href='{!!$website!!}' target='_blank'>{!!$website!!}</a>" title="Developer Info"></span></h2>
+                </div>
+            </div>
+            <legend>This app would like to:</legend>
+            <ul class="list-unstyled">
+            @foreach ($requested_scopes as $scope)
+                <li> {!!$scope->short_description!!}&nbsp;<span class="glyphicon glyphicon-info-sign pointable info" aria-hidden="true" data-content="{!! $scope->description !!}" title="Scope Info"></span></li>
+            @endforeach
+            </ul>
+            {!! Form::open(array('url' => URL::action("UserController@postConsent") ,'id'=>'authorization_form', 'method' => 'post',  "autocomplete" => "off")) !!}
+                <input type="hidden"  name='trust' id='trust' value=""/>
+                <button class="btn btn-default btn-md btn-consent-action" id="cancel-authorization" type="button">Cancel</button>
+                <button class="btn btn-primary btn-md btn-consent-action" id="approve-authorization" type="button">Accept</button>
+            {!! Form::close() !!}
+            <p class="privacy-policy">** <b>{!!$app_name!!}</b> Application and <b>OpenStack</b> will use this information in accordance with their respective <a target='_blank' href="{!!$tos_uri!!}">terms of service</a> and <a target='_blank' href="{!!$policy_uri!!}">privacy policies</a>.</p>
+        </div>
+    </div>
+</div>
+@stop
+@section('scripts')
+{!! HTML::script('assets/js/oauth2/consent.js') !!}
+@append
\ No newline at end of file
diff --git a/app/views/oauth2/profile/add-client-form.blade.php b/resources/views/oauth2/profile/add-client-form.blade.php
similarity index 100%
rename from app/views/oauth2/profile/add-client-form.blade.php
rename to resources/views/oauth2/profile/add-client-form.blade.php
diff --git a/app/views/oauth2/profile/admin/api-scope-group-add-form.blade.php b/resources/views/oauth2/profile/admin/api-scope-group-add-form.blade.php
similarity index 100%
rename from app/views/oauth2/profile/admin/api-scope-group-add-form.blade.php
rename to resources/views/oauth2/profile/admin/api-scope-group-add-form.blade.php
diff --git a/app/views/oauth2/profile/admin/api-scope-groups.blade.php b/resources/views/oauth2/profile/admin/api-scope-groups.blade.php
similarity index 52%
rename from app/views/oauth2/profile/admin/api-scope-groups.blade.php
rename to resources/views/oauth2/profile/admin/api-scope-groups.blade.php
index c9ccc674..610e98e7 100644
--- a/app/views/oauth2/profile/admin/api-scope-groups.blade.php
+++ b/resources/views/oauth2/profile/admin/api-scope-groups.blade.php
@@ -17,7 +17,7 @@
 
     <div class="row">
         <div class="col-md-12">
-            {{ HTML::link(URL::action("ApiScopeGroupController@create"),'Add Api Scope Group',array('class'=>'btn active btn-primary add-api-scope-group','title'=>'Adds a New Api Scope Group')) }}
+            {!! HTML::link(URL::action("Api\ApiScopeGroupController@create"),'Add Api Scope Group',array('class'=>'btn active btn-primary add-api-scope-group','title'=>'Adds a New Api Scope Group')) !!}
         </div>
     </div>
 
@@ -31,20 +31,20 @@
         </thead>
         <tbody id="body-api-scope-groups">
         @foreach ($groups as $group)
-            <tr id="{{ $group->id }}">
-                <td>{{$group->name}}</td>
+            <tr id="{!! $group->id !!}">
+                <td>{!!$group->name!!}</td>
                 <td>
-                    <input type="checkbox" class="api-scope-group-active-checkbox" id="api-scope-group-active_{{$group->id}}"
-                           data-group-id="{{$group->id}}"
+                    <input type="checkbox" class="api-scope-group-active-checkbox" id="api-scope-group-active_{!!$group->id!!}"
+                           data-group-id="{!!$group->id!!}"
                            @if ( $group->active)
                            checked
                            @endif
-                           value="{{$group->id}}"/>
+                           value="{!!$group->id!!}"/>
                 </td>
                 <td>
                     &nbsp;
-                    {{ HTML::link(URL::action("AdminController@editApiScopeGroup",array("id"=>$group->id)),'Edit',array('class'=>'btn btn-default active edit-api-scope-group','title'=>'Edit a Registered Api Scope Group')) }}
-                    {{ HTML::link(URL::action("ApiScopeGroupController@delete",array("id"=>$group->id)),'Delete',array('class'=>'btn btn-default btn-delete active delete-api-scope-group','title'=>'Deletes a Registered Api Scope Group')) }}
+                    {!! HTML::link(URL::action("AdminController@editApiScopeGroup",array("id"=>$group->id)),'Edit',array('class'=>'btn btn-default active edit-api-scope-group','title'=>'Edit a Registered Api Scope Group')) !!}
+                    {!! HTML::link(URL::action("Api\ApiScopeGroupController@delete",array("id"=>$group->id)),'Delete',array('class'=>'btn btn-default btn-delete active delete-api-scope-group','title'=>'Deletes a Registered Api Scope Group')) !!}
                 </td>
             </tr>
         @endforeach
@@ -68,32 +68,32 @@
     <script type="application/javascript">
         var ApiScopeGroupUrls =
         {
-            get : '{{URL::action("ApiScopeGroupController@getByPage",array("offset"=>1,"limit"=>1000))}}',
-            edit : '{{ URL::action("AdminController@editApiScopeGroup",array("id"=>-1)) }}',
-            delete : '{{ URL::action("ApiScopeGroupController@delete",array("id"=>-1)) }}',
-            activate : '{{ URL::action("ApiScopeGroupController@activate",array("id"=>"@id")) }}',
-            deactivate : '{{ URL::action("ApiScopeGroupController@deactivate",array("id"=>"@id")) }}',
-            add : '{{URL::action("ApiScopeGroupController@create",null)}}',
-            fetchUsers: '{{URL::action("UserApiController@fetch",null)}}'
+            get : '{!!URL::action("Api\ApiScopeGroupController@getByPage",array("offset"=>1,"limit"=>1000))!!}',
+            edit : '{!! URL::action("AdminController@editApiScopeGroup",array("id"=>-1)) !!}',
+            delete : '{!! URL::action("Api\ApiScopeGroupController@delete",array("id"=>-1)) !!}',
+            activate : '{!! URL::action("Api\ApiScopeGroupController@activate",array("id"=>"@id")) !!}',
+            deactivate : '{!! URL::action("Api\ApiScopeGroupController@deactivate",array("id"=>"@id")) !!}',
+            add : '{!!URL::action("Api\ApiScopeGroupController@create",null)!!}',
+            fetchUsers: '{!!URL::action("Api\UserApiController@fetch")!!}'
         };
         var all_scopes = [];
 
         @foreach($non_selected_scopes as $scope)
             all_scopes.push(
                 {
-                    id: {{$scope->id}},
-                    value: '{{$scope->name}}'
+                    id: {!!$scope->id!!},
+                    value: '{!!$scope->name!!}'
                 }
             );
         @endforeach
 
     </script>
-    {{ HTML::script('bower_assets/typeahead.js/dist/typeahead.bundle.js')}}
-    {{ HTML::script('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.js')}}
-    {{ HTML::script('assets/js/oauth2/profile/admin/api-scope-groups.js') }}
+    {!! HTML::script('bower_assets/typeahead.js/dist/typeahead.bundle.js')!!}
+    {!! HTML::script('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.js')!!}
+    {!! HTML::script('assets/js/oauth2/profile/admin/api-scope-groups.js') !!}
 @append
 
 @section('css')
-    {{ HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.css') }}
-    {{ HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput-typeahead.css') }}
+    {!! HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.css') !!}
+    {!! HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput-typeahead.css') !!}
 @append
\ No newline at end of file
diff --git a/app/views/oauth2/profile/admin/clients.blade.php b/resources/views/oauth2/profile/admin/clients.blade.php
similarity index 72%
rename from app/views/oauth2/profile/admin/clients.blade.php
rename to resources/views/oauth2/profile/admin/clients.blade.php
index 8177be50..fe5cb506 100644
--- a/app/views/oauth2/profile/admin/clients.blade.php
+++ b/resources/views/oauth2/profile/admin/clients.blade.php
@@ -19,14 +19,14 @@
             </thead>
             <tbody id="body-locked-clients">
               @foreach($clients as $client)
-              <tr id="{{$client->id}}">
+              <tr id="{!!$client->id!!}">
                   <td>
                       <div style="min-width: 500px">
-                      {{ $client->getApplicationName() }}
+                      {!! $client->getApplicationName() !!}
                       </div>
                   </td>
                   <td>
-                      {{ HTML::link(URL::action("ClientApiController@unlock",array("id"=>$client->id)),'Unlock',array('class'=>'btn unlock-client','data-client-id'=>$client->id,'title'=>'Unlocks given client')) }}
+                      {!! HTML::link(URL::action("Api\ClientApiController@unlock",array("id"=>$client->id)),'Unlock',array('class'=>'btn unlock-client','data-client-id'=>$client->id,'title'=>'Unlocks given client')) !!}
                   </td>
               </tr>
               @endforeach
@@ -39,5 +39,5 @@
 </div>
 @stop
 @section('scripts')
-{{ HTML::script('assets/js/oauth2/profile/admin/clients.js') }}
+{!! HTML::script('assets/js/oauth2/profile/admin/clients.js') !!}
 @stop
\ No newline at end of file
diff --git a/app/views/oauth2/profile/admin/edit-api-scope-group.blade.php b/resources/views/oauth2/profile/admin/edit-api-scope-group.blade.php
similarity index 58%
rename from app/views/oauth2/profile/admin/edit-api-scope-group.blade.php
rename to resources/views/oauth2/profile/admin/edit-api-scope-group.blade.php
index a7e3e834..565cb82c 100644
--- a/app/views/oauth2/profile/admin/edit-api-scope-group.blade.php
+++ b/resources/views/oauth2/profile/admin/edit-api-scope-group.blade.php
@@ -6,15 +6,15 @@
 
 @section('content')
     @include('menu',array('is_oauth2_admin' => $is_oauth2_admin, 'is_openstackid_admin' => $is_openstackid_admin))
-    <a href="{{ URL::action("AdminController@listApiScopeGroups") }}">Go Back</a>
-    <legend>Edit Api Scope Group - Id {{ $group->id }}</legend>
+    <a href="{!! URL::action("AdminController@listApiScopeGroups") !!}">Go Back</a>
+    <legend>Edit Api Scope Group - Id {!! $group->id !!}</legend>
     <div class="row">
         <div class="col-md-12">
-            <form id="api-scope-group-form" name="api-scope-group-form" action='{{URL::action("ApiScopeGroupController@update",null)}}'>
+            <form id="api-scope-group-form" name="api-scope-group-form" action='{!!URL::action("Api\ApiScopeGroupController@update",null)!!}'>
 
                 <div class="form-group">
                     <label class="control-label" for="name">Friendly Name&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title=""></span></label>
-                    <input type="text" class="form-control" name="name" id="name" value="{{ $group->name}}">
+                    <input type="text" class="form-control" name="name" id="name" value="{!! $group->name!!}">
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="scopes">Scopes&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title=""></span></label>
@@ -38,7 +38,7 @@
                         <button type="submit" class="btn btn-default active btn-lg">Save</button>
                     </div>
                 </div>
-                <input type="hidden" name="id" id="id" value="{{ $group->id }}"/>
+                <input type="hidden" name="id" id="id" value="{!! $group->id !!}"/>
             </form>
         </div>
     </div>
@@ -47,24 +47,24 @@
 
 @section('scripts')
     <script type="application/javascript">
-        var group_id = {{ $group->id}};
+        var group_id = {!! $group->id!!};
 
         var ApiScopeGroupUrls = {
-            get : '{{URL::action("ApiScopeGroupController@getByPage",array("offset"=>1,"limit"=>1000))}}',
-            edit : '{{ URL::action("AdminController@editApiScopeGroup",array("id"=>-1)) }}',
-            delete : '{{ URL::action("ApiScopeGroupController@delete",array("id"=>-1)) }}',
-            activate : '{{ URL::action("ApiScopeGroupController@activate",array("id"=>"@id")) }}',
-            deactivate : '{{ URL::action("ApiScopeGroupController@deactivate",array("id"=>"@id")) }}',
-            add : '{{URL::action("ApiScopeGroupController@create",null)}}',
-            fetchUsers: '{{URL::action("UserApiController@fetch",null)}}'
+            get : '{!!URL::action("Api\ApiScopeGroupController@getByPage",array("offset"=>1,"limit"=>1000))!!}',
+            edit : '{!! URL::action("AdminController@editApiScopeGroup",array("id"=>-1)) !!}',
+            delete : '{!! URL::action("Api\ApiScopeGroupController@delete",array("id"=>-1)) !!}',
+            activate : '{!! URL::action("Api\ApiScopeGroupController@activate",array("id"=>"@id")) !!}',
+            deactivate : '{!! URL::action("Api\ApiScopeGroupController@deactivate",array("id"=>"@id")) !!}',
+            add : '{!!URL::action("Api\ApiScopeGroupController@create",null)!!}',
+            fetchUsers: '{!!URL::action("Api\UserApiController@fetch")!!}'
         };
 
         var all_scopes = [];
         @foreach($non_selected_scopes as $scope)
             all_scopes.push(
                 {
-                    id: {{$scope->id}},
-                    value: '{{$scope->name}}'
+                    id: {!!$scope->id!!},
+                    value: '{!!$scope->name!!}'
                 }
         );
         @endforeach
@@ -73,22 +73,22 @@
         var current_users  = [];
 
         @foreach($group->scopes()->get() as $scope)
-            current_scopes.push({ "id": {{$scope->id}} , "value": "{{$scope->name}}" });
+            current_scopes.push({ "id": {!!$scope->id!!} , "value": "{!!$scope->name!!}" });
         @endforeach
 
         @foreach($group->users()->get() as $user)
-            current_users.push({ "id": {{$user->id}} , "value": "{{$user->getFullName() }}" });
+            current_users.push({ "id": {!!$user->id!!} , "value": "{!!$user->getFullName() !!}" });
         @endforeach
 
     </script>
-    {{ HTML::script('bower_assets/typeahead.js/dist/typeahead.bundle.js')}}
-    {{ HTML::script('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.js')}}
-    {{ HTML::script('assets/js/oauth2/profile/admin/edit-api-scope-group.js') }}
+    {!! HTML::script('bower_assets/typeahead.js/dist/typeahead.bundle.js')!!}
+    {!! HTML::script('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.js')!!}
+    {!! HTML::script('assets/js/oauth2/profile/admin/edit-api-scope-group.js') !!}
 
 
 @append
 
 @section('css')
-    {{ HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.css') }}
-    {{ HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput-typeahead.css') }}
+    {!! HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.css') !!}
+    {!! HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput-typeahead.css') !!}
 @append
\ No newline at end of file
diff --git a/app/views/oauth2/profile/admin/edit-api.blade.php b/resources/views/oauth2/profile/admin/edit-api.blade.php
similarity index 60%
rename from app/views/oauth2/profile/admin/edit-api.blade.php
rename to resources/views/oauth2/profile/admin/edit-api.blade.php
index e87ca655..0c22272d 100644
--- a/app/views/oauth2/profile/admin/edit-api.blade.php
+++ b/resources/views/oauth2/profile/admin/edit-api.blade.php
@@ -6,19 +6,19 @@
 
 @section('content')
 @include('menu',array('is_oauth2_admin' => $is_oauth2_admin, 'is_openstackid_admin' => $is_openstackid_admin))
-<a href='{{ URL::action("AdminController@editResourceServer",array("id"=>$api->resource_server_id)) }}'>{{ Lang::get("messages.edit_api_go_back") }}</a>
-<legend>{{ Lang::get("messages.edit_api_title", array("id" => $api->id)) }}</legend>
+<a href='{!! URL::action("AdminController@editResourceServer",array("id"=>$api->resource_server_id)) !!}'>@lang("messages.edit_api_go_back")</a>
+<legend>@lang("messages.edit_api_title", array("id" => $api->id))</legend>
 
 <div class="row">
     <div class="col-md6">
-        <form class="form-horizontal" id="api-form" name="api-form" action='{{URL::action("ApiController@update",null)}}'>
+        <form class="form-horizontal" id="api-form" name="api-form" action='{!!URL::action("Api\\ApiController@update",null)!!}'>
                 <div class="form-group">
-                    <label for="name">{{ Lang::get("messages.edit_api_form_name") }}</label>
-                    <input class="form-control" type="text" name="name" id="name" value="{{ $api->name }}">
+                    <label for="name">@lang("messages.edit_api_form_name")</label>
+                    <input class="form-control" type="text" name="name" id="name" value="{!! $api->name !!}">
                 </div>
                 <div class="form-group">
-                    <label for="description">{{ Lang::get("messages.edit_api_form_description") }}</label>
-                    <textarea class="form-control" style="resize: none;" rows="4" cols="50" name="description" id="description">{{ $api->description}}</textarea>
+                    <label for="description">@lang("messages.edit_api_form_description")</label>
+                    <textarea class="form-control" style="resize: none;" rows="4" cols="50" name="description" id="description">{!! $api->description!!}</textarea>
                 </div>
                 <div class="checkbox">
                     <label>
@@ -29,8 +29,8 @@
                                name="active">&nbsp;Active
                     </label>
                 </div>
-                <button type="submit" class="btn btn-default btn-md active">{{ Lang::get("messages.edit_api_form_save") }}</button>
-                <input type="hidden" name="id" id="id" value="{{ $api->id }}"/>
+                <button type="submit" class="btn btn-default btn-md active">@lang("messages.edit_api_form_save")</button>
+                <input type="hidden" name="id" id="id" value="{!! $api->id !!}"/>
         </form>
     </div>
 </div>
@@ -54,7 +54,7 @@
         </div>
         <div class="row">
             <div class="col-md-12">
-                {{ HTML::link(URL::action("ApiScopeController@create",null),'Register Scope',array('class'=>'btn active btn-primary add-scope','title'=>'Adds a New API Scope')) }}
+                {!! HTML::link(URL::action("Api\ApiScopeController@create",null),'Register Scope',array('class'=>'btn active btn-primary add-scope','title'=>'Adds a New API Scope')) !!}
             </div>
         </div>
         <div class="row">
@@ -72,32 +72,32 @@
                     <tbody id="body-scopes">
                     @foreach($api->scopes()->get() as $scope)
                     <tr>
-                        <td width="70%">{{ $scope->name}}</td>
+                        <td width="70%">{!! $scope->name!!}</td>
                         <td width="5%">
-                            <input type="checkbox" data-scope-id="{{$scope->id}}" class="scope-active-checkbox" id="scope-active_{{$scope->id}}"
+                            <input type="checkbox" data-scope-id="{!!$scope->id!!}" class="scope-active-checkbox" id="scope-active_{!!$scope->id!!}"
                             @if ( $scope->active)
                             checked
                             @endif
-                            value="{{$scope->id}}"/>
+                            value="{!!$scope->id!!}"/>
                         </td>
                         <td width="5%">
-                            <input type="checkbox" data-scope-id="{{$scope->id}}" class="scope-default-checkbox" id="scope-default_{{$scope->id}}"
+                            <input type="checkbox" data-scope-id="{!!$scope->id!!}" class="scope-default-checkbox" id="scope-default_{!!$scope->id!!}"
                             @if ( $scope->default)
                             checked
                             @endif
-                            value="{{$scope->id}}"/>
+                            value="{!!$scope->id!!}"/>
                         </td>
                         <td width="5%">
-                            <input type="checkbox" data-scope-id="{{$scope->id}}" class="scope-system-checkbox" id="scope-system_{{$scope->id}}"
+                            <input type="checkbox" data-scope-id="{!!$scope->id!!}" class="scope-system-checkbox" id="scope-system_{!!$scope->id!!}"
                             @if ( $scope->system)
                             checked
                             @endif
-                            value="{{$scope->id}}"/>
+                            value="{!!$scope->id!!}"/>
                         </td>
                         <td width="15%">
                             &nbsp;
-                            {{ HTML::link(URL::action("AdminController@editScope",array("id"=>$scope->id)),'Edit',array('class'=>'btn btn-default active edit-scope','title'=>'Edits a Registered API Scope')) }}
-                            {{ HTML::link(URL::action("ApiScopeController@delete",array("id"=>$scope->id)),'Delete',array('class'=>'btn btn-default btn-delete active delete-scope','title'=>'Deletes a Registered API Scope'))}}
+                            {!! HTML::link(URL::action("AdminController@editScope",array("id"=>$scope->id)),'Edit',array('class'=>'btn btn-default active edit-scope','title'=>'Edits a Registered API Scope')) !!}
+                            {!! HTML::link(URL::action("Api\ApiScopeController@delete",array("id"=>$scope->id)),'Delete',array('class'=>'btn btn-default btn-delete active delete-scope','title'=>'Deletes a Registered API Scope'))!!}
                         </td>
                     </tr>
                     @endforeach
@@ -129,7 +129,7 @@
         </div>
         <div class="row">
             <div class="col-md-12">
-                {{ HTML::link(URL::action("ApiEndpointController@create",null),'Register Endpoint',array('class'=>'btn active btn-primary add-endpoint','title'=>'Adds a New API Endpoint')) }}
+                {!! HTML::link(URL::action("Api\\ApiEndpointController@create",null),'Register Endpoint',array('class'=>'btn active btn-primary add-endpoint','title'=>'Adds a New API Endpoint')) !!}
             </div>
         </div>
         <div class="row">
@@ -147,20 +147,20 @@
                     <tbody id="body-endpoints">
                     @foreach($api->endpoints()->get() as $endpoint)
                     <tr>
-                        <td width="30%">{{ $endpoint->name }}</td>
+                        <td width="30%">{!! $endpoint->name !!}</td>
                         <td width="5%">
-                            <input type="checkbox" data-endpoint-id="{{$endpoint->id}}" class="endpoint-active-checkbox" id="endpoint-active_{{$endpoint->id}}"
+                            <input type="checkbox" data-endpoint-id="{!!$endpoint->id!!}" class="endpoint-active-checkbox" id="endpoint-active_{!!$endpoint->id!!}"
                             @if ( $endpoint->active)
                             checked
                             @endif
-                            value="{{$endpoint->id}}"/>
+                            value="{!!$endpoint->id!!}"/>
                         </td>
-                        <td width="45%">{{$endpoint->route}}</td>
-                        <td width="5%">{{$endpoint->http_method}}</td>
+                        <td width="45%">{!!$endpoint->route!!}</td>
+                        <td width="5%">{!!$endpoint->http_method!!}</td>
                         <td width="15%">
                             &nbsp;
-                            {{ HTML::link(URL::action("AdminController@editEndpoint",array("id"=>$endpoint->id)),'Edit',array('class'=>'btn btn-default active edit-endpoint','title'=>'Edits a Registered API Endpoint')) }}
-                            {{ HTML::link(URL::action("ApiEndpointController@delete",array("id"=>$endpoint->id)),'Delete',array('class'=>'btn btn-default btn-delete active delete-endpoint','title'=>'Deletes a Registered API Endpoint'))}}
+                            {!! HTML::link(URL::action("AdminController@editEndpoint",array("id"=>$endpoint->id)),'Edit',array('class'=>'btn btn-default active edit-endpoint','title'=>'Edits a Registered API Endpoint')) !!}
+                            {!! HTML::link(URL::action("Api\ApiEndpointController@delete",array("id"=>$endpoint->id)),'Delete',array('class'=>'btn btn-default btn-delete active delete-endpoint','title'=>'Deletes a Registered API Endpoint'))!!}
                         </td>
                     </tr>
                     @endforeach
@@ -178,31 +178,31 @@
 
 <script type="application/javascript">
 
-    var api_id = {{ $api->id}};
+    var api_id = {!! $api->id!!};
 
 	var scopesUrls = {
-		get : '{{ URL::action("ApiScopeController@getByPage",array("offset"=>1,"limit"=>1000,"api_id"=>$api->id)) }}',
-		edit : '{{ URL::action("AdminController@editScope",array("id"=>"@id")) }}',
-		delete : '{{ URL::action("ApiScopeController@delete",array("id"=>"@id")) }}',
-		activate:'{{ URL::action("ApiScopeController@activate",array("id"=>"@id")) }}',
-		deactivate: '{{ URL::action("ApiScopeController@deactivate",array("id"=>"@id")) }}',
-		update : '{{URL::action("ApiScopeController@update")}}',
-		add : '{{ URL::action("ApiScopeController@create") }}'
+		get : '{!! URL::action("Api\ApiScopeController@getByPage",array("offset"=>1,"limit"=>1000,"api_id"=>$api->id)) !!}',
+		edit : '{!! URL::action("AdminController@editScope",array("id"=>"@id")) !!}',
+		delete : '{!! URL::action("Api\ApiScopeController@delete",array("id"=>"@id")) !!}',
+		activate:'{!! URL::action("Api\ApiScopeController@activate",array("id"=>"@id")) !!}',
+		deactivate: '{!! URL::action("Api\ApiScopeController@deactivate",array("id"=>"@id")) !!}',
+		update : '{!!URL::action("Api\ApiScopeController@update")!!}',
+		add : '{!! URL::action("Api\ApiScopeController@create") !!}'
 	};
 
 	var endpointUrls = {
-		get : '{{ URL::action("ApiEndpointController@getByPage",array("offset"=>1,"limit"=>1000,"api_id"=>$api->id)) }}',
-		edit : '{{ URL::action("AdminController@editEndpoint",array("id"=>"@id")) }}',
-		delete : '{{ URL::action("ApiEndpointController@delete",array("id"=>"@id")) }}',
-		activate:'{{ URL::action("ApiEndpointController@activate",array("id"=>"@id")) }}',
-		deactivate: '{{ URL::action("ApiEndpointController@deactivate",array("id"=>"@id")) }}',
-		add : '{{ URL::action("ApiEndpointController@create") }}'
+		get : '{!! URL::action("Api\ApiEndpointController@getByPage",array("offset"=>1,"limit"=>1000,"api_id"=>$api->id)) !!}',
+		edit : '{!! URL::action("AdminController@editEndpoint",array("id"=>"@id")) !!}',
+		delete : '{!! URL::action("Api\ApiEndpointController@delete",array("id"=>"@id")) !!}',
+		activate:'{!! URL::action("Api\ApiEndpointController@activate",array("id"=>"@id")) !!}',
+		deactivate: '{!! URL::action("Api\ApiEndpointController@deactivate",array("id"=>"@id")) !!}',
+		add : '{!! URL::action("Api\ApiEndpointController@create") !!}'
 	};
 
     var editApiMessages = {
-        success: '{{ Lang::get("messages.global_successfully_save_entity", array("entity" => "API")) }}'
+        success: '@lang("messages.global_successfully_save_entity", array("entity" => "API"))'
     };
 </script>
-{{ HTML::script('assets/js/oauth2/profile/admin/edit-api.js') }}
+{!! HTML::script('assets/js/oauth2/profile/admin/edit-api.js') !!}
 
 @append
\ No newline at end of file
diff --git a/app/views/oauth2/profile/admin/edit-endpoint.blade.php b/resources/views/oauth2/profile/admin/edit-endpoint.blade.php
similarity index 69%
rename from app/views/oauth2/profile/admin/edit-endpoint.blade.php
rename to resources/views/oauth2/profile/admin/edit-endpoint.blade.php
index 5c26d042..84657ab1 100644
--- a/app/views/oauth2/profile/admin/edit-endpoint.blade.php
+++ b/resources/views/oauth2/profile/admin/edit-endpoint.blade.php
@@ -6,38 +6,38 @@
 
 @section('content')
     @include('menu',array('is_oauth2_admin' => $is_oauth2_admin, 'is_openstackid_admin' => $is_openstackid_admin))
-    <a href='{{  URL::action("AdminController@editApi", array("id"=>$endpoint->api_id)) }}'>Go Back</a>
-    <legend>{{ Lang::get("messages.edit_endpoint_title", array("id" => $endpoint->id)) }}</legend>
+    <a href='{!! URL::action("AdminController@editApi", array("id"=>$endpoint->api_id)) !!}'>Go Back</a>
+    <legend>@lang("messages.edit_endpoint_title", array("id" => $endpoint->id))</legend>
     <div class="row-fluid">
         <div class="span6">
-            <form id="endpoint-form" name="endpoint-form" action='{{URL::action("ApiEndpointController@update",null)}}'>
+            <form id="endpoint-form" name="endpoint-form" action='{!!URL::action("Api\\ApiEndpointController@update",null)!!}'>
                 <div class="form-group">
                     <label for="name">Name</label>
-                    <input class="form-control" type="text" name="name" id="name" value="{{ $endpoint->name }}">
+                    <input class="form-control" type="text" name="name" id="name" value="{!! $endpoint->name !!}">
                 </div>
                 <div class="form-group">
                     <label for="description">Description</label>
                     <textarea class="form-control" style="resize: none;" rows="4" cols="50" name="description"
-                              id="description">{{ $endpoint->description}}</textarea>
+                              id="description">{!! $endpoint->description!!}</textarea>
                 </div>
                 <div class="form-group">
                     <label for="route">Route&nbsp;<span aria-hidden="true"
                                                         class="glyphicon glyphicon-info-sign pointable"
                                                         title=''></span></label>
-                    <input  class="form-control" type="text" name="route" id="route" value="{{ $endpoint->route }}">
+                    <input  class="form-control" type="text" name="route" id="route" value="{!! $endpoint->route !!}">
                 </div>
 
                 <div class="form-group">
                     <label for="rate_limit">Rate Limit (Per Hour)&nbsp;<span aria-hidden="true"
                                                                        class="glyphicon glyphicon-info-sign pointable"
                                                                        title=''></span></label>
-                    <input class="form-control" type="number" name="rate_limit" id="rate_limit" value="{{ $endpoint->rate_limit }}">
+                    <input class="form-control" type="number" name="rate_limit" id="rate_limit" value="{!! $endpoint->rate_limit !!}">
                 </div>
                 <div class="form-group">
                     <label for="http_method">HTTP Method&nbsp;<span aria-hidden="true"
                                                                     class="glyphicon glyphicon-info-sign pointable"
                                                                     title=''></span></label>
-                    {{ Form::select('http_method', array('GET' => 'GET', 'POST' => 'POST', 'PUT' => 'PUT', 'DELETE' => 'DELETE'), $endpoint->http_method,array('class' => 'form-control', 'id' => 'http_method')); }}
+                    {!! Form::select('http_method', array('GET' => 'GET', 'POST' => 'POST', 'PUT' => 'PUT', 'DELETE' => 'DELETE'), $endpoint->http_method,array('class' => 'form-control', 'id' => 'http_method')); !!}
                 </div>
                 <div class="checkbox">
                     <label>
@@ -61,33 +61,32 @@
                 </div>
 
                 <button type="submit" class="btn btn-default active">Save</button>
-                <input type="hidden" name="id" id="id" value="{{ $endpoint->id }}"/>
+                <input type="hidden" name="id" id="id" value="{!! $endpoint->id !!}"/>
             </form>
         </div>
     </div>
 
     <div class="row">
         <div class="col-md-6">
-            <legend>{{Lang::get("messages.edit_endpoint_scope_title")}}&nbsp;<span aria-hidden="true"
+            <legend>@lang("messages.edit_endpoint_scope_title")&nbsp;<span aria-hidden="true"
                                                                                    class="glyphicon glyphicon-info-sign pointable"
-                                                                                   title='{{Lang::get("messages.edit_endpoint_scope_info_title")}}'></span>
+                                                                                   title='@lang("messages.edit_endpoint_scope_info_title")'></span>
             </legend>
             <ul class="unstyled list-inline">
                 @foreach($endpoint->api()->first()->scopes()->get() as $scope)
-                    {{-- scope header --}}
                     <li>
                         <div class="checkbox">
                             <label>
                                 <input type="checkbox"
-                                       data-add-link='{{ URL::action("ApiEndpointController@addRequiredScope", array("id"=>$endpoint->id,"scope_id"=>$scope->id )) }}'
-                                       data-remove-link='{{ URL::action("ApiEndpointController@removeRequiredScope", array("id"=>$endpoint->id,"scope_id"=>$scope->id )) }}'
+                                       data-add-link='{!! URL::action("Api\ApiEndpointController@addRequiredScope", array("id"=>$endpoint->id,"scope_id"=>$scope->id )) !!}'
+                                       data-remove-link='{!! URL::action("Api\ApiEndpointController@removeRequiredScope", array("id"=>$endpoint->id,"scope_id"=>$scope->id )) !!}'
                                        class="scope-checkbox" id="scope[]"
                                        @if ( in_array($scope->id,$selected_scopes))
                                        checked
                                        @endif
-                                       value="{{$scope->id}}"/><span>{{trim($scope->name)}}</span>&nbsp;<span
-                                        aria-hidden="true" class="glyphicon glyphicon-info-sign pointable"
-                                        title="{{$scope->description}}"></span>
+                                       value="{!!$scope->id!!}"/><span>{!!trim($scope->name)!!}</span>&nbsp;<span
+                                       aria-hidden="true" class="glyphicon glyphicon-info-sign pointable"
+                                       title="{!!$scope->description!!}"></span>
                             </label>
                         </div>
                     </li>
@@ -101,8 +100,8 @@
 @section('scripts')
     <script type="application/javascript">
         var editEndpointMessages = {
-            success: '{{ Lang::get("messages.global_successfully_save_entity", array("entity" => "Endpoint")) }}'
+            success: '@lang("messages.global_successfully_save_entity", array("entity" => "Endpoint"))'
         };
     </script>
-    {{ HTML::script('assets/js/oauth2/profile/admin/edit-endpoint.js') }}
+    {!! HTML::script('assets/js/oauth2/profile/admin/edit-endpoint.js') !!}
 @append
\ No newline at end of file
diff --git a/app/views/oauth2/profile/admin/edit-resource-server.blade.php b/resources/views/oauth2/profile/admin/edit-resource-server.blade.php
similarity index 63%
rename from app/views/oauth2/profile/admin/edit-resource-server.blade.php
rename to resources/views/oauth2/profile/admin/edit-resource-server.blade.php
index 005038ee..0981d12b 100644
--- a/app/views/oauth2/profile/admin/edit-resource-server.blade.php
+++ b/resources/views/oauth2/profile/admin/edit-resource-server.blade.php
@@ -5,30 +5,30 @@
 @stop
 
 @section('css')
-    {{ HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.css') }}
+    {!! HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.css') !!}
 @append
 
 @section('content')
 @include('menu',array('is_oauth2_admin' => $is_oauth2_admin, 'is_openstackid_admin' => $is_openstackid_admin))
-<a href="{{ URL::action("AdminController@listResourceServers") }}">Go Back</a>
-<legend>Edit Resource Server - Id {{ $resource_server->id }}</legend>
+<a href="{!! URL::action("AdminController@listResourceServers") !!}">Go Back</a>
+<legend>Edit Resource Server - Id {!! $resource_server->id !!}</legend>
 <div class="row">
     <div class="col-md-12">
-        <form id="resource-server-form" name="resource-server-form" action='{{URL::action("ApiResourceServerController@update",null)}}'>
+        <form id="resource-server-form" name="resource-server-form" action='{!!URL::action("Api\\ApiResourceServerController@update",null)!!}'>
              <div class="form-group">
                     <label class="control-label" for="host">Host&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title=""></span></label>
-                    <input type="text" class="form-control" name="host" id="host" value="{{ $resource_server->host }}">
+                    <input type="text" class="form-control" name="host" id="host" value="{!! $resource_server->host !!}">
                 </div>
 
                 <div class="form-group">
                     <label class="control-label" for="friendly_name">Friendly Name&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title=""></span></label>
-                    <input type="text" class="form-control" name="friendly_name" id="friendly_name" value="{{ $resource_server->friendly_name }}">
+                    <input type="text" class="form-control" name="friendly_name" id="friendly_name" value="{!! $resource_server->friendly_name !!}">
                 </div>
 
             <div class="form-group">
                 <label for="ip">IP Addresses&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true"
                                                            title=""></span></label>
-                <input type="text" name="ips" id="ips" value="{{$resource_server->ips}}"
+                <input type="text" name="ips" id="ips" value="{!!$resource_server->ips!!}"
                        style="width: 100%"></input>
             </div>
 
@@ -52,7 +52,7 @@
                                     <label for="client_id" class="label-client-secret">Client ID</label>
                                 </div>
                                 <div class="col-lg-9">
-                                    <span id="client_id">{{ $resource_server->client()->first()->client_id }}</span>
+                                    <span id="client_id">{!! $resource_server->client()->first()->client_id !!}</span>
                                 </div>
                             </div>
                             <div class="row">
@@ -60,10 +60,10 @@
                                     <label for="client_secret" class="label-client-secret">Client Secret</label>
                                 </div>
                                 <div class="col-lg-7">
-                                    <span id="client_secret">{{ $resource_server->client()->first()->client_secret }}</span>
+                                    <span id="client_secret">{!! $resource_server->client()->first()->client_secret !!}</span>
                                 </div>
                                 <div class="col-lg-2">
-                                    {{ HTML::link(URL::action("ApiResourceServerController@regenerateClientSecret",array("id"=> $resource_server->id)),'Regenerate',array('class'=>'btn regenerate-client-secret btn-xs btn-default active btn-delete','title'=>'Regenerates Client Secret')) }}
+                                    {!! HTML::link(URL::action("Api\\ApiResourceServerController@regenerateClientSecret",array("id"=> $resource_server->id)),'Regenerate',array('class'=>'btn regenerate-client-secret btn-xs btn-default active btn-delete','title'=>'Regenerates Client Secret')) !!}
                                 </div>
 
                             </div>
@@ -76,7 +76,7 @@
                         <button type="submit" class="btn btn-default active btn-lg">Save</button>
                     </div>
                 </div>
-                <input type="hidden" name="id" id="id" value="{{ $resource_server->id }}"/>
+                <input type="hidden" name="id" id="id" value="{!! $resource_server->id !!}"/>
 
         </form>
     </div>
@@ -87,7 +87,7 @@
     <div class="col-md-12">
         <div class="row">
             <div class="col-md-12">
-                {{ HTML::link(URL::action("ApiController@create"),'Register API',array('class'=>'btn btn-primary active btn-sm add-api','title'=>'Adds a New API')) }}
+                {!! HTML::link(URL::action("Api\\ApiController@create"),'Register API',array('class'=>'btn btn-primary active btn-sm add-api','title'=>'Adds a New API')) !!}
             </div>
         </div>
         <div class="row">
@@ -111,19 +111,19 @@
                     <tbody id="body-apis">
                     @foreach($resource_server->apis()->get() as $api)
                         <tr>
-                            <td><img src="{{ $api->getLogo()}}"  height="24" width="24" alt="{{ $api->name}} logo"/></td>
-                            <td width="60%">{{ $api->name}}</td>
+                            <td><img src="{!! $api->getLogo()!!}"  height="24" width="24" alt="{!! $api->name!!} logo"/></td>
+                            <td width="60%">{!! $api->name!!}</td>
                             <td>
-                                <input type="checkbox" class="api-active-checkbox" data-api-id="{{$api->id}}" id="resource-server-api-active_{{$api->id}}"
+                                <input type="checkbox" class="api-active-checkbox" data-api-id="{!!$api->id!!}" id="resource-server-api-active_{!!$api->id!!}"
                                        @if ( $api->active)
                                        checked
                                        @endif
-                                       value="{{$api->id}}"/>
+                                       value="{!!$api->id!!}"/>
                             </td>
                             <td>
                                 &nbsp;
-                                {{ HTML::link(URL::action("AdminController@editApi",array("id"=>$api->id)),'Edit',array('class'=>'btn btn-default active edit-api','title'=>'Edits a Registered Resource Server API')) }}
-                                {{ HTML::link(URL::action("ApiController@delete",array("id"=>$api->id)),'Delete',array('class'=>'btn btn-default btn-delete active delete-api','title'=>'Deletes a Registered Resource Server API'))}}
+                                {!! HTML::link(URL::action("AdminController@editApi",array("id"=>$api->id)),'Edit',array('class'=>'btn btn-default active edit-api','title'=>'Edits a Registered Resource Server API')) !!}
+                                {!! HTML::link(URL::action("Api\\ApiController@delete",array("id"=>$api->id)),'Delete',array('class'=>'btn btn-default btn-delete active delete-api','title'=>'Deletes a Registered Resource Server API'))!!}
                             </td>
                         </tr>
                     @endforeach
@@ -139,21 +139,21 @@
 @section('scripts')
 <script type="application/javascript">
 
-    var resource_server_id = {{ $resource_server->id}};
+    var resource_server_id = {!! $resource_server->id!!};
 
 	var ApiUrls = {
-		get : '{{ URL::action("ApiController@getByPage",array("offset"=>1,"limit"=>1000,"resource_server_id"=>$resource_server->id)) }}',
-		edit : '{{ URL::action("AdminController@editApi",array("id"=>-1)) }}',
-		delete : '{{ URL::action("ApiController@delete",array("id"=>-1)) }}',
-		add : '{{URL::action("ApiController@create",null)}}',
-		activate: '{{ URL::action("ApiController@activate",array("id"=>"@id")) }}',
-		deactivate: '{{ URL::action("ApiController@deactivate",array("id"=>"@id")) }}'
+		get : '{!! URL::action("Api\\ApiController@getByPage",array("offset"=>1,"limit"=>1000,"resource_server_id"=>$resource_server->id)) !!}',
+		edit : '{!! URL::action("AdminController@editApi",array("id"=>-1)) !!}',
+		delete : '{!! URL::action("Api\\ApiController@delete",array("id"=>-1)) !!}',
+		add : '{!!URL::action("Api\\ApiController@create",null)!!}',
+		activate: '{!! URL::action("Api\\ApiController@activate",array("id"=>"@id")) !!}',
+		deactivate: '{!! URL::action("Api\\ApiController@deactivate",array("id"=>"@id")) !!}'
 	};
 
 	var resourceServerMessages = {
-		success : '{{ Lang::get("messages.global_successfully_save_entity", array("entity" => "Resource Server")) }}'
+		success : '@lang("messages.global_successfully_save_entity", array("entity" => "Resource Server"))'
 	};
 </script>
-{{ HTML::script('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.js')}}
-{{ HTML::script('assets/js/oauth2/profile/admin/edit-resource-server.js') }}
+{!! HTML::script('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.js')!!}
+{!! HTML::script('assets/js/oauth2/profile/admin/edit-resource-server.js') !!}
 @append
\ No newline at end of file
diff --git a/app/views/oauth2/profile/admin/edit-scope.blade.php b/resources/views/oauth2/profile/admin/edit-scope.blade.php
similarity index 77%
rename from app/views/oauth2/profile/admin/edit-scope.blade.php
rename to resources/views/oauth2/profile/admin/edit-scope.blade.php
index f3852ae3..52252501 100644
--- a/app/views/oauth2/profile/admin/edit-scope.blade.php
+++ b/resources/views/oauth2/profile/admin/edit-scope.blade.php
@@ -4,24 +4,24 @@
 @stop
 @section('content')
     @include('menu',array('is_oauth2_admin' => $is_oauth2_admin, 'is_openstackid_admin' => $is_openstackid_admin))
-    <a href='{{  URL::action("AdminController@editApi",array("id"=>$scope->api_id)) }}'>Go Back</a>
-    <legend>Edit API Scope - Id {{ $scope->id }}</legend>
+    <a href='{!!  URL::action("AdminController@editApi",array("id"=>$scope->api_id)) !!}'>Go Back</a>
+    <legend>Edit API Scope - Id {!! $scope->id !!}</legend>
     <div class="row">
         <div class="col-md-6">
-            <form id="scope-form" name="scope-form" action='{{URL::action("ApiScopeController@update",null)}}'>
+            <form id="scope-form" name="scope-form" action='{!!URL::action("Api\\ApiScopeController@update",null)!!}'>
                 <div class="form-group">
                     <label for="name">Name</label>
-                    <input class="form-control" type="text" name="name" id="name" value="{{ $scope->name }}">
+                    <input class="form-control" type="text" name="name" id="name" value="{!! $scope->name !!}">
                 </div>
                 <div class="form-group">
                     <label for="description">Description</label>
                      <textarea class="form-control" style="resize: none;" rows="4" cols="50" name="description"
-                                  id="description">{{ $scope->description}}</textarea>
+                                  id="description">{!! $scope->description!!}</textarea>
                 </div>
                 <div class="form-group">
                     <label for="short_description">Short Description</label>
                      <textarea class="form-control" style="resize: none;" rows="4" cols="50" name="short_description"
-                                  id="short_description">{{ $scope->short_description}}</textarea>
+                                  id="short_description">{!! $scope->short_description!!}</textarea>
                 </div>
                 <div class="checkbox">
                     <label>
@@ -61,7 +61,7 @@
                     </label>
                 </div>
                 <button type="submit" class="btn btn-default active">Save</button>
-                <input type="hidden" name="id" id="id" value="{{ $scope->id }}"/>
+                <input type="hidden" name="id" id="id" value="{!! $scope->id !!}"/>
             </form>
         </div>
     </div>
@@ -70,8 +70,8 @@
 @section('scripts')
     <script type="application/javascript">
         var editScopeMessages = {
-            success: '{{ Lang::get("messages.global_successfully_save_entity", array("entity" => "Scope")) }}'
+            success: '@lang("messages.global_successfully_save_entity", array("entity" => "Scope"))'
         };
     </script>
-    {{ HTML::script('assets/js/oauth2/profile/admin/edit-scope.js') }}
+    {!! HTML::script('assets/js/oauth2/profile/admin/edit-scope.js') !!}
 @append
\ No newline at end of file
diff --git a/app/views/oauth2/profile/admin/endpoint-add-form.blade.php b/resources/views/oauth2/profile/admin/endpoint-add-form.blade.php
similarity index 100%
rename from app/views/oauth2/profile/admin/endpoint-add-form.blade.php
rename to resources/views/oauth2/profile/admin/endpoint-add-form.blade.php
diff --git a/app/views/oauth2/profile/admin/resource-server-add-form.blade.php b/resources/views/oauth2/profile/admin/resource-server-add-form.blade.php
similarity index 100%
rename from app/views/oauth2/profile/admin/resource-server-add-form.blade.php
rename to resources/views/oauth2/profile/admin/resource-server-add-form.blade.php
diff --git a/app/views/oauth2/profile/admin/resource-server-api-add-form.blade.php b/resources/views/oauth2/profile/admin/resource-server-api-add-form.blade.php
similarity index 100%
rename from app/views/oauth2/profile/admin/resource-server-api-add-form.blade.php
rename to resources/views/oauth2/profile/admin/resource-server-api-add-form.blade.php
diff --git a/app/views/oauth2/profile/admin/resource-servers.blade.php b/resources/views/oauth2/profile/admin/resource-servers.blade.php
similarity index 52%
rename from app/views/oauth2/profile/admin/resource-servers.blade.php
rename to resources/views/oauth2/profile/admin/resource-servers.blade.php
index ec7473b1..1427df50 100644
--- a/app/views/oauth2/profile/admin/resource-servers.blade.php
+++ b/resources/views/oauth2/profile/admin/resource-servers.blade.php
@@ -5,7 +5,7 @@
 @stop
 
 @section('css')
-    {{ HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.css') }}
+    {!! HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.css') !!}
 @append
 
 @section('content')
@@ -24,7 +24,7 @@
     </div>
     <div class="row">
         <div class="col-md-12">
-            {{ HTML::link(URL::action("ApiResourceServerController@create"),'Add Resource Server',array('class'=>'btn active btn-primary add-resource-server','title'=>'Adds a New Resource Server')) }}
+            {!! HTML::link(URL::action("Api\ApiResourceServerController@create"),'Add Resource Server',array('class'=>'btn active btn-primary add-resource-server','title'=>'Adds a New Resource Server')) !!}
         </div>
     </div>
     <table id='table-resource-servers' class="table table-hover table-condensed">
@@ -39,22 +39,22 @@
         </thead>
         <tbody id="body-resource-servers">
         @foreach ($resource_servers as $resource_server)
-        <tr id="{{ $resource_server->id }}">
-            <td width="25%">{{$resource_server->friendly_name}}</td>
-            <td width="25%">{{$resource_server->host}}</td>
-            <td width="10%">{{$resource_server->ips}}</td>
+        <tr id="{!! $resource_server->id !!}">
+            <td width="25%">{!!$resource_server->friendly_name!!}</td>
+            <td width="25%">{!!$resource_server->host!!}</td>
+            <td width="10%">{!!$resource_server->ips!!}</td>
             <td width="5%">
-                <input type="checkbox" class="resource-server-active-checkbox" id="resource-server-active_{{$resource_server->id}}"
-                       data-resource-server-id="{{$resource_server->id}}"
+                <input type="checkbox" class="resource-server-active-checkbox" id="resource-server-active_{!!$resource_server->id!!}"
+                       data-resource-server-id="{!!$resource_server->id!!}"
                 @if ( $resource_server->active)
                 checked
                 @endif
-                value="{{$resource_server->id}}"/>
+                value="{!!$resource_server->id!!}"/>
             </td>
             <td width="25%">
                 &nbsp;
-                {{ HTML::link(URL::action("AdminController@editResourceServer",array("id"=>$resource_server->id)),'Edit',array('class'=>'btn btn-default active edit-resource-server','title'=>'Edits a Registered Resource Server')) }}
-                {{ HTML::link(URL::action("ApiResourceServerController@delete",array("id"=>$resource_server->id)),'Delete',array('class'=>'btn btn-default btn-delete active delete-resource-server','title'=>'Deletes a Registered Resource Server')) }}
+                {!! HTML::link(URL::action("AdminController@editResourceServer",array("id"=>$resource_server->id)),'Edit',array('class'=>'btn btn-default active edit-resource-server','title'=>'Edits a Registered Resource Server')) !!}
+                {!! HTML::link(URL::action("Api\ApiResourceServerController@delete",array("id"=>$resource_server->id)),'Delete',array('class'=>'btn btn-default btn-delete active delete-resource-server','title'=>'Deletes a Registered Resource Server')) !!}
             </td>
         </tr>
         @endforeach
@@ -69,14 +69,14 @@
 @section('scripts')
 <script type="application/javascript">
 	var resourceServerUrls = {
-		get : '{{URL::action("ApiResourceServerController@getByPage",array("offset"=>1,"limit"=>1000))}}',
-		edit : '{{ URL::action("AdminController@editResourceServer",array("id"=>-1)) }}',
-		delete : '{{ URL::action("ApiResourceServerController@delete",array("id"=>-1)) }}',
-		activate : '{{ URL::action("ApiResourceServerController@activate",array("id"=>"@id")) }}',
-		deactivate : '{{ URL::action("ApiResourceServerController@deactivate",array("id"=>"@id")) }}',
-		add : '{{URL::action("ApiResourceServerController@create",null)}}'
+		get : '{!!URL::action("Api\ApiResourceServerController@getByPage",array("offset"=>1,"limit"=>1000))!!}',
+		edit : '{!! URL::action("AdminController@editResourceServer",array("id"=>-1)) !!}',
+		delete : '{!! URL::action("Api\ApiResourceServerController@delete",array("id"=>-1)) !!}',
+		activate : '{!! URL::action("Api\ApiResourceServerController@activate",array("id"=>"@id")) !!}',
+		deactivate : '{!! URL::action("Api\ApiResourceServerController@deactivate",array("id"=>"@id")) !!}',
+		add : '{!!URL::action("Api\ApiResourceServerController@create",null)!!}'
 	};
 </script>
-{{ HTML::script('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.js')}}
-{{ HTML::script('assets/js/oauth2/profile/admin/resource-servers.js') }}
+{!! HTML::script('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.js')!!}
+{!! HTML::script('assets/js/oauth2/profile/admin/resource-servers.js') !!}
 @append
\ No newline at end of file
diff --git a/app/views/oauth2/profile/admin/scope-add-form.blade.php b/resources/views/oauth2/profile/admin/scope-add-form.blade.php
similarity index 100%
rename from app/views/oauth2/profile/admin/scope-add-form.blade.php
rename to resources/views/oauth2/profile/admin/scope-add-form.blade.php
diff --git a/app/views/oauth2/profile/admin/server-private-key-add-form.blade.php b/resources/views/oauth2/profile/admin/server-private-key-add-form.blade.php
similarity index 92%
rename from app/views/oauth2/profile/admin/server-private-key-add-form.blade.php
rename to resources/views/oauth2/profile/admin/server-private-key-add-form.blade.php
index 7efd7f98..27f01704 100644
--- a/app/views/oauth2/profile/admin/server-private-key-add-form.blade.php
+++ b/resources/views/oauth2/profile/admin/server-private-key-add-form.blade.php
@@ -18,12 +18,12 @@
     </div>
     <div class="form-group">
         <label class="control-label" for="usage">Usage&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="The 'use' parameter identifies the intended use of the key."></span></label>
-        {{ Form::select('usage', utils\ArrayUtils::convert2Assoc(\jwk\JSONWebKeyPublicKeyUseValues::$valid_uses) ,null , array('class' => 'form-control', 'id' => 'usage')) }}
+        {!! Form::select('usage', Utils\ArrayUtils::convert2Assoc(\jwk\JSONWebKeyPublicKeyUseValues::$valid_uses) ,null , array('class' => 'form-control', 'id' => 'usage')) !!}
     </div>
     <div class="form-group">
         <label class="control-label" for="alg">Algorithm&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="identifies the algorithm intended for
    use with the key"></span></label>
-        {{ Form::select('alg', array() ,null , array('class' => 'form-control', 'id' => 'alg')) }}
+        {!! Form::select('alg', array() ,null , array('class' => 'form-control', 'id' => 'alg')) !!}
     </div>
     <div class="form-group">
         <label class="control-label" for="password">Key Password&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title=""></span></label>
diff --git a/app/views/oauth2/profile/admin/server-private-keys.blade.php b/resources/views/oauth2/profile/admin/server-private-keys.blade.php
similarity index 58%
rename from app/views/oauth2/profile/admin/server-private-keys.blade.php
rename to resources/views/oauth2/profile/admin/server-private-keys.blade.php
index c97b242c..4cdc20db 100644
--- a/app/views/oauth2/profile/admin/server-private-keys.blade.php
+++ b/resources/views/oauth2/profile/admin/server-private-keys.blade.php
@@ -3,32 +3,32 @@
     <title>Welcome to OpenStackId - Server Admin - Server Private Keys</title>
 @stop
 @section('css')
-    {{ HTML::style('bower_assets/bootstrap-datepicker/dist/css/bootstrap-datepicker.min.css') }}
-    {{ HTML::style('assets/css/private-keys.css') }}
+    {!! HTML::style('bower_assets/bootstrap-datepicker/dist/css/bootstrap-datepicker.min.css') !!}
+    {!! HTML::style('assets/css/private-keys.css') !!}
 @append
 @section('scripts')
-    {{ HTML::script('bower_assets/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js')}}
-    {{ HTML::script('bower_assets/pwstrength-bootstrap/dist/pwstrength-bootstrap-1.2.7.min.js')}}
-    {{ HTML::script('assets/js/oauth2/profile/admin/server-private-keys.js') }}
+    {!! HTML::script('bower_assets/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js')!!}
+    {!! HTML::script('bower_assets/pwstrength-bootstrap/dist/pwstrength-bootstrap-1.2.7.min.js')!!}
+    {!! HTML::script('assets/js/oauth2/profile/admin/server-private-keys.js') !!}
 
     <script type="application/javascript">
         var privateKeyUrls =
         {
-            add: '{{URL::action("ServerPrivateKeyApiController@create")}}',
-            get: '{{URL::action("ServerPrivateKeyApiController@getByPage")}}',
-            delete: '{{URL::action("ServerPrivateKeyApiController@delete",array("id" =>'@id'))}}',
-            update: '{{URL::action("ServerPrivateKeyApiController@update",array('public_key_id'=> '@id'))}}'
+            add: '{!!URL::action("Api\ServerPrivateKeyApiController@create")!!}',
+            get: '{!!URL::action("Api\ServerPrivateKeyApiController@getByPage")!!}',
+            delete: '{!!URL::action("Api\ServerPrivateKeyApiController@delete",array("id" =>'@id'))!!}',
+            update: '{!!URL::action("Api\ServerPrivateKeyApiController@update",array('public_key_id'=> '@id'))!!}'
         };
 
         var oauth2_supported_algorithms =
         {
             sig_algorihtms:
             {
-                mac:{{utils\ArrayUtils::toJson(oauth2\OAuth2Protocol::$supported_signing_algorithms_hmac_sha2)}},
-                rsa:{{utils\ArrayUtils::toJson(oauth2\OAuth2Protocol::$supported_signing_algorithms_rsa)}}
+                mac:{!!Utils\ArrayUtils::toJson(OAuth2\OAuth2Protocol::$supported_signing_algorithms_hmac_sha2)!!},
+                rsa:{!!Utils\ArrayUtils::toJson(OAuth2\OAuth2Protocol::$supported_signing_algorithms_rsa)!!}
             },
-            key_management_algorihtms: {{utils\ArrayUtils::toJson(oauth2\OAuth2Protocol::$supported_key_management_algorithms)}},
-            content_encryption_algorihtms:  {{utils\ArrayUtils::toJson(oauth2\OAuth2Protocol::$supported_content_encryption_algorithms)}}
+            key_management_algorihtms: {!!Utils\ArrayUtils::toJson(OAuth2\OAuth2Protocol::$supported_key_management_algorithms)!!},
+            content_encryption_algorihtms:  {!!Utils\ArrayUtils::toJson(OAuth2\OAuth2Protocol::$supported_content_encryption_algorithms)!!}
         };
     </script>
 @append
@@ -55,14 +55,14 @@
         </thead>
         <tbody id="body-private-keys">
         @foreach ($private_keys as $private_key)
-            <tr id="tr_{{$private_key->id}}">
+            <tr id="tr_{!!$private_key->id!!}">
                 <td width="7%">
                     <div class="row">
                         <div class="col-md-6">
-                            <span data-private-key-id="{{$private_key->id}}" class="badge private-key-status {{ $private_key->active ? 'private-key-active':'private-key-deactivated' }}" title="{{ $private_key->active ? 'active':'deactivated' }}">&nbsp;</span>
+                            <span data-private-key-id="{!!$private_key->id!!}" class="badge private-key-status {!! $private_key->active ? 'private-key-active':'private-key-deactivated' !!}" title="{!! $private_key->active ? 'active':'deactivated' !!}">&nbsp;</span>
                         </div>
                         <div class="col-md-6 col-md-offset-neg-1">
-                            <i class="fa fa-key fa-2x pointable" title="{{$private_key->kid}}&nbsp;({{$private_key->type}})"></i>
+                            <i class="fa fa-key fa-2x pointable" title="{!!$private_key->kid!!}&nbsp;({!!$private_key->type!!})"></i>
                         </div>
                     </div>
                 </td>
@@ -71,23 +71,23 @@
                         <div class="col-md-12">
                             <div class="row">
                                 <div class="col-md-12">
-                                    <strong class="private-key-title">{{$private_key->kid}}&nbsp;<span class="badge private-key-usage pointable" title="use: identifies the intended use of the public key">{{$private_key->usage}}</span>&nbsp;<span class="label label-info pointable" title="Key Type">{{$private_key->type}}</span>&nbsp;<span class="label label-primary pointable" title="alg: identifies the algorithm intended for use with the key">{{$private_key->alg}}</span></strong>
+                                    <strong class="private-key-title">{!!$private_key->kid!!}&nbsp;<span class="badge private-key-usage pointable" title="use: identifies the intended use of the public key">{!!$private_key->usage!!}</span>&nbsp;<span class="label label-info pointable" title="Key Type">{!!$private_key->type!!}</span>&nbsp;<span class="label label-primary pointable" title="alg: identifies the algorithm intended for use with the key">{!!$private_key->alg!!}</span></strong>
                                 </div>
                             </div>
                             <div class="row">
                                 <div class="col-md-12">
-                                    <code class="private-key-fingerprint">{{$private_key->getSHA_256_Thumbprint()}}</code>
+                                    <code class="private-key-fingerprint">{!!$private_key->getSHA_256_Thumbprint()!!}</code>
                                 </div>
                             </div>
                             <div class="row">
                                 <div class="col-md-12">
-                                    <span class="private-key-validity-range">valid from <strong>{{$private_key->valid_from}}</strong> to <strong>{{$private_key->valid_to}}</strong></span>
+                                    <span class="private-key-validity-range">valid from <strong>{!!$private_key->valid_from!!}</strong> to <strong>{!!$private_key->valid_to!!}</strong></span>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </td>
-                <td><a class="btn btn-default btn-sm active delete-private-key btn-delete" href="#" data-private-key-id="{{$private_key->id}}">Delete</a></td>
+                <td><a class="btn btn-default btn-sm active delete-private-key btn-delete" href="#" data-private-key-id="{!!$private_key->id!!}">Delete</a></td>
             </tr>
         @endforeach
         </tbody>
diff --git a/app/views/oauth2/profile/clients.blade.php b/resources/views/oauth2/profile/clients.blade.php
similarity index 63%
rename from app/views/oauth2/profile/clients.blade.php
rename to resources/views/oauth2/profile/clients.blade.php
index 7136eb70..431f9025 100644
--- a/app/views/oauth2/profile/clients.blade.php
+++ b/resources/views/oauth2/profile/clients.blade.php
@@ -11,7 +11,7 @@
                           title="Users can keep track of their registered applications and manage them"></span>&nbsp;Registered
                 Applications
             </legend>
-            {{ HTML::link(URL::action("ClientApiController@create",null),'Register Application',array('class'=>'btn btn-primary btn-md active add-client','title'=>'Adds a Registered Application')) }}
+            {!! HTML::link(URL::action("Api\ClientApiController@create",null),'Register Application',array('class'=>'btn btn-primary btn-md active add-client','title'=>'Adds a Registered Application')) !!}
             @if (count($clients)>0)
                 <table id='tclients' class="table table-hover table-condensed">
                     <thead>
@@ -28,33 +28,32 @@
                     </thead>
                     <tbody id="body-registered-clients">
                     @foreach ($clients as $client)
-
                         <tr>
                             <td>@if (!$client->isOwner(Auth::user()))<i title="you have admin rights on this application" class="fa fa-user"></i>@endif</td>
-                            <td>{{ $client->app_name }}</td>
-                            <td>{{ $client->getFriendlyApplicationType()}}</td>
+                            <td>{!! $client->app_name !!}</td>
+                            <td>{!! $client->getFriendlyApplicationType()!!}</td>
                             <td>
                                 @if ($client->isOwner(Auth::user()))
-                                <input type="checkbox" class="app-active-checkbox" id="app-active_{{$client->id}}"
+                                <input type="checkbox" class="app-active-checkbox" id="app-active_{!!$client->id!!}"
                                        @if ( $client->active)
                                        checked
                                        @endif
-                                       value="{{$client->id}}"/>
+                                       value="{!!$client->id!!}"/>
                                 @endif
                             </td>
                             <td>
-                                <input type="checkbox" class="app-locked-checkbox" id="app-locked_{{$client->id}}"
+                                <input type="checkbox" class="app-locked-checkbox" id="app-locked_{!!$client->id!!}"
                                 @if ( $client->locked)
                                        checked
                                        @endif
-                                       value="{{$client->id}}" disabled="disabled" />
+                                       value="{!!$client->id!!}" disabled="disabled" />
                             </td>
-                            <td>{{ $client->updated_at }}</td>
-                            <td>{{ $client->getEditedByNice() }}</td>
+                            <td>{!! $client->updated_at !!}</td>
+                            <td>{!! $client->getEditedByNice() !!}</td>
                             <td>&nbsp;
-                                {{ HTML::link(URL::action("AdminController@editRegisteredClient",array("id"=>$client->id)),'Edit',array('class'=>'btn btn-default btn-md active edit-client','title'=>'Edits a Registered Application')) }}
+                                {!! HTML::link(URL::action("AdminController@editRegisteredClient",array("id"=>$client->id)),'Edit',array('class'=>'btn btn-default btn-md active edit-client','title'=>'Edits a Registered Application')) !!}
                                 @if ($client->canDelete(Auth::user()))
-                                {{ HTML::link(URL::action("ClientApiController@delete",array("id"=>$client->id)),'Delete',array('class'=>'btn btn-default btn-md active del-client','title'=>'Deletes a Registered Application')) }}</td>
+                                {!! HTML::link(URL::action("Api\ClientApiController@delete",array("id"=>$client->id)),'Delete',array('class'=>'btn btn-default btn-md active del-client','title'=>'Deletes a Registered Application')) !!}</td>
                                 @endif
                         </tr>
                     @endforeach
@@ -90,23 +89,23 @@
 
 @section('scripts')
     <script type="application/javascript">
-        var userId = {{$user_id}};
+        var userId = {!!$user_id!!};
         var clientsUrls = {
-            load: '{{ URL::action("ClientApiController@getByPage",array("offset"=>1,"limit"=>1000,"user_id"=>$user_id ))}}',
-            edit: '{{ URL::action("AdminController@editRegisteredClient",array("id"=>"@id")) }}',
-            delete: '{{ URL::action("ClientApiController@delete",array("id"=>"@id")) }}',
-            add: '{{URL::action("ClientApiController@create",null)}}',
-            activate: '{{ URL::action("ClientApiController@activate",array("id"=>"@id")) }}',
-            deactivate: '{{ URL::action("ClientApiController@deactivate",array("id"=>"@id")) }}',
-            fetchUsers: '{{URL::action("UserApiController@fetch",null)}}',
+            load: '{!! URL::action("Api\\ClientApiController@getByPage",array("offset"=>1,"limit"=>1000,"user_id"=>$user_id ))!!}',
+            edit: '{!! URL::action("AdminController@editRegisteredClient",array("id"=>"@id")) !!}',
+            delete: '{!! URL::action("Api\\ClientApiController@delete",array("id"=>"@id")) !!}',
+            add: '{!!URL::action("Api\\ClientApiController@create",null)!!}',
+            activate: '{!! URL::action("Api\\ClientApiController@activate",array("id"=>"@id")) !!}',
+            deactivate: '{!! URL::action("Api\\ClientApiController@deactivate",array("id"=>"@id")) !!}',
+            fetchUsers: '{!!URL::action("Api\\UserApiController@fetch")!!}',
         };
     </script>
-    {{ HTML::script('bower_assets/typeahead.js/dist/typeahead.bundle.js')}}
-    {{ HTML::script('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.js')}}
-    {{ HTML::script('assets/js/oauth2/profile/clients.js') }}
+    {!! HTML::script('bower_assets/typeahead.js/dist/typeahead.bundle.js')!!}
+    {!! HTML::script('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.js')!!}
+    {!! HTML::script('assets/js/oauth2/profile/clients.js') !!}
 @stop
 
 @section('css')
-    {{ HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.css') }}
-    {{ HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput-typeahead.css') }}
+    {!! HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.css') !!}
+    {!! HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput-typeahead.css') !!}
 @append
\ No newline at end of file
diff --git a/app/views/oauth2/profile/edit-client-data.blade.php b/resources/views/oauth2/profile/edit-client-data.blade.php
similarity index 81%
rename from app/views/oauth2/profile/edit-client-data.blade.php
rename to resources/views/oauth2/profile/edit-client-data.blade.php
index 949301bb..e2a5a94b 100644
--- a/app/views/oauth2/profile/edit-client-data.blade.php
+++ b/resources/views/oauth2/profile/edit-client-data.blade.php
@@ -8,31 +8,22 @@
         <div class="row">
             <div class="col-md-12">
                 <label for="client_id" class="label-client-secret">Client ID</label>
-                <span id="client_id">{{ $client->client_id }}</span>
+                <span id="client_id">{!! $client->client_id !!}</span>
             </div>
         </div>
-        @if($client->client_type == oauth2\models\IClient::ClientType_Confidential)
-            <!--
-            <div class="row">
-                <div class="col-md-12">
-                    <label for="client_secret_expiration_date" class="label-client-secret">Client Secret Expiration Date&nbsp;<span class="glyphicon glyphicon-info-sign pointable"
-                                                                                                                              aria-hidden="true" title="on UTC zone"></span></label>
-                    <span id="client_secret_expiration_date">{{ $client->client_secret_expires_at }}</span>
+        @if($client->client_type == OAuth2\Models\IClient::ClientType_Confidential)
 
-                </div>
-            </div>
-            -->
             <div class="row">
                 <div class="col-md-12">
                     <label for="client_secret" class="label-client-secret">Client Secret</label>
-                    <span id="client_secret">{{ $client->client_secret }}</span>
+                    <span id="client_secret">{!! $client->client_secret !!}</span>
                     @if ($client->isOwner(Auth::user()))
-                    {{ HTML::link(URL::action("ClientApiController@regenerateClientSecret",array("id"=>$client->id)),'Regenerate',array('class'=>'btn btn-default btn-md active regenerate-client-secret','title'=>'Regenerates Client Secret')) }}
+                    {!! HTML::link(URL::action("Api\\ClientApiController@regenerateClientSecret",array("id"=>$client->id)),'Regenerate',array('class'=>'btn btn-default btn-md active regenerate-client-secret','title'=>'Regenerates Client Secret')) !!}
                     @endif
                 </div>
             </div>
         @endif
-        @if($client->application_type == oauth2\models\IClient::ApplicationType_Web_App || $client->application_type == oauth2\models\IClient::ApplicationType_Native)
+        @if($client->application_type == OAuth2\Models\IClient::ApplicationType_Web_App || $client->application_type == OAuth2\Models\IClient::ApplicationType_Native)
             <div class="row">
                 <div class="col-md-12">
                     <label class="label-client-secret">Client Settings</label>
@@ -78,13 +69,13 @@
                 <form id="form-application-main-data" name="form-application-main-data">
                      <div class="form-group">
                         <label class="control-label" for="app_name">Application Name&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="Choose which users would be administrator of this application"></span></label>
-                        <input class="form-control"  type="text" name="app_name" id="app_name" value="{{ $client->app_name }}" />
+                        <input class="form-control"  type="text" name="app_name" id="app_name" value="{!! $client->app_name !!}" />
                     </div>
                     <div class="form-group">
                         <label for="app_description">Application Description&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true"
                                                                                         title=""></span></label>
                         <textarea class="form-control" style="resize: none;" rows="4" cols="50" name="app_description"
-                                  id="app_description">{{$client->app_description}}</textarea>
+                                  id="app_description">{!!$client->app_description!!}</textarea>
                     </div>
                     <div class="form-group">
                         <label class="control-label" for="admin_users">Admin Users&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="Choose which users would be administrator of this application"></span></label>
@@ -94,37 +85,37 @@
                         <label for="website">Application Web Site Url (optional)&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true"
                                                                                             title="URL of the home page of the Client"></span></label>
                         <input class="form-control" type="text" name="website" id="website"
-                               value="{{$client->website}}">
+                               value="{!!$client->website!!}">
                     </div>
                     <div class="form-group">
                         <label for="logo_uri">Application Logo Url (optional)&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true"
                                                                                          title="URL that references a logo for the Client application"></span></label>
                         <input class="form-control" type="text" name="logo_uri" id="logo_uri"
-                               value="{{$client->logo_uri}}">
+                               value="{!!$client->logo_uri!!}">
                     </div>
                     <div class="form-group">
                         <label for="tos_uri">Application Term of Service Url (optional)&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true"
                                                                                                    title="URL that the Relying Party Client provides to the End-User to read about the Relying Party's terms of service"></span></label>
                         <input class="form-control" type="text" name="tos_uri" id="tos_uri"
-                               value="{{$client->tos_uri}}">
+                               value="{!!$client->tos_uri!!}">
                     </div>
                     <div class="form-group">
                         <label for="policy_uri">Application Policy Url (optional)&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true"
                                                                                              title="URL that the Relying Party Client provides to the End-User to read about the how the profile data will be used"></span></label>
                         <input class="form-control" type="text" name="policy_uri" id="policy_uri"
-                               value="{{$client->policy_uri}}">
+                               value="{!!$client->policy_uri!!}">
                     </div>
                     <div class="form-group">
                         <label for="contacts">Contact Emails (optional)&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true"
                                                                                    title="e-mail addresses of people responsible for this Client"></span></label>
-                        <input type="text" name="contacts" id="contacts" value="{{$client->contacts}}"
+                        <input type="text" name="contacts" id="contacts" value="{!!$client->contacts!!}"
                                style="width: 100%"></input>
                     </div>
                     @if($client->application_type != oauth2\models\IClient::ApplicationType_Service)
                     <div class="form-group">
                         <label for="redirect_uris">Allowed Redirection Uris (optional)&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true"
                                                                                                   title="Redirection URI values used by the Client."></span></label>
-                        <input type="text" name="redirect_uris" id="redirect_uris" value="{{$client->redirect_uris}}"
+                        <input type="text" name="redirect_uris" id="redirect_uris" value="{!!$client->redirect_uris!!}"
                                style="width: 100%"></input>
                     </div>
                     @endif
@@ -132,13 +123,13 @@
                     <div class="form-group">
                         <label for="allowed_origins">Allowed javascript origins (optional)&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true"
                                                                                                 title="Allowed js origin URI values used by the Client."></span></label>
-                        <input type="text" name="allowed_origins" id="allowed_origins" value="{{$client->allowed_origins}}"
+                        <input type="text" name="allowed_origins" id="allowed_origins" value="{!!$client->allowed_origins!!}"
                                style="width: 100%"></input>
                     </div>
                     @endif
-                    <input type="hidden" id="id" name="id" value="{{$client->id}}"/>
-                    <input type="hidden" id="application_type" name="application_type" value="{{$client->application_type}}"/>
-                    <input type="hidden" id="user_id"   name="user_id" value="{{$client->user_id}}"/>
+                    <input type="hidden" id="id" name="id" value="{!!$client->id!!}"/>
+                    <input type="hidden" id="application_type" name="application_type" value="{!!$client->application_type!!}"/>
+                    <input type="hidden" id="user_id"   name="user_id" value="{!!$client->user_id!!}"/>
                     <button type="submit" class="btn btn-default btn-md active btn-save-client-data">Save</button>
                 </form>
             </div>
@@ -147,5 +138,5 @@
 </div>
 
 @section('scripts')
-    {{ HTML::script('assets/js/oauth2/profile/edit-client-data.js') }}
+    {!! HTML::script('assets/js/oauth2/profile/edit-client-data.js') !!}
 @append
\ No newline at end of file
diff --git a/app/views/oauth2/profile/edit-client-public-key-add-form.blade.php b/resources/views/oauth2/profile/edit-client-public-key-add-form.blade.php
similarity index 86%
rename from app/views/oauth2/profile/edit-client-public-key-add-form.blade.php
rename to resources/views/oauth2/profile/edit-client-public-key-add-form.blade.php
index 763058b0..1e4508c9 100644
--- a/app/views/oauth2/profile/edit-client-public-key-add-form.blade.php
+++ b/resources/views/oauth2/profile/edit-client-public-key-add-form.blade.php
@@ -18,12 +18,12 @@
     </div>
     <div class="form-group">
         <label class="control-label" for="usage">Usage&nbsp;<span class="glyphicon glyphicon-info-sign pointable" aria-hidden="true" title=""></span></label>
-        {{ Form::select('usage', utils\ArrayUtils::convert2Assoc(\jwk\JSONWebKeyPublicKeyUseValues::$valid_uses) ,null , array('class' => 'form-control', 'id' => 'usage')) }}
+        {!! Form::select('usage', Utils\ArrayUtils::convert2Assoc(\jwk\JSONWebKeyPublicKeyUseValues::$valid_uses) ,null , array('class' => 'form-control', 'id' => 'usage')) !!}
     </div>
     <div class="form-group">
         <label class="control-label" for="alg">Algorithm&nbsp;<span class="glyphicon glyphicon-info-sign pointable" aria-hidden="true" title="identifies the algorithm intended for
    use with the key"></span></label>
-        {{ Form::select('alg', array() ,null , array('class' => 'form-control', 'id' => 'alg')) }}
+        {!! Form::select('alg', array() ,null , array('class' => 'form-control', 'id' => 'alg')) !!}
     </div>
     <div class="form-group">
         <label class="control-label" for="pem_content">Key&nbsp;<span class="glyphicon glyphicon-info-sign pointable" aria-hidden="true" title=""></span></label>
diff --git a/app/views/oauth2/profile/edit-client-public-keys.blade.php b/resources/views/oauth2/profile/edit-client-public-keys.blade.php
similarity index 70%
rename from app/views/oauth2/profile/edit-client-public-keys.blade.php
rename to resources/views/oauth2/profile/edit-client-public-keys.blade.php
index ecafe5d7..05976fa5 100644
--- a/app/views/oauth2/profile/edit-client-public-keys.blade.php
+++ b/resources/views/oauth2/profile/edit-client-public-keys.blade.php
@@ -1,5 +1,5 @@
 @section('css')
-    {{ HTML::style('assets/css/edit-client-public-keys.css') }}
+    {!! HTML::style('assets/css/edit-client-public-keys.css') !!}
 @append
 <table id="public-keys-table" class="table">
     <caption>
@@ -21,14 +21,14 @@
     </thead>
     <tbody id="body-public-keys">
     @foreach ($client->getPublicKeys() as $public_key)
-    <tr id="tr_{{$public_key->id}}">
+    <tr id="tr_{!!$public_key->id!!}">
         <td width="7%">
             <div class="row">
                 <div class="col-md-6">
-                    <span data-public-key-id="{{$public_key->id}}" class="badge public-key-status {{ $public_key->active ? 'public-key-active':'public-key-deactivated' }}" title="{{ $public_key->active ? 'active':'deactivated' }}">&nbsp;</span>
+                    <span data-public-key-id="{!!$public_key->id!!}" class="badge public-key-status {!! $public_key->active ? 'public-key-active':'public-key-deactivated' !!}" title="{!! $public_key->active ? 'active':'deactivated' !!}">&nbsp;</span>
                 </div>
                 <div class="col-md-6 col-md-offset-neg-1">
-                    <i class="fa fa-key fa-2x pointable" title="{{$public_key->kid}}&nbsp;({{$public_key->type}})"></i>
+                    <i class="fa fa-key fa-2x pointable" title="{!!$public_key->kid!!}&nbsp;({!!$public_key->type!!})"></i>
                 </div>
             </div>
         </td>
@@ -37,23 +37,23 @@
                 <div class="col-md-12">
                     <div class="row">
                         <div class="col-md-12">
-                            <strong class="public-key-title">{{$public_key->kid}}&nbsp;<span class="badge public-key-usage pointable" title="Key Usage">{{$public_key->usage}}</span>&nbsp;<span class="label label-info pointable" title="Key Type">{{$public_key->type}}</span></strong>
+                            <strong class="public-key-title">{!!$public_key->kid!!}&nbsp;<span class="badge public-key-usage pointable" title="Key Usage">{!!$public_key->usage!!}</span>&nbsp;<span class="label label-info pointable" title="Key Type">{!!$public_key->type!!}</span></strong>
                         </div>
                     </div>
                     <div class="row">
                         <div class="col-md-12">
-                            <code class="public-key-fingerprint">{{$public_key->getSHA_256_Thumbprint()}}</code>
+                            <code class="public-key-fingerprint">{!!$public_key->getSHA_256_Thumbprint()!!}</code>
                         </div>
                     </div>
                     <div class="row">
                         <div class="col-md-12">
-                            <span class="public-key-validity-range">valid from <strong>{{$public_key->valid_from}}</strong> to <strong>{{$public_key->valid_to}}</strong></span>
+                            <span class="public-key-validity-range">valid from <strong>{!!$public_key->valid_from!!}</strong> to <strong>{!!$public_key->valid_to!!}</strong></span>
                         </div>
                     </div>
                 </div>
             </div>
         </td>
-        <td><a class="btn btn-default btn-sm active delete-public-key" href="#" data-public-key-id="{{$public_key->id}}">Delete</a></td>
+        <td><a class="btn btn-default btn-sm active delete-public-key" href="#" data-public-key-id="{!!$public_key->id!!}">Delete</a></td>
     </tr>
     @endforeach
     </tbody>
@@ -70,5 +70,5 @@
 @include('modal', array ('modal_id' => 'ModalAddPublicKey', 'modal_title' => 'Add Public Key', 'modal_save_css_class' => 'save-public-key', 'modal_save_text' => 'Save', 'modal_form' => 'oauth2.profile.edit-client-public-key-add-form', 'modal_form_data' => array()))
 
 @section('scripts')
-    {{ HTML::script('assets/js/oauth2/profile/edit-client-public-keys.js') }}
+    {!! HTML::script('assets/js/oauth2/profile/edit-client-public-keys.js') !!}
 @append
\ No newline at end of file
diff --git a/app/views/oauth2/profile/edit-client-scopes.blade.php b/resources/views/oauth2/profile/edit-client-scopes.blade.php
similarity index 52%
rename from app/views/oauth2/profile/edit-client-scopes.blade.php
rename to resources/views/oauth2/profile/edit-client-scopes.blade.php
index fdb77d0e..f38f2d77 100644
--- a/app/views/oauth2/profile/edit-client-scopes.blade.php
+++ b/resources/views/oauth2/profile/edit-client-scopes.blade.php
@@ -3,25 +3,18 @@
         <ul class="unstyled list-inline">
             <?php $last_api = ''; ?>
             @foreach ($scopes as $scope)
-            {{-- get api data --}}
             <?php $current_api      = $scope->getApiName(); ?>
             <?php $current_api_logo = $scope->getApiLogo(); ?>
-            {{-- if we have set an api --}}
             @if($last_api!=$current_api && !empty($current_api))
-                {{-- check end of former api --}}
                 @if(!empty($last_api))
                     </li></ul>
                 @endif
                 <?php $last_api = $current_api;?>
-                {{-- draw api header --}}
                 <li>
-
-                <img width="24" height="24" src="{{$current_api_logo}}" alt="api logo"/>
-
-                <span class="label label-default">{{trim($current_api)}}</span>&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" title="{{$scope->getApiDescription()}}"></span>
+                <img width="24" height="24" src="{!!$current_api_logo!!}" alt="api logo"/>
+                <span class="label label-default">{!!trim($current_api)!!}</span>&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" title="{!!$scope->getApiDescription()!!}"></span>
                 <ul class="unstyled list-inline" style="margin-left: 2em">
             @endif
-            {{-- scope header --}}
             <li>
                 <div class="checkbox">
                     <label>
@@ -29,13 +22,11 @@
                     @if ( in_array($scope->id,$selected_scopes))
                     checked
                     @endif
-                    value="{{$scope->id}}"/><span>{{trim($scope->name)}}</span>&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="{{$scope->description}}"></span>
+                    value="{!!$scope->id!!}"/><span>{!!trim($scope->name)!!}</span>&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="{!!$scope->description!!}"></span>
                 </label>
                  </div>
             </li>
-            {{-- end scope header --}}
             @endforeach
-            {{-- check end of former api --}}
             @if(!empty($last_api))
                 </li></ul>
             @endif
@@ -45,9 +36,9 @@
 @section('scripts')
 <script type="application/javascript">
 	var clientScopesUrls = {
-		add:'{{URL::action("ClientApiController@addAllowedScope",array("id"=>$client->id,"scope_id"=>"@scope_id"))}}',
-		delete:'{{URL::action("ClientApiController@removeAllowedScope",array("id"=>$client->id,"scope_id"=>"@scope_id"))}}'
+		add:'{!!URL::action("Api\ClientApiController@addAllowedScope",array("id"=>$client->id,"scope_id"=>"@scope_id"))!!}',
+		delete:'{!!URL::action("Api\ClientApiController@removeAllowedScope",array("id"=>$client->id,"scope_id"=>"@scope_id"))!!}'
 	};
 </script>
-{{ HTML::script('assets/js/oauth2/profile/edit-client-scopes.js') }}
+{!! HTML::script('assets/js/oauth2/profile/edit-client-scopes.js') !!}
 @append
\ No newline at end of file
diff --git a/app/views/oauth2/profile/edit-client-security-logout.blade.php b/resources/views/oauth2/profile/edit-client-security-logout.blade.php
similarity index 55%
rename from app/views/oauth2/profile/edit-client-security-logout.blade.php
rename to resources/views/oauth2/profile/edit-client-security-logout.blade.php
index 94c966c1..d4b4783f 100644
--- a/app/views/oauth2/profile/edit-client-security-logout.blade.php
+++ b/resources/views/oauth2/profile/edit-client-security-logout.blade.php
@@ -4,30 +4,34 @@
     <div class="form-group">
         <label for="post_logout_redirect_uris">Post Logout Uris (optional)&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title=""></span></label>
         <input type="text" name="post_logout_redirect_uris" class="form-control" id="post_logout_redirect_uris"
-               value="{{$client->post_logout_redirect_uris}}">
+               value="{!!$client->post_logout_redirect_uris!!}">
     </div>
-    <!--
     <div class="form-group">
         <label for="logout_uri">Logout Uri (optional)&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title=""></span></label>
         <input type="text" name="logout_uri" class="form-control" id="logout_uri"
-               value="{{$client->logout_uri}}">
+               value="{!!$client->logout_uri!!}">
     </div>
     <div class="checkbox">
         <label>
-            <input type="checkbox" id="logout_session_required" name="logout_session_required" @if ($client->logout_session_required)checked@endif>Session Required (Optional)&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title=""></span>
+            <input type="checkbox" id="logout_session_required" name="logout_session_required"
+                   @if ($client->logout_session_required)
+                   checked
+                   @endif>Session Required (Optional)&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title=""></span>
         </label>
     </div>
     <div class="checkbox">
         <label>
-            <input type="checkbox" id="logout_use_iframe" name="logout_use_iframe" @if ($client->logout_use_iframe)checked@endif>Use IFrame (Optional)&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title=""></span>
+            <input type="checkbox" id="logout_use_iframe" name="logout_use_iframe"
+                   @if ($client->logout_use_iframe)
+                   checked
+                   @endif>Use IFrame (Optional)&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title=""></span>
         </label>
     </div>
-    -->
-    <input type="hidden" id="id" name="id" value="{{$client->id}}"/>
-    <input type="hidden" id="application_type" name="application_type" value="{{$client->application_type}}"/>
-    <input type="hidden" id="user_id"   name="user_id" value="{{$client->user_id}}"/>
+    <input type="hidden" id="id" name="id" value="{!!$client->id!!}"/>
+    <input type="hidden" id="application_type" name="application_type" value="{!!$client->application_type!!}"/>
+    <input type="hidden" id="user_id"   name="user_id" value="{!!$client->user_id!!}"/>
     <button type="submit" class="btn btn-default btn-md active">Save</button>
 </form>
 @section('scripts')
-    {{ HTML::script('assets/js/oauth2/profile/edit-client-security-logout.js') }}
+    {!! HTML::script('assets/js/oauth2/profile/edit-client-security-logout.js') !!}
 @append
\ No newline at end of file
diff --git a/app/views/oauth2/profile/edit-client-security-main-settings.blade.php b/resources/views/oauth2/profile/edit-client-security-main-settings.blade.php
similarity index 73%
rename from app/views/oauth2/profile/edit-client-security-main-settings.blade.php
rename to resources/views/oauth2/profile/edit-client-security-main-settings.blade.php
index 49e11b64..a369c867 100644
--- a/app/views/oauth2/profile/edit-client-security-main-settings.blade.php
+++ b/resources/views/oauth2/profile/edit-client-security-main-settings.blade.php
@@ -4,78 +4,78 @@
         aria-hidden="true"
         title="Default Maximum Authentication Age. Specifies that the End-User MUST be actively authenticated if the End-User was authenticated longer ago than the specified number of seconds. The max_age request parameter overrides this default value. If omitted, no default Maximum Authentication Age is specified."></span></label>
         <input type="text" name="default_max_age" class="form-control" id="default_max_age"
-               value="{{$client->default_max_age}}">
+               value="{!!$client->default_max_age!!}">
     </div>
-    @if(\oauth2\OAuth2Protocol::isClientAllowedToUseTokenEndpointAuth($client))
+    @if(OAuth2\OAuth2Protocol::isClientAllowedToUseTokenEndpointAuth($client))
     <div class="form-group">
         <label for="token_endpoint_auth_method">Token Endpoint Authorization Method&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle"
                                                                                           aria-hidden="true"
             title="Requested Client Authentication method for the Token Endpoint. The options are client_secret_post, client_secret_basic, client_secret_jwt, private_key_jwt, and none, as described in Section 9 of OpenID Connect Core 1.0 [OpenID.Core]. Other authentication methods MAY be defined by extensions. If omitted, the default is client_secret_basic -- the HTTP Basic Authentication Scheme specified in Section 2.3.1 of OAuth 2.0 [RFC6749]."></span></label>
-        {{ Form::select('token_endpoint_auth_method', \oauth2\OAuth2Protocol::getTokenEndpointAuthMethodsPerClientType($client), $client->token_endpoint_auth_method, array('class' => 'form-control', 'id' => 'token_endpoint_auth_method')) }}
+        {!! Form::select('token_endpoint_auth_method', OAuth2\OAuth2Protocol::getTokenEndpointAuthMethodsPerClientType($client), $client->token_endpoint_auth_method, array('class' => 'form-control', 'id' => 'token_endpoint_auth_method')) !!}
     </div>
      <div class="form-group" id="token_endpoint_auth_signing_alg_group" >
         <label for="token_endpoint_auth_signing_alg">Token Endpoint Authorization Signed Algorithm&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle"
         aria-hidden="true"
         title=" JWS [JWS] alg algorithm [JWA] that MUST be used for signing the JWT [JWT] used to authenticate the Client at the Token Endpoint for the private_key_jwt and client_secret_jwt authentication methods. All Token Requests using these authentication methods from this Client MUST be rejected, if the JWT is not signed with this algorithm. Servers SHOULD support RS256. The value none MUST NOT be used. The default, if omitted, is that any algorithm supported by the OP and the RP MAY be used."></span></label>
-        {{ Form::select('token_endpoint_auth_signing_alg', oauth2\OAuth2Protocol::getSigningAlgorithmsPerClientType($client), $client->token_endpoint_auth_signing_alg, array('class' => 'form-control', 'id' => 'token_endpoint_auth_signing_alg')) }}
+        {!! Form::select('token_endpoint_auth_signing_alg', OAuth2\OAuth2Protocol::getSigningAlgorithmsPerClientType($client), $client->token_endpoint_auth_signing_alg, array('class' => 'form-control', 'id' => 'token_endpoint_auth_signing_alg')) !!}
      </div>
     @endif
     <div class="form-group">
         <label for="subject_type">Subject Type&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle"
         aria-hidden="true"
         title="subject_type requested for responses to this Client. The subject_types_supported Discovery parameter contains a list of the supported subject_type values for this server. Valid types include pairwise and public. "></span></label>
-        {{ Form::select('subject_type', utils\ArrayUtils::convert2Assoc(Client::$valid_subject_types), $client->subject_type, array('class' => 'form-control', 'id' => 'subject_type')) }}
+        {!! Form::select('subject_type', Utils\ArrayUtils::convert2Assoc(\Models\OAuth2\Client::$valid_subject_types), $client->subject_type, array('class' => 'form-control', 'id' => 'subject_type')) !!}
     </div>
     <div class="form-group">
         <label for="jwks_uri">JWK Url&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle"
         aria-hidden="true"
         title="URL for the Client's JSON Web Key Set [JWK] document. If the Client signs requests to the Server, it contains the signing key(s) the Server uses to validate signatures from the Client. The JWK Set MAY also contain the Client's encryption keys(s), which are used by the Server to encrypt responses to the Client. When both signing and encryption keys are made available, a use (Key Use) parameter value is REQUIRED for all keys in the referenced JWK Set to indicate each key's intended usage. Although some algorithms allow the same key to be used for both signatures and encryption, doing so is NOT RECOMMENDED, as it is less secure. The JWK x5c parameter MAY be used to provide X.509 representations of keys provided. When used, the bare key values MUST still be present and MUST match those in the certificate. "></span></label>
         <input type="text" name="jwks_uri" id="jwks_uri" maxlength="255"
-               value="{{$client->jwks_uri}}" class="form-control">
+               value="{!!$client->jwks_uri!!}" class="form-control">
     </div>
     <div class="form-group row">
         <div class="col-md-6 form-group ">
             <label for="userinfo_signed_response_alg">UserInfo Signed Response Algorithm&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle"
             aria-hidden="true"
             title="JWS alg algorithm [JWA] REQUIRED for signing UserInfo Responses. If this is specified, the response will be JWT [JWT] serialized, and signed using JWS. The default, if omitted, is for the UserInfo Response to return the Claims as a UTF-8 encoded JSON object using the application/json content-type."></span></label>
-            {{ Form::select('userinfo_signed_response_alg', oauth2\OAuth2Protocol::getSigningAlgorithmsPerClientType($client), $client->userinfo_signed_response_alg, array('class' => 'form-control', 'id' => 'userinfo_signed_response_alg')) }}
+            {!! Form::select('userinfo_signed_response_alg', OAuth2\OAuth2Protocol::getSigningAlgorithmsPerClientType($client), $client->userinfo_signed_response_alg, array('class' => 'form-control', 'id' => 'userinfo_signed_response_alg')) !!}
         </div>
         <div class="col-md-6 form-group ">
             <label for="id_token_signed_response_alg">Id Token Signed Response Algorithm&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle"
             aria-hidden="true"
             title="JWS alg algorithm [JWA] REQUIRED for signing the ID Token issued to this Client. The value none MUST NOT be used as the ID Token alg value unless the Client uses only Response Types that return no ID Token from the Authorization Endpoint (such as when only using the Authorization Code Flow). The default, if omitted, is RS256. The public key for validating the signature is provided by retrieving the JWK Set referenced by the jwks_uri element from OpenID Connect Discovery 1.0 [OpenID.Discovery]."></span></label>
-            {{ Form::select('id_token_signed_response_alg', oauth2\OAuth2Protocol::getSigningAlgorithmsPerClientType($client), $client->id_token_signed_response_alg, array('class' => 'form-control', 'id' => 'id_token_signed_response_alg')) }}
+            {!! Form::select('id_token_signed_response_alg', OAuth2\OAuth2Protocol::getSigningAlgorithmsPerClientType($client), $client->id_token_signed_response_alg, array('class' => 'form-control', 'id' => 'id_token_signed_response_alg')) !!}
         </div>
     </div>
     <div class="form-group row">
         <div class="col-md-6 form-group ">
             <label for="userinfo_encrypted_response_alg">UserInfo Encrypted Key Algorithm&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle"
                                                                                                      aria-hidden="true"></span></label>
-            {{ Form::select('userinfo_encrypted_response_alg', oauth2\OAuth2Protocol::getKeyManagementAlgorithmsPerClientType($client), $client->userinfo_encrypted_response_alg, array('class' => 'form-control', 'id' => 'userinfo_encrypted_response_alg')) }}
+            {!! Form::select('userinfo_encrypted_response_alg', OAuth2\OAuth2Protocol::getKeyManagementAlgorithmsPerClientType($client), $client->userinfo_encrypted_response_alg, array('class' => 'form-control', 'id' => 'userinfo_encrypted_response_alg')) !!}
         </div>
         <div class="col-md-6 form-group ">
             <label for="id_token_encrypted_response_alg">Id Token Encrypted Key Algorithm&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle"
                                                                                                      aria-hidden="true"></span></label>
-            {{ Form::select('id_token_encrypted_response_alg', oauth2\OAuth2Protocol::getKeyManagementAlgorithmsPerClientType($client), $client->id_token_encrypted_response_alg, array('class' => 'form-control', 'id' => 'id_token_encrypted_response_alg')) }}
+            {!! Form::select('id_token_encrypted_response_alg', OAuth2\OAuth2Protocol::getKeyManagementAlgorithmsPerClientType($client), $client->id_token_encrypted_response_alg, array('class' => 'form-control', 'id' => 'id_token_encrypted_response_alg')) !!}
         </div>
     </div>
     <div class="form-group row">
         <div class="col-md-6 form-group ">
             <label for="userinfo_encrypted_response_enc">UserInfo Encrypted Content Algorithm&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle"
                                                                                                          aria-hidden="true"></span></label>
-            {{ Form::select('userinfo_encrypted_response_enc', utils\ArrayUtils::convert2Assoc(oauth2\OAuth2Protocol::$supported_content_encryption_algorithms), $client->userinfo_encrypted_response_enc, array('class' => 'form-control', 'id' => 'userinfo_encrypted_response_enc')) }}
+            {!! Form::select('userinfo_encrypted_response_enc', Utils\ArrayUtils::convert2Assoc(OAuth2\OAuth2Protocol::$supported_content_encryption_algorithms), $client->userinfo_encrypted_response_enc, array('class' => 'form-control', 'id' => 'userinfo_encrypted_response_enc')) !!}
         </div>
         <div class="col-md-6 form-group ">
             <label for="id_token_encrypted_response_enc">Id Token Encrypted Content Algorithm&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle"
                                                                                                          aria-hidden="true"></span></label>
-            {{ Form::select('id_token_encrypted_response_enc', utils\ArrayUtils::convert2Assoc(oauth2\OAuth2Protocol::$supported_content_encryption_algorithms), $client->id_token_encrypted_response_enc, array('class' => 'form-control', 'id' => 'id_token_encrypted_response_enc')) }}
+            {!! Form::select('id_token_encrypted_response_enc', Utils\ArrayUtils::convert2Assoc(OAuth2\OAuth2Protocol::$supported_content_encryption_algorithms), $client->id_token_encrypted_response_enc, array('class' => 'form-control', 'id' => 'id_token_encrypted_response_enc')) !!}
         </div>
     </div>
-    <input type="hidden" id="id" name="id" value="{{$client->id}}"/>
-    <input type="hidden" id="application_type" name="application_type" value="{{$client->application_type}}"/>
-    <input type="hidden" id="user_id"   name="user_id" value="{{$client->user_id}}"/>
+    <input type="hidden" id="id" name="id" value="{!!$client->id!!}"/>
+    <input type="hidden" id="application_type" name="application_type" value="{!!$client->application_type!!}"/>
+    <input type="hidden" id="user_id"   name="user_id" value="{!!$client->user_id!!}"/>
     <button type="submit" class="btn btn-default btn-md active" id="save-application-security">Save</button>
 </form>
 @section('scripts')
-    {{ HTML::script('assets/js/oauth2/profile/edit-client-security-main-settings.js') }}
+    {!! HTML::script('assets/js/oauth2/profile/edit-client-security-main-settings.js') !!}
 @append
\ No newline at end of file
diff --git a/resources/views/oauth2/profile/edit-client-tokens.blade.php b/resources/views/oauth2/profile/edit-client-tokens.blade.php
new file mode 100644
index 00000000..6e429287
--- /dev/null
+++ b/resources/views/oauth2/profile/edit-client-tokens.blade.php
@@ -0,0 +1,119 @@
+<div class="row">
+    <div class="col-md-12">
+        <div class="row">
+            <div class="col-md-12">
+                <h5>Issued Access Tokens&nbsp;<span class="glyphicon glyphicon-refresh accordion-toggle refresh-access-tokens" aria-hidden="true" title="Update Access Tokens List"></span></h5>
+                <hr/>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <div class="row">
+                    <div class="col-md-12">
+                        <table id='table-access-tokens' class="table table-hover table-condensed">
+                            <thead>
+                            <tr>
+                                <th><i class="icon-info-sign accordion-toggle" title="Time is on UTC"></i>&nbsp;Issued</th>
+                                <th>Scopes</th>
+                                <th><i class="icon-info-sign accordion-toggle" title="Lifetime is on seconds"></i>&nbsp;Remaining Lifetime</th>
+                                <th>&nbsp;</th>
+                            </tr>
+                            </thead>
+                            <tbody id="body-access-tokens">
+                            @foreach ($access_tokens as $access_token)
+                                <tr id="{!! $access_token->value !!}">
+                                    <td>{!! $access_token->created_at !!}</td>
+                                    <td>{!! $access_token->scope !!}</td>
+                                    <td>{!! $access_token->getRemainingLifetime() !!}</td>
+                                    <td>{!! HTML::link(URL::action("Api\ClientApiController@revokeToken",array("id"=>$client->id,"value"=>$access_token->value,'hint'=>'access-token')),'Revoke',array('class'=>'btn btn-default btn-md active btn-delete revoke-token revoke-access-token','title'=>'Revoke Access Token','data-value'=>$access_token->value,'data-hint'=>'access-token')) !!}</td>
+                                </tr>
+                            @endforeach
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-md-12">
+                        <ul class="pagination" id="access_token_paginator">
+                             <?php for($i = 0 ; $i < $access_tokens_pages ; $i++){  ?>
+                            <li><a class="access_token_page" href="#" data-page-nbr="{!! $i+1 !!}">{!! $i+1 !!}</a></li>
+                            <?php } ?>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <span id="info-access-tokens" class="label label-info">** There are not any Access Tokens granted for this application.</span>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <h5>Issued Refresh Tokens&nbsp;<span class="glyphicon glyphicon-refresh accordion-toggle refresh-refresh-tokens" title="Update Refresh Tokens List"></span></h5>
+                <hr/>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <div class="row">
+                    <div class="col-md-12">
+                        <table id='table-refresh-tokens' class="table table-hover table-condensed">
+                            <thead>
+                            <tr>
+                                <th><i class="icon-info-sign accordion-toggle" title="Time is on UTC"></i>&nbsp;Issued</th>
+                                <th>Scopes</th>
+                                <th><i class="icon-info-sign accordion-toggle" title="Lifetime is on seconds"></i>&nbsp;Remaining Lifetime</th>
+                                <th>&nbsp;</th>
+                            </tr>
+                            </thead>
+                            <tbody id="body-refresh-tokens">
+                            @foreach ($refresh_tokens as $refresh_token)
+                                <tr id="{!! $refresh_token->value !!}">
+                                    <td>{!! $refresh_token->created_at !!}</td>
+                                    <td>{!! $refresh_token->scope !!}</td>
+                                    @if($refresh_token->getRemainingLifetime()===0)
+                                        <td>Not Expire</td>
+                                    @else
+                                        <td>{!! $refresh_token->getRemainingLifetime() !!}</td>
+                                    @endif
+                                    <td>{!! HTML::link(URL::action("Api\ClientApiController@revokeToken",array("id"=>$client->id,"value"=>$refresh_token->value,'hint'=>'refresh-token')),'Revoke',array('class'=>'btn btn-default btn-md active btn-delete revoke-token revoke-refresh-token','title'=>'Revoke Refresh Token','data-value'=>$refresh_token->value,'data-hint'=>'refresh-token')) !!}</td>
+                                </tr>
+                            @endforeach
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-md-12">
+                        <ul class="pagination" id="refresh_token_paginator">
+                            <?php for($i = 0 ; $i < $refresh_tokens_pages ; $i++){  ?>
+                            <li><a class="refresh_token_page" href="#" data-page-nbr="{!! $i+1 !!}">{!! $i+1 !!}</a></li>
+                            <?php } ?>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <span id="info-refresh-tokens" class="label label-info">** There are not any Refresh Tokens granted for this application.</span>
+            </div>
+        </div>
+    </div>
+</div>
+@section('scripts')
+<script type="application/javascript">
+	var TokensUrls = {
+		AccessTokenUrls : {
+			get : '{!! URL::action("Api\ClientApiController@getAccessTokens",array("id"=>$client->id))!!}',
+			delete :'{!! URL::action("Api\ClientApiController@revokeToken",array("id"=>$client->id,"value"=>-1,"hint"=>"access-token")) !!}'
+		},
+		RefreshTokenUrl : {
+			get: '{!! URL::action("Api\ClientApiController@getRefreshTokens",array("id"=>$client->id))!!}',
+			delete : '{!! URL::action("Api\ClientApiController@revokeToken",array("id"=>$client->id,"value"=>-1,"hint"=>"refresh-token")) !!}'
+		}
+	};
+</script>
+{!! HTML::script('assets/js/oauth2/profile/edit-client-tokens.js') !!}
+@append
\ No newline at end of file
diff --git a/app/views/oauth2/profile/edit-client.blade.php b/resources/views/oauth2/profile/edit-client.blade.php
similarity index 68%
rename from app/views/oauth2/profile/edit-client.blade.php
rename to resources/views/oauth2/profile/edit-client.blade.php
index 56596a42..2dc7addd 100644
--- a/app/views/oauth2/profile/edit-client.blade.php
+++ b/resources/views/oauth2/profile/edit-client.blade.php
@@ -4,43 +4,43 @@
 <title>Welcome to OpenStackId - OAUTH2 Console - Edit Client</title>
 @stop
 @section('css')
-    {{ HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.css') }}
-    {{ HTML::style('bower_assets/bootstrap-datepicker/dist/css/bootstrap-datepicker.min.css') }}
-    {{ HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput-typeahead.css') }}
-    {{ HTML::style('assets/css/edit-client.css') }}
+    {!! HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.css') !!}
+    {!! HTML::style('bower_assets/bootstrap-datepicker/dist/css/bootstrap-datepicker.min.css') !!}
+    {!! HTML::style('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput-typeahead.css') !!}
+    {!! HTML::style('assets/css/edit-client.css') !!}
 @append
 @section('scripts')
-    {{ HTML::script('bower_assets/typeahead.js/dist/typeahead.bundle.js')}}
-    {{ HTML::script('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.js')}}
-    {{ HTML::script('bower_assets/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js')}}
+    {!! HTML::script('bower_assets/typeahead.js/dist/typeahead.bundle.js')!!}
+    {!! HTML::script('bower_assets/bootstrap-tagsinput/dist/bootstrap-tagsinput.js')!!}
+    {!! HTML::script('bower_assets/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js')!!}
     <script type="application/javascript">
 
         var dataClientUrls =
         {
-            refresh: '{{URL::action("ClientApiController@setRefreshTokenClient",array("id"=>$client->id))}}',
-            rotate: '{{URL::action("ClientApiController@setRotateRefreshTokenPolicy",array("id"=>$client->id))}}',
-            update: '{{URL::action("ClientApiController@update")}}',
-            add_public_key: '{{URL::action("ClientPublicKeyApiController@create",array("id"=>$client->id))}}',
-            get_public_keys: '{{URL::action("ClientPublicKeyApiController@getByPage",array("id"=>$client->id))}}',
-            delete_public_key: '{{URL::action("ClientPublicKeyApiController@delete",array("id" => $client->id, 'public_key_id'=> '@public_key_id'))}}',
-            update_public_key: '{{URL::action("ClientPublicKeyApiController@update",array("id" => $client->id, 'public_key_id'=> '@public_key_id'))}}',
-            fetchUsers: '{{URL::action("UserApiController@fetch",null)}}',
+            refresh: '{!!URL::action("Api\\ClientApiController@setRefreshTokenClient",array("id"=>$client->id))!!}',
+            rotate: '{!!URL::action("Api\\ClientApiController@setRotateRefreshTokenPolicy",array("id"=>$client->id))!!}',
+            update: '{!!URL::action("Api\\ClientApiController@update")!!}',
+            add_public_key: '{!!URL::action("Api\\ClientPublicKeyApiController@create",array("id"=>$client->id))!!}',
+            get_public_keys: '{!!URL::action("Api\\ClientPublicKeyApiController@getByPage",array("id"=>$client->id))!!}',
+            delete_public_key: '{!!URL::action("Api\\ClientPublicKeyApiController@delete",array("id" => $client->id, 'public_key_id'=> '@public_key_id'))!!}',
+            update_public_key: '{!!URL::action("Api\\ClientPublicKeyApiController@update",array("id" => $client->id, 'public_key_id'=> '@public_key_id'))!!}',
+            fetchUsers: '{!!URL::action("Api\\UserApiController@fetch")!!}',
         };
 
         var oauth2_supported_algorithms =
         {
             sig_algorihtms:
             {
-                mac:{{utils\ArrayUtils::toJson(oauth2\OAuth2Protocol::$supported_signing_algorithms_hmac_sha2)}},
-                rsa:{{utils\ArrayUtils::toJson(oauth2\OAuth2Protocol::$supported_signing_algorithms_rsa)}}
+                mac: {!!Utils\ArrayUtils::toJson(OAuth2\OAuth2Protocol::$supported_signing_algorithms_hmac_sha2)!!},
+                rsa: {!!Utils\ArrayUtils::toJson(OAuth2\OAuth2Protocol::$supported_signing_algorithms_rsa)!!}
             },
-            key_management_algorihtms: {{utils\ArrayUtils::toJson(oauth2\OAuth2Protocol::$supported_key_management_algorithms)}},
-            content_encryption_algorihtms:  {{utils\ArrayUtils::toJson(oauth2\OAuth2Protocol::$supported_content_encryption_algorithms)}}
+            key_management_algorihtms: {!!Utils\ArrayUtils::toJson(OAuth2\OAuth2Protocol::$supported_key_management_algorithms)!!},
+            content_encryption_algorihtms:  {!!Utils\ArrayUtils::toJson(OAuth2\OAuth2Protocol::$supported_content_encryption_algorithms)!!}
         };
         var current_admin_users  = [];
 
         @foreach($client->admin_users()->get() as $user)
-        current_admin_users.push({ "id": {{$user->id}} , "value": "{{ $user->getFullName() }}" });
+        current_admin_users.push({ "id": {!!$user->id!!} , "value": "{!! $user->getFullName() !!}" });
         @endforeach
 
         $(document).ready
@@ -57,13 +57,13 @@
     <span aria-hidden="true" class="glyphicon glyphicon-info-sign pointable"
           title="OAuth 2.0 allows users to share specific data with you (for example, contact lists) while keeping their usernames, passwords, and other information private.">
 
-    </span>&nbsp;{{$client->getFriendlyApplicationType()}} - Client # {{ $client->id }}
+    </span>&nbsp;{!!$client->getFriendlyApplicationType()!!} - Client # {!! $client->id !!}
 </legend>
 <div class="row">
-    <div style="padding-left:15px" class="col-md-2 clear-padding"><strong>Created By:&nbsp;</strong></div><div class="col-md-10 clear-padding">{{ $client->getOwnerNice() }}</div>
+    <div style="padding-left:15px" class="col-md-2 clear-padding"><strong>Created By:&nbsp;</strong></div><div class="col-md-10 clear-padding">{!! $client->getOwnerNice() !!}</div>
 </div>
 <div class="row">
-    <div style="padding-left:15px" class="col-md-2 clear-padding"><strong>Edited By</strong>:&nbsp;</div><div class="col-md-10 clear-padding">{{ $client->getEditedByNice() }}</div>
+    <div style="padding-left:15px" class="col-md-2 clear-padding"><strong>Edited By</strong>:&nbsp;</div><div class="col-md-10 clear-padding">{!! $client->getEditedByNice() !!}</div>
 </div>
 @if($errors->any())
 <div class="errors">
@@ -71,7 +71,7 @@
         @foreach($errors->all() as $error)
         <div class="alert alert-danger alert-dismissible" role="alert">
             <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            {{ $error }}
+            {!! $error !!}
         </div>
         @endforeach
     </ul>
diff --git a/resources/views/oauth2/profile/edit-user-grants.blade.php b/resources/views/oauth2/profile/edit-user-grants.blade.php
new file mode 100644
index 00000000..bf308c13
--- /dev/null
+++ b/resources/views/oauth2/profile/edit-user-grants.blade.php
@@ -0,0 +1,113 @@
+@extends('layout')
+@section('title')
+<title>Welcome to OpenStackId - My Account</title>
+@stop
+@section('content')
+@include('menu',array('is_oauth2_admin' => $is_oauth2_admin, 'is_openstackid_admin' => $is_openstackid_admin))
+
+<legend>Authorized Access to your OpenStackId Account</legend>
+
+<h2>Connected Sites, Apps, and Services</h2>
+<p>
+    You have granted the following services access to your OpenstackId Account: <br>
+</p>
+<h4>Online Access&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true"></span></h4>
+<hr/>
+<div class="row">
+    <div class="col-md-12">
+        <div class="row">
+            <div class="col-md-12">
+                <table id="table-access-tokens" class="table table-hover table-condensed">
+                    <thead>
+                    <tr>
+                        <th>Application Type</th>
+                        <th>Application Name</th>
+                        <th>Granted Scopes</th>
+                        <th>&nbsp;</th>
+                    </tr>
+                    </thead>
+                    <tbody id="body-access-tokens">
+                    @foreach($access_tokens as $access_token)
+                        <tr id="{!!$access_token->value!!}">
+                            <td>{!!$access_token->client()->first()->getFriendlyApplicationType()!!}</td>
+                            <td>{!!$access_token->client()->first()->app_name!!}</td>
+                            <td>{!!$access_token->scope!!}</td>
+                            <td>{!! HTML::link(URL::action("Api\\UserApiController@revokeToken",array("id"=>$user_id,"value"=>$access_token->value, "hint"=>'access_token')),'Revoke Access',array('data-value' => $access_token->value,'data-hint'=>'access_token','class'=>'btn btn-default btn-md active btn-delete revoke-token','title'=>'Revoke Access Token')) !!}</td>
+                        </tr>
+                    @endforeach
+                    </tbody>
+                </table>
+                <span id="info-access-tokens" class="label label-info">** There are not currently access tokens issued for this user.</span>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <ul class="pagination" id="access_token_paginator">
+                    <?php for($i = 0 ; $i < $access_tokens_pages ; $i++){  ?>
+                    <li><a class="access_token_page" href="#" data-page-nbr="{!! $i+1 !!}">{!! $i+1 !!}</a></li>
+                    <?php } ?>
+                </ul>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+
+<h4>Offline Access&nbsp;<span class="glyphicon glyphicon-info-sign accordion-toggle" aria-hidden="true" title="In some cases, your application may need to access an API when the user is not present. Examples of this include backup services and applications that make blogger posts exactly at 8am on Monday morning. This style of access is called offline, and web server applications may request offline access from a user. The normal and default style of access is called online. "></span></h4>
+<hr/>
+<div class="row">
+    <div class="col-md-12">
+        <div class="row">
+            <div class="col-md-12">
+                <table id="table-refresh-tokens" class="table table-hover table-condensed">
+                    <thead>
+                    <tr>
+                        <th>Application Type</th>
+                        <th>Application Name</th>
+                        <th>Granted Scopes</th>
+                        <th>&nbsp;</th>
+                    </tr>
+                    </thead>
+                    <tbody id="body-refresh-tokens">
+                    @foreach($refresh_tokens as $refresh_token)
+                        <tr id="{!!$refresh_token->value!!}">
+                            <td>{!!$refresh_token->client()->first()->getFriendlyApplicationType()!!}</td>
+                            <td>{!!$refresh_token->client()->first()->app_name!!}</td>
+                            <td>{!!$refresh_token->scope!!}</td>
+                            <td>{!! HTML::link(URL::action("Api\\UserApiController@revokeToken",array("id" => $user_id,"value" => $refresh_token->value, "hint" => 'refresh_token')),'Revoke Access',array('data-value' => $refresh_token->value,'data-hint' => 'refresh_token','class' => 'btn btn-default btn-md active btn-delete revoke-token','title' => 'Revoke Access Token')) !!}</td>
+                        </tr>
+                    @endforeach
+                    </tbody>
+                </table>
+                <span id="info-refresh-tokens" class="label label-info">** There are not currently refresh tokens issued for this user.</span>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <ul class="pagination" id="refresh_token_paginator">
+                    <?php for($i = 0 ; $i < $refresh_tokens_pages ; $i++){  ?>
+                    <li><a class="refresh_token_page" href="#" data-page-nbr="{!! $i+1 !!}">{!! $i+1 !!}</a></li>
+                    <?php } ?>
+                </ul>
+            </div>
+        </div>
+    </div>
+</div>
+
+@stop
+@section('scripts')
+<script type="application/javascript">
+        var TokensUrls = {
+            AccessTokenUrls : {
+                get : '{!! URL::action("Api\\ClientApiController@getAccessTokensByCurrentUser", array() )!!}',
+                delete :'{!! URL::action("Api\\UserApiController@revokeToken",array("id" => $user_id, "value" => -1, "hint" =>"access_token")) !!}'
+            },
+            RefreshTokenUrl : {
+                get: '{!! URL::action("Api\\ClientApiController@getRefreshTokensByCurrentUser", array() )!!}',
+                delete :'{!! URL::action("Api\\UserApiController@revokeToken",array("id" => $user_id, "value" => -1, "hint" => "refresh_token")) !!}'
+            }
+        };
+</script>
+{!! HTML::script('assets/js/oauth2/profile/edit-user-grants.js') !!}
+@append
\ No newline at end of file
diff --git a/resources/views/oauth2/session/check-session.blade.php b/resources/views/oauth2/session/check-session.blade.php
new file mode 100644
index 00000000..a1bb0961
--- /dev/null
+++ b/resources/views/oauth2/session/check-session.blade.php
@@ -0,0 +1,13 @@
+@extends('layout')
+@section('title')
+    <title>Welcome to OpenStackId - OpenStack ID Check Session Frame</title>
+@stop
+@section('content')
+    <div class="container">
+    </div>
+@stop
+@section('scripts')
+    {!! HTML::script('bower_assets/crypto-js/crypto-js.js')!!}
+    {!! HTML::script('bower_assets/jquery-cookie/jquery.cookie.js')!!}
+    {!! HTML::script('assets/js/oauth2/session/check.session.js')!!}
+@append
\ No newline at end of file
diff --git a/resources/views/oauth2/session/session-ended.blade.php b/resources/views/oauth2/session/session-ended.blade.php
new file mode 100644
index 00000000..7fa3e2b1
--- /dev/null
+++ b/resources/views/oauth2/session/session-ended.blade.php
@@ -0,0 +1,15 @@
+@extends('layout')
+
+@section('title')
+    <title>Welcome to OpenStackId - OpenStack ID Logout</title>
+@stop
+
+@section('content')
+    <div class="container">
+        <p>Your Session at OpenStackId had ended!</p>
+    </div>
+@stop
+@section('scripts')
+    {!! HTML::script('bower_assets/crypto-js/crypto-js.js')!!}
+    {!! HTML::script('bower_assets/jquery-cookie/jquery.cookie.js')!!}
+@append
\ No newline at end of file
diff --git a/app/views/oauth2/session/session-logout.blade.php b/resources/views/oauth2/session/session-logout.blade.php
similarity index 54%
rename from app/views/oauth2/session/session-logout.blade.php
rename to resources/views/oauth2/session/session-logout.blade.php
index 4f8f01de..373eaf68 100644
--- a/app/views/oauth2/session/session-logout.blade.php
+++ b/resources/views/oauth2/session/session-logout.blade.php
@@ -1,7 +1,7 @@
 @extends('layout')
 
 @section('title')
-    <title>Welcome to openstackId - OpenStack ID Logout</title>
+    <title>Welcome to OpenStackId - OpenStack ID Logout</title>
 @stop
 
 @section('content')
@@ -12,27 +12,27 @@
                 <p>
                     <ul>
                     @foreach ($clients as $client)
-                        <li><b>{{$client->website}}</b></li>
+                        <li><b>{!!$client->website!!}</b></li>
                     @endforeach
                     </ul>
                  </p>
-                {{ Form::open(array('url' => URL::action('OAuth2ProviderController@endSession'), 'method' => 'post',  "autocomplete" => "off")) }}
+                {!! Form::open(array('url' => URL::action('OAuth2\OAuth2ProviderController@endSession'), 'method' => 'post',  "autocomplete" => "off")) !!}
                     <fieldset>
                         <input  type="hidden" name="oidc_endsession_consent" id="oidc_endsession_consent" value="1"/>
-                        <input  type="hidden" name="id_token_hint" id="id_token_hint" value="{{$id_token_hint}}"/>
-                        <input  type="hidden" name="post_logout_redirect_uri" id="post_logout_redirect_uri" value="{{$post_logout_redirect_uri}}"/>
-                        <input  type="hidden" name="state" id="state" value="{{$state}}"/>
+                        <input  type="hidden" name="id_token_hint" id="id_token_hint" value="{!!$id_token_hint!!}"/>
+                        <input  type="hidden" name="post_logout_redirect_uri" id="post_logout_redirect_uri" value="{!!$post_logout_redirect_uri!!}"/>
+                        <input  type="hidden" name="state" id="state" value="{!!$state!!}"/>
                         <div class="form-group">
-                            {{ Form::submit('Yes ',array('id'=>'login','class'=>'btn active btn-primary')) }}
-                            <a class="btn btn-danger active" href="{{ URL::action('OAuth2ProviderController@cancelLogout') }}">No</a>
+                            {!! Form::submit('Yes ',array('id'=>'login','class'=>'btn active btn-primary')) !!}
+                            <a class="btn btn-danger active" href="{!! URL::action('OAuth2\OAuth2ProviderController@cancelLogout') !!}">No</a>
                         </div>
                     </fieldset>
-                {{ Form::close() }}
+                {!! Form::close() !!}
             </div>
         </div>
     </div>
 @stop
 @section('scripts')
-    {{ HTML::script('bower_assets/crypto-js/crypto-js.js')}}
-    {{ HTML::script('bower_assets/jquery-cookie/jquery.cookie.js')}}
+    {!! HTML::script('bower_assets/crypto-js/crypto-js.js')!!}
+    {!! HTML::script('bower_assets/jquery-cookie/jquery.cookie.js')!!}
 @append
\ No newline at end of file
diff --git a/resources/views/openid/consent.blade.php b/resources/views/openid/consent.blade.php
new file mode 100644
index 00000000..d1981c7e
--- /dev/null
+++ b/resources/views/openid/consent.blade.php
@@ -0,0 +1,51 @@
+@extends('layout')
+@section('title')
+<title>Welcome to OpenStackId - consent </title>
+@append
+
+@section('header_right')
+@if(Auth::check())
+Welcome, <a href="{!! URL::action("UserController@getProfile") !!}">{!!Auth::user()->identifier!!}</a>
+@endif
+@append
+
+@section('content')
+<div class="container">
+    <h4>OpenstackId - Openid verification</h4>
+    {!! Form::open(array('url' => URL::action("UserController@postConsent"),'id'=>'authorization_form', 'method' => 'post',  "autocomplete" => "off")) !!}
+    <fieldset>
+    <legend>
+        Sign in to <b>{!! $realm !!}</b> using your OpenStackId
+    </legend>
+    <p>A site identifying itself as <b>{!! $realm !!}</b></p>
+    <p>has asked us for confirmation that <a href="{!! str_replace("%23","#",$openid_url) !!}" target='_blank'>{!! str_replace("%23","#",$openid_url) !!}</a> is your identity URL</p>
+    @foreach ($views as $partial)
+        @include($partial->getName(),$partial->getData())
+    @endforeach
+    <div>
+        <label class="radio">
+            {!! Form::radio('trust[]', 'AllowOnce','true',array('id'=>'allow_once','class'=>'input-block-level')) !!}
+            Allow Once
+        </label>
+        <label class="radio">
+        {!! Form::radio('trust[]', 'AllowForever','',array('id'=>'allow_forever','class'=>'input-block-level')) !!}
+        Allow Forever
+         </label>
+        <label class="radio">
+        {!! Form::radio('trust[]', 'DenyOnce','',array('id'=>'deny_once','class'=>'input-block-level')) !!}
+        Deny Once
+        </label>
+        <label class="radio">
+        {!! Form::radio('trust[]', 'DenyForever','',array('id'=>'deny_forever','class'=>'input-block-level')) !!}
+        Deny Forever
+        </label>
+    </div>
+    {!! Form::submit('Ok',array("id" => "send_authorization", 'class' => 'btn btn-default btn-lg active btn-consent-action')) !!}
+    {!! Form::button('Cancel',array('id' => 'cancel_authorization', 'class' => 'btn active btn-lg btn-danger cancel_authorization btn-consent-action')) !!}
+    </fieldset>
+    {!! Form::close() !!}
+</div>
+@append
+@section('scripts')
+{!! HTML::script('assets/js/openid/consent.js') !!}
+@append
\ No newline at end of file
diff --git a/app/views/profile.blade.php b/resources/views/profile.blade.php
similarity index 72%
rename from app/views/profile.blade.php
rename to resources/views/profile.blade.php
index 47984414..2fc7756f 100644
--- a/app/views/profile.blade.php
+++ b/resources/views/profile.blade.php
@@ -13,34 +13,34 @@
         <div class="col-md-12">
             <div class="row">
                 <div class="col-md-12 col-xs-10">
-                    Hello, {{{ $username }}}.
-                    <div>Your OPENID: <a href="{{ str_replace("%23","#",$openid_url) }}">{{ str_replace("%23","#",$openid_url) }}</a></div>
+                    Hello, {!! $username !!}.
+                    <div>Your OPENID: <a href="{!! str_replace("%23","#",$openid_url) !!}">{!! str_replace("%23","#",$openid_url) !!}</a></div>
                 </div>
             </div>
             <div class="row">
                 <div class="col-md-12">
-                    {{ Form::open(array('url' => URL::action('UserController@postUserProfileOptions'), 'method' => 'post')) }}
+                    {!! Form::open(array('url' => URL::action('UserController@postUserProfileOptions'), 'method' => 'post')) !!}
                     <legend><span class="glyphicon glyphicon-info-sign pointable" aria-hidden="true" title="this information will be public on your profile page"></span>&nbsp;OpenStack ID Account Settings:</legend>
                     <div class="checkbox">
                         <label class="checkbox">
-                            {{ Form::checkbox('show_full_name', '1', $show_full_name) }}Show Full Name
+                            {!! Form::checkbox('show_full_name', '1', $show_full_name) !!}Show Full Name
                         </label>
                         </div>
                     <div class="checkbox">
                         <label class="checkbox">
-                            {{ Form::checkbox('show_email', '1', $show_email) }}Show Email
+                            {!! Form::checkbox('show_email', '1', $show_email) !!}Show Email
                         </label>
                         </div>
                     <div class="checkbox">
                         <label class="checkbox">
-                            {{ Form::checkbox('show_pic', '1', $show_pic) }}Show Photo
+                            {!! Form::checkbox('show_pic', '1', $show_pic) !!}Show Photo
                         </label>
                         </div>
                         <div class="pull-right">
-                            {{ Form::submit('Save',array('id'=>'save','class'=>'btn btn-default btn-md active')) }}
+                            {!! Form::submit('Save',array('id'=>'save','class'=>'btn btn-default btn-md active')) !!}
                         </div>
 
-                    {{ Form::close() }}
+                    {!! Form::close() !!}
                 </div>
             </div>
             @if (count($sites)>0)
@@ -64,10 +64,10 @@
                             @else
                         <tr class="error">
                             @endif
-                            <td width="50%">{{ $site->getRealm() }}</td>
-                            <td width="10%">{{ $site->getAuthorizationPolicy()}}</td>
-                            <td width="20%">{{ $site->getUITrustedData() }}</td>
-                            <td width="10%">{{ HTML::link(URL::action("UserController@deleteTrustedSite",array("id"=>$site->id)),'Delete',array('class'=>'btn btn-default btn-md active btn-delete del-realm','title'=>'Deletes a decision about a particular trusted site,')) }}</td>
+                            <td width="50%">{!! $site->getRealm() !!}</td>
+                            <td width="10%">{!! $site->getAuthorizationPolicy()!!}</td>
+                            <td width="20%">{!! $site->getUITrustedData() !!}</td>
+                            <td width="10%">{!! HTML::link(URL::action("UserController@deleteTrustedSite",array("id"=>$site->id)),'Delete',array('class'=>'btn btn-default btn-md active btn-delete del-realm','title'=>'Deletes a decision about a particular trusted site,')) !!}</td>
                         </tr>
                         @endforeach
                         </tbody>
@@ -98,11 +98,11 @@
                             @if(is_null($action->realm))
                             <td>Site</td>
                             @else
-                            <td>{{ $action->realm }}</td>
+                            <td>{!! $action->realm !!}</td>
                             @endif
-                            <td>{{ $action->user_action }}</td>
-                            <td>{{ $action->from_ip }}</td>
-                            <td>{{ $action->created_at }}</td>
+                            <td>{!! $action->user_action !!}</td>
+                            <td>{!! $action->from_ip !!}</td>
+                            <td>{!! $action->created_at !!}</td>
                         </tr>
                         @endforeach
                         </tbody>
diff --git a/resources/views/vendor/.gitkeep b/resources/views/vendor/.gitkeep
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/resources/views/vendor/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/server.php b/server.php
index 5f187f34..f65c7c44 100644
--- a/server.php
+++ b/server.php
@@ -1,19 +1,21 @@
 <?php
 
-$uri = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
+/**
+ * Laravel - A PHP Framework For Web Artisans
+ *
+ * @package  Laravel
+ * @author   Taylor Otwell <taylorotwell@gmail.com>
+ */
 
-$uri = urldecode($uri);
-
-$paths = require __DIR__.'/bootstrap/paths.php';
-
-$requested = $paths['public'].$uri;
+$uri = urldecode(
+    parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
+);
 
 // This file allows us to emulate Apache's "mod_rewrite" functionality from the
 // built-in PHP web server. This provides a convenient way to test a Laravel
 // application without having installed a "real" web server software here.
-if ($uri !== '/' and file_exists($requested))
-{
-	return false;
+if ($uri !== '/' && file_exists(__DIR__.'/public'.$uri)) {
+    return false;
 }
 
-require_once $paths['public'].'/index.php';
+require_once __DIR__.'/public/index.php';
diff --git a/storage/app/.gitignore b/storage/app/.gitignore
new file mode 100755
index 00000000..8f4803c0
--- /dev/null
+++ b/storage/app/.gitignore
@@ -0,0 +1,3 @@
+*
+!public/
+!.gitignore
diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore
new file mode 100755
index 00000000..d6b7ef32
--- /dev/null
+++ b/storage/app/public/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/storage/framework/.gitignore b/storage/framework/.gitignore
new file mode 100755
index 00000000..b02b700f
--- /dev/null
+++ b/storage/framework/.gitignore
@@ -0,0 +1,8 @@
+config.php
+routes.php
+schedule-*
+compiled.php
+services.json
+events.scanned.php
+routes.scanned.php
+down
diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore
new file mode 100755
index 00000000..d6b7ef32
--- /dev/null
+++ b/storage/framework/cache/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/storage/framework/sessions/.gitignore b/storage/framework/sessions/.gitignore
new file mode 100755
index 00000000..d6b7ef32
--- /dev/null
+++ b/storage/framework/sessions/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore
new file mode 100755
index 00000000..d6b7ef32
--- /dev/null
+++ b/storage/framework/views/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/app/tests/ApiEndpointTest.php b/tests/ApiEndpointTest.php
similarity index 84%
rename from app/tests/ApiEndpointTest.php
rename to tests/ApiEndpointTest.php
index 59dcc989..d1019beb 100644
--- a/app/tests/ApiEndpointTest.php
+++ b/tests/ApiEndpointTest.php
@@ -1,5 +1,8 @@
 <?php
 
+use Models\OAuth2\ApiEndpoint;
+use Models\OAuth2\Api;
+use Models\OAuth2\ApiScope;
 
 /**
  * Class ApiEndpointTest
@@ -11,7 +14,7 @@ class ApiEndpointTest extends TestCase {
     protected function prepareForTests()
     {
         parent::prepareForTests();
-        //Route::enableFilters();
+        $this->withoutMiddleware();
         $this->current_realm = Config::get('app.url');
     }
 
@@ -24,7 +27,7 @@ class ApiEndpointTest extends TestCase {
         $api_endpoint = ApiEndpoint::where('name','=','get-api')->first();
         $this->assertTrue(!is_null($api_endpoint));
 
-        $response = $this->action("GET", "ApiEndpointController@get",
+        $response = $this->action("GET", "Api\ApiEndpointController@get",
             $parameters = array('id' =>$api_endpoint->id),
             array(),
             array(),
@@ -42,7 +45,7 @@ class ApiEndpointTest extends TestCase {
      * @covers get api endpoint by list (paginated)
      */
     public function testGetByPage(){
-        $response = $this->action("GET", "ApiEndpointController@getByPage",
+        $response = $this->action("GET", "Api\ApiEndpointController@getByPage",
             $parameters = array('offset' => 1,'limit'=>10),
             array(),
             array(),
@@ -70,7 +73,7 @@ class ApiEndpointTest extends TestCase {
             'rate_limit'        => 60,
         );
 
-        $response = $this->action("POST", "ApiEndpointController@create",
+        $response = $this->action("POST", "Api\ApiEndpointController@create",
             $data,
             array(),
             array(),
@@ -99,7 +102,7 @@ class ApiEndpointTest extends TestCase {
             'rate_limit'        => 60,
         );
 
-        $response = $this->action("POST", "ApiEndpointController@create",
+        $response = $this->action("POST", "Api\ApiEndpointController@create",
             $data,
             array(),
             array(),
@@ -118,7 +121,7 @@ class ApiEndpointTest extends TestCase {
             'name'               => 'test-api-endpoint-update',
         );
 
-        $response = $this->action("PUT", "ApiEndpointController@update",$parameters = $data_updated, array(),
+        $response = $this->action("PUT", "Api\ApiEndpointController@update",$parameters = $data_updated, array(),
             array(),
             array());
 
@@ -145,7 +148,7 @@ class ApiEndpointTest extends TestCase {
             'rate_limit'        => 60,
         );
 
-        $response = $this->action("POST", "ApiEndpointController@create", $data);
+        $response = $this->action("POST", "Api\ApiEndpointController@create", $data);
         $this->assertResponseStatus(201);
         $content = $response->getContent();
         $json_response = json_decode($content);
@@ -153,13 +156,13 @@ class ApiEndpointTest extends TestCase {
         $new_id = $json_response->api_endpoint_id;
         //update status
 
-        $response = $this->action('DELETE',"ApiEndpointController@deactivate", array('id' => $new_id) );
+        $response = $this->action('DELETE',"Api\ApiEndpointController@deactivate", array('id' => $new_id) );
         $this->assertResponseStatus(200);
         $content = $response->getContent();
         $json_response = json_decode($content);
         $this->assertTrue($json_response==='ok');
 
-        $response = $this->action("GET", "ApiEndpointController@get",array('id' => $new_id));
+        $response = $this->action("GET", "Api\ApiEndpointController@get",array('id' => $new_id));
         $this->assertResponseStatus(200);
         $content = $response->getContent();
         $updated_values = json_decode($content);
@@ -174,14 +177,14 @@ class ApiEndpointTest extends TestCase {
 
         $id = $api_endpoint->id;
 
-        $response = $this->action("DELETE", "ApiEndpointController@delete",$parameters = array('id' => $id),
+        $response = $this->action("DELETE", "Api\ApiEndpointController@delete",$parameters = array('id' => $id),
             array(),
             array(),
             array());
 
         $this->assertResponseStatus(204);
 
-        $response = $this->action("GET", "ApiEndpointController@get",
+        $response = $this->action("GET", "Api\ApiEndpointController@get",
             $parameters = array('id' => $id),
             array(),
             array(),
@@ -197,7 +200,7 @@ class ApiEndpointTest extends TestCase {
         $scope        = ApiScope::where('name','=',sprintf('%s/api-endpoint/read',$this->current_realm))->first();
         $this->assertTrue(!is_null($scope));
 
-        $response = $this->action("PUT", "ApiEndpointController@addRequiredScope",array(
+        $response = $this->action("PUT", "Api\ApiEndpointController@addRequiredScope",array(
             'id'       => $api_endpoint->id,
             'scope_id' => $scope->id), array(),
             array(),
@@ -207,7 +210,7 @@ class ApiEndpointTest extends TestCase {
         $content = $response->getContent();
         $this->assertTrue(json_decode($content)==='ok');
 
-        $response = $this->action("GET", "ApiEndpointController@get",
+        $response = $this->action("GET", "Api\ApiEndpointController@get",
             $parameters = array('id' =>$api_endpoint->id),
             array(),
             array(),
@@ -226,7 +229,7 @@ class ApiEndpointTest extends TestCase {
         $scope        = ApiScope::where('name','=',sprintf('%s/api-endpoint/update',$this->current_realm))->first();
         $this->assertTrue(!is_null($scope));
 
-        $response = $this->action("DELETE", "ApiEndpointController@removeRequiredScope",array(
+        $response = $this->action("DELETE", "Api\ApiEndpointController@removeRequiredScope",array(
             'id'       => $api_endpoint->id,
             'scope_id' => $scope->id), array(),
             array(),
@@ -237,7 +240,7 @@ class ApiEndpointTest extends TestCase {
         $response = json_decode($content);
         $this->assertTrue($response==='ok');
 
-        $response = $this->action("GET", "ApiEndpointController@get",
+        $response = $this->action("GET", "Api\ApiEndpointController@get",
             $parameters = array('id' =>$api_endpoint->id),
             array(),
             array(),
diff --git a/app/tests/ApiScopeTest.php b/tests/ApiScopeTest.php
similarity index 83%
rename from app/tests/ApiScopeTest.php
rename to tests/ApiScopeTest.php
index beebeacf..668fa5fb 100644
--- a/app/tests/ApiScopeTest.php
+++ b/tests/ApiScopeTest.php
@@ -1,16 +1,18 @@
 <?php
+use Models\OAuth2\ApiScope;
+use Models\OAuth2\Api;
 
 /**
  * Class ApiScopeTest
  */
-class ApiScopeTest  extends TestCase {
+class ApiScopeTest extends TestCase {
 
     private $current_realm;
 
     protected function prepareForTests()
     {
         parent::prepareForTests();
-        //Route::enableFilters();
+        $this->withoutMiddleware();
         $this->current_realm = Config::get('app.url');
     }
 
@@ -23,7 +25,7 @@ class ApiScopeTest  extends TestCase {
         $scope = ApiScope::where('name','=', sprintf('%s/api-scope/read',$this->current_realm))->first();
         $this->assertTrue(!is_null($scope));
 
-        $response = $this->action("GET", "ApiScopeController@get",
+        $response = $this->action("GET", "Api\ApiScopeController@get",
             $parameters = array('id' => $scope->id),
             array(),
             array(),
@@ -41,7 +43,7 @@ class ApiScopeTest  extends TestCase {
      * @covers get api scopes by list (paginated)
      */
     public function testGetByPage(){
-        $response = $this->action("GET", "ApiScopeController@getByPage",
+        $response = $this->action("GET", "Api\ApiScopeController@getByPage",
             $parameters = array('offset' => 1,'limit'=>10),
             array(),
             array(),
@@ -70,10 +72,11 @@ class ApiScopeTest  extends TestCase {
             'active'             => true,
             'system'             => true,
             'default'            => true,
-            'api_id'             => $api->id
+            'api_id'             => $api->id,
+            'assigned_by_groups' => false,
         );
 
-        $response = $this->action("POST", "ApiScopeController@create",
+        $response = $this->action("POST", "Api\ApiScopeController@create",
             $data,
             array(),
             array(),
@@ -98,7 +101,7 @@ class ApiScopeTest  extends TestCase {
 
         $id = $scope->id;
 
-        $response = $this->action("DELETE", "ApiScopeController@delete",$parameters = array('id' => $id),
+        $response = $this->action("DELETE", "Api\ApiScopeController@delete",$parameters = array('id' => $id),
             array(),
             array(),
             array());
diff --git a/app/tests/ApiTest.php b/tests/ApiTest.php
similarity index 82%
rename from app/tests/ApiTest.php
rename to tests/ApiTest.php
index 0f8f0447..9e05f9ee 100644
--- a/app/tests/ApiTest.php
+++ b/tests/ApiTest.php
@@ -1,6 +1,7 @@
 <?php
 
-use oauth2\OAuth2Protocol;
+use Models\OAuth2\Api;
+use Models\OAuth2\ResourceServer;
 
 /**
  * Class ApiTest
@@ -15,7 +16,7 @@ class ApiTest extends TestCase {
     protected function prepareForTests()
     {
         parent::prepareForTests();
-        //Route::enableFilters();
+        $this->withoutMiddleware();
         $this->current_realm = Config::get('app.url');
         $parts = parse_url($this->current_realm);
         $this->current_host = $parts['host'];
@@ -25,7 +26,7 @@ class ApiTest extends TestCase {
 
         $api = Api::where('name','=','api')->first();
 
-        $response = $this->action("GET", "ApiController@get",
+        $response = $this->action("GET", "Api\ApiController@get",
             $parameters = array('id' => $api->id),
             array(),
             array(),
@@ -40,7 +41,7 @@ class ApiTest extends TestCase {
 
     public function testGetByPage(){
 
-        $response = $this->action("GET", "ApiController@getByPage",
+        $response = $this->action("GET", "Api\ApiController@getByPage",
             $parameters = array('offset' => 1,'limit'=>10),
             array(),
             array(),
@@ -63,7 +64,7 @@ class ApiTest extends TestCase {
             'resource_server_id' => $resource_server->id,
         );
 
-        $response = $this->action("POST", "ApiController@create",
+        $response = $this->action("POST", "Api\ApiController@create",
             $data,
             array(),
             array(),
@@ -87,7 +88,7 @@ class ApiTest extends TestCase {
             'resource_server_id' => $resource_server->id,
         );
 
-        $response = $this->action("POST", "ApiController@create",
+        $response = $this->action("POST", "Api\ApiController@create",
             $data,
             array(),
             array(),
@@ -100,14 +101,14 @@ class ApiTest extends TestCase {
         $this->assertTrue(isset($json_response->api_id) && !empty($json_response->api_id));
 
         $new_id = $json_response->api_id;
-        $response = $this->action("DELETE", "ApiController@delete",$parameters = array('id' => $new_id),
+        $response = $this->action("DELETE", "Api\ApiController@delete",$parameters = array('id' => $new_id),
             array(),
             array(),
             array());
 
         $this->assertResponseStatus(204);
 
-        $response = $this->action("GET", "ApiController@get",
+        $response = $this->action("GET", "Api\ApiController@get",
             $parameters = array('id' => $new_id),
             array(),
             array(),
@@ -129,7 +130,7 @@ class ApiTest extends TestCase {
             'resource_server_id' => $resource_server->id,
         );
 
-        $response = $this->action("POST", "ApiController@create",
+        $response = $this->action("POST", "Api\ApiController@create",
             $data,
             array(),
             array(),
@@ -150,7 +151,7 @@ class ApiTest extends TestCase {
             'description'        => 'test api updated',
         );
 
-        $response = $this->action("PUT", "ApiController@update",$parameters = $data_update, array(),
+        $response = $this->action("PUT", "Api\ApiController@update",$parameters = $data_update, array(),
             array(),
             array());
 
@@ -161,7 +162,7 @@ class ApiTest extends TestCase {
         $this->assertResponseStatus(200);
 
 
-        $response = $this->action("GET", "ApiController@get",
+        $response = $this->action("GET", "Api\ApiController@get",
             $parameters = array('id' =>$new_id),
             array(),
             array(),
@@ -186,7 +187,7 @@ class ApiTest extends TestCase {
             'resource_server_id' => $resource_server->id,
         );
 
-        $response = $this->action("POST", "ApiController@create",$data);
+        $response = $this->action("POST", "Api\ApiController@create",$data);
 	    $this->assertResponseStatus(201);
 
         $content = $response->getContent();
@@ -197,7 +198,7 @@ class ApiTest extends TestCase {
         $new_id = $json_response->api_id;
         //update status
 
-        $response = $this->action("PUT", "ApiController@activate",array('id'     => $new_id));
+        $response = $this->action("PUT", "Api\ApiController@activate",array('id'     => $new_id));
 	    $this->assertResponseStatus(200);
 
         $content = $response->getContent();
@@ -207,7 +208,7 @@ class ApiTest extends TestCase {
         $this->assertTrue($json_response==='ok');
 
 
-        $response = $this->action("GET", "ApiController@get",$parameters = array('id' => $new_id));
+        $response = $this->action("GET", "Api\ApiController@get",$parameters = array('id' => $new_id));
 
 	    $this->assertResponseStatus(200);
         $content = $response->getContent();
@@ -221,7 +222,7 @@ class ApiTest extends TestCase {
 
         $id = $resource_server_api->id;
 
-        $response = $this->action("DELETE", "ApiController@delete",$parameters = array('id' => $id),
+        $response = $this->action("DELETE", "Api\ApiController@delete",$parameters = array('id' => $id),
             array(),
             array(),
             array());
@@ -229,7 +230,7 @@ class ApiTest extends TestCase {
 
         $this->assertResponseStatus(204);
 
-        $response = $this->action("GET", "ApiController@get",
+        $response = $this->action("GET", "Api\ApiController@get",
             $parameters = array('id' => $id),
             array(),
             array(),
diff --git a/tests/AssociationServiceTest.php b/tests/AssociationServiceTest.php
new file mode 100644
index 00000000..eda153b4
--- /dev/null
+++ b/tests/AssociationServiceTest.php
@@ -0,0 +1,254 @@
+<?php
+
+use OpenId\Services\OpenIdServiceCatalog;
+use OpenId\Helpers\AssociationFactory;
+use OpenId\OpenIdProtocol;
+use Utils\Services\UtilsServiceCatalog;
+use Utils\Exceptions\UnacquiredLockException;
+
+class AssociationServiceTest extends TestCase
+{
+
+    public function __construct()
+    {
+
+    }
+
+    public function tearDown()
+    {
+        Mockery::close();
+    }
+
+    protected function prepareForTests()
+    {
+        parent::prepareForTests();
+    }
+
+    public function testAddPrivateAssociation()
+    {
+
+        $cache_stub = new CacheServiceStub;
+        $this->app->instance(UtilsServiceCatalog::CacheService, $cache_stub);
+
+        $lock_manager_service_mock = Mockery::mock(\Utils\Services\ILockManagerService::class);
+        $lock_manager_service_mock->shouldReceive('acquireLock')->once();
+
+        $this->app->instance(UtilsServiceCatalog::LockManagerService, $lock_manager_service_mock);
+
+        $service = $this->app[OpenIdServiceCatalog::AssociationService];
+        $assoc = AssociationFactory::getInstance()->buildPrivateAssociation('https://www.test.com/', 3600);
+        $res = $service->addAssociation($assoc);
+
+        $this->assertTrue(!is_null($res));
+    }
+
+
+    public function testAddSessionAssociation()
+    {
+
+        $cache_stub = new CacheServiceStub;
+        $this->app->instance(UtilsServiceCatalog::CacheService, $cache_stub);
+
+        $lock_manager_service_mock = Mockery::mock(\Utils\Services\ILockManagerService::class);
+        $lock_manager_service_mock->shouldReceive('acquireLock')->once();
+
+        $this->app->instance(UtilsServiceCatalog::LockManagerService, $lock_manager_service_mock);
+
+        $service = $this->app[OpenIdServiceCatalog::AssociationService];
+        $assoc = AssociationFactory::getInstance()->buildSessionAssociation(OpenIdProtocol::AssociationSessionTypeDHSHA256, 3600);
+        $res = $service->addAssociation($assoc);
+
+        $this->assertTrue(!is_null($res));
+    }
+
+    public function testGetSessionAssociationRedisCrash()
+    {
+
+        $cache_mock = Mockery::mock(\Utils\Services\ICacheService::class);
+        $cache_mock->shouldReceive('storeHash')->once();
+        $this->app->instance(UtilsServiceCatalog::CacheService, $cache_mock);
+
+        $lock_manager_service_mock = Mockery::mock(\Utils\Services\ILockManagerService::class);
+        $lock_manager_service_mock->shouldReceive('acquireLock')->once();
+
+        $this->app->instance(UtilsServiceCatalog::LockManagerService, $lock_manager_service_mock);
+
+        $service = $this->app[OpenIdServiceCatalog::AssociationService];
+        $assoc = AssociationFactory::getInstance()->buildSessionAssociation(OpenIdProtocol::AssociationSessionTypeDHSHA256, 3600);
+        $res = $service->addAssociation($assoc);
+
+        $this->assertTrue(!is_null($res));
+        $hash = null;
+        $cache_mock->shouldReceive('storeHash')->once()->andReturnUsing(function ($name, $values, $ttl) use (&$hash) {
+            $hash = $values;
+        });
+        $cache_mock->shouldReceive('exists')->once()->andReturn(false);
+        $cache_mock->shouldReceive('getHash')->once()->andReturnUsing(function ($name, $values) use (&$hash) {
+            return $hash;
+        });
+
+        $res2 = $service->getAssociation($res->getHandle());
+
+        $this->assertTrue(!is_null($res2));
+
+        $this->assertTrue($res2->getSecret() === $res->getSecret());
+    }
+
+
+    /**
+     * @expectedException \OpenId\Exceptions\InvalidAssociation
+     */
+    public function testGetSessionAssociationMustFail_InvalidAssociation()
+    {
+
+        $cache_mock = Mockery::mock(\Utils\Services\ICacheService::class);
+        $cache_mock->shouldReceive('storeHash')->once();
+        $this->app->instance(UtilsServiceCatalog::CacheService, $cache_mock);
+
+        $lock_manager_service_mock = Mockery::mock(\Utils\Services\ILockManagerService::class);
+        $lock_manager_service_mock->shouldReceive('acquireLock')->once();
+
+        $this->app->instance(UtilsServiceCatalog::LockManagerService, $lock_manager_service_mock);
+
+        $repo_mock = Mockery::mock(\OpenId\Repositories\IOpenIdAssociationRepository::class);
+        $this->app->instance(\OpenId\Repositories\IOpenIdAssociationRepository::class, $repo_mock);
+        $repo_mock->shouldReceive('add')->once();
+        $repo_mock->shouldReceive('getByHandle')->once()->andReturnNull();
+
+        $service = $this->app[OpenIdServiceCatalog::AssociationService];
+        $assoc = AssociationFactory::getInstance()->buildSessionAssociation(OpenIdProtocol::AssociationSessionTypeDHSHA256, 3600);
+        $res = $service->addAssociation($assoc);
+
+        $this->assertTrue(!is_null($res));
+        $hash = null;
+        $cache_mock->shouldReceive('exists')->once()->andReturn(false);
+        $service->getAssociation($res->getHandle());
+    }
+
+
+    /**
+     * @expectedException \openid\exceptions\ReplayAttackException
+     */
+    public function testAddPrivateAssociationMustFail_ReplayAttackException()
+    {
+
+        $cache_stub = new CacheServiceStub;
+        $this->app->instance(UtilsServiceCatalog::CacheService, $cache_stub);
+
+        $lock_manager_service_mock = Mockery::mock(\Utils\Services\ILockManagerService::class);
+        $lock_manager_service_mock->shouldReceive('acquireLock')->once();
+
+        $this->app->instance(UtilsServiceCatalog::LockManagerService, $lock_manager_service_mock);
+
+        $service = $this->app[OpenIdServiceCatalog::AssociationService];
+        $assoc = AssociationFactory::getInstance()->buildPrivateAssociation('https://www.test.com/', 3600);
+        $res = $service->addAssociation($assoc);
+
+        $this->assertTrue(!is_null($res));
+        $lock_manager_service_mock->shouldReceive('acquireLock')->once()->andThrow(new UnacquiredLockException);
+        $service->addAssociation($assoc);
+    }
+
+
+    public function testGetPrivateAssociation()
+    {
+
+        $cache_stub = new CacheServiceStub;
+        $this->app->instance(UtilsServiceCatalog::CacheService, $cache_stub);
+
+        $lock_manager_service_mock = Mockery::mock(\Utils\Services\ILockManagerService::class);
+        $lock_manager_service_mock->shouldReceive('acquireLock')->twice();
+
+        $this->app->instance(UtilsServiceCatalog::LockManagerService, $lock_manager_service_mock);
+
+        $service = $this->app[OpenIdServiceCatalog::AssociationService];
+        $assoc = AssociationFactory::getInstance()->buildPrivateAssociation('https://www.test.com/', 3600);
+        $res = $service->addAssociation($assoc);
+
+        $this->assertTrue(!is_null($res));
+
+        $res2 = $service->getAssociation($res->getHandle(), 'https://www.test.com/');
+
+        $this->assertTrue(!is_null($res2));
+
+        $this->assertTrue($res2->getSecret() === $res->getSecret());
+    }
+
+
+    /**
+     * @expectedException \OpenId\Exceptions\OpenIdInvalidRealmException
+     */
+    public function testGetPrivateAssociationMustFail_OpenIdInvalidRealmException()
+    {
+
+        $cache_stub = new CacheServiceStub;
+        $this->app->instance(UtilsServiceCatalog::CacheService, $cache_stub);
+
+        $lock_manager_service_mock = Mockery::mock(\Utils\Services\ILockManagerService::class);
+        $lock_manager_service_mock->shouldReceive('acquireLock')->once();
+
+        $this->app->instance(UtilsServiceCatalog::LockManagerService, $lock_manager_service_mock);
+
+        $service = $this->app[OpenIdServiceCatalog::AssociationService];
+        $assoc = AssociationFactory::getInstance()->buildPrivateAssociation('https://www.test.com/', 3600);
+        $res = $service->addAssociation($assoc);
+
+        $this->assertTrue(!is_null($res));
+
+        $service->getAssociation($res->getHandle(), 'https://www1.test.com/');
+    }
+
+    /**
+     * @expectedException \OpenId\Exceptions\InvalidAssociation
+     */
+    public function testGetPrivateAssociationMustFail_InvalidAssociation()
+    {
+
+        $cache_stub = new CacheServiceStub;
+        $this->app->instance(UtilsServiceCatalog::CacheService, $cache_stub);
+
+        $lock_manager_service_mock = Mockery::mock(\Utils\Services\ILockManagerService::class);
+        $lock_manager_service_mock->shouldReceive('acquireLock')->once();
+
+        $this->app->instance(UtilsServiceCatalog::LockManagerService, $lock_manager_service_mock);
+
+        $service = $this->app[OpenIdServiceCatalog::AssociationService];
+        $assoc = AssociationFactory::getInstance()->buildPrivateAssociation('https://www.test.com/', 3600);
+        $res = $service->addAssociation($assoc);
+
+        $this->assertTrue(!is_null($res));
+
+        $service->getAssociation('123456', 'https://www1.test.com/');
+    }
+
+
+    /**
+     * @expectedException \OpenId\Exceptions\ReplayAttackException
+     */
+    public function testGetPrivateAssociationMustFail_ReplayAttackException()
+    {
+
+
+        $cache_stub = new CacheServiceStub;
+        $this->app->instance(UtilsServiceCatalog::CacheService, $cache_stub);
+
+        $lock_manager_service_mock = Mockery::mock(\Utils\Services\ILockManagerService::class);
+        $lock_manager_service_mock->shouldReceive('acquireLock')->times(2);
+
+        $this->app->instance(UtilsServiceCatalog::LockManagerService, $lock_manager_service_mock);
+
+        $service = $this->app[OpenIdServiceCatalog::AssociationService];
+        $assoc = AssociationFactory::getInstance()->buildPrivateAssociation('https://www.test.com/', 3600);
+        $res = $service->addAssociation($assoc);
+
+        $this->assertTrue(!is_null($res));
+
+        $res2 = $service->getAssociation($res->getHandle(), 'https://www.test.com/');
+
+        $this->assertTrue(!is_null($res2));
+
+        $this->assertTrue($res2->getSecret() === $res->getSecret());
+        $lock_manager_service_mock->shouldReceive('acquireLock')->once()->andThrow(new UnacquiredLockException);
+        $service->getAssociation($res->getHandle(), 'https://www.test.com/');
+    }
+} 
\ No newline at end of file
diff --git a/app/tests/CacheServiceStub.php b/tests/CacheServiceStub.php
similarity index 97%
rename from app/tests/CacheServiceStub.php
rename to tests/CacheServiceStub.php
index 0f3efc1e..18f17ba0 100644
--- a/app/tests/CacheServiceStub.php
+++ b/tests/CacheServiceStub.php
@@ -1,8 +1,8 @@
 <?php
 
-use utils\services\ICacheService;
+use Utils\Services\ICacheService;
 
-class CacheServiceStub implements ICacheService{
+class CacheServiceStub implements ICacheService {
 
 	private static $cache = array();
 
diff --git a/app/tests/ClientApiTest.php b/tests/ClientApiTest.php
similarity index 57%
rename from app/tests/ClientApiTest.php
rename to tests/ClientApiTest.php
index 0e1a2499..f00585f3 100644
--- a/app/tests/ClientApiTest.php
+++ b/tests/ClientApiTest.php
@@ -11,10 +11,15 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 **/
-use oauth2\OAuth2Protocol;
-use oauth2\models\IClient;
-use auth\User;
 
+use OAuth2\Models\IClient;
+use Auth\User;
+use Models\OAuth2\Client;
+use Illuminate\Support\Facades\Session;
+
+/**
+ * Class ClientApiTest
+ */
 class ClientApiTest extends TestCase {
 
     private $current_realm;
@@ -24,29 +29,45 @@ class ClientApiTest extends TestCase {
     protected function prepareForTests()
     {
         parent::prepareForTests();
-        //Route::enableFilters();
+        $this->withoutMiddleware();
         $this->current_realm = Config::get('app.url');
-        $parts = parse_url($this->current_realm);
-        $this->current_host = $parts['host'];
+        $parts               = parse_url($this->current_realm);
+        $this->current_host  = $parts['host'];
+
+        $user = User::where('identifier', '=', 'sebastian.marcet')->first();
+        $this->be($user);
+        Session::start();
     }
 
     public function testGetById(){
 
-        $client = Client::where('app_name','=','oauth2_test_app')->first();
-
-        $response = $this->action("GET", "ClientApiController@get",
+        $client   = Client::where('app_name','=','oauth2_test_app')->first();
+        $response = $this->action("GET", "Api\\ClientApiController@get",
             $parameters = array('id' => $client->id),
             array(),
             array(),
             array());
 
-        $content                  = $response->getContent();
+        $content         = $response->getContent();
         $response_client = json_decode($content);
 
         $this->assertResponseStatus(200);
         $this->assertTrue($response_client->id === $client->id);
     }
 
+    public function testGetByPage(){
+
+        $response = $this->action("GET", "Api\\ClientApiController@getByPage",
+            $parameters = array('offset' => 1,'limit'=>10),
+            array(),
+            array(),
+            array());
+
+        $content         = $response->getContent();
+        $this->assertResponseStatus(200);
+        $list            = json_decode($content);
+        $this->assertTrue(isset($list->total_items) && intval($list->total_items)>0);
+    }
 
     public function testCreate(){
 
@@ -57,16 +78,16 @@ class ClientApiTest extends TestCase {
             'app_name'           => 'test_app',
             'app_description'    => 'test app',
             'website'            => 'http://www.test.com',
-            'application_type' => IClient::ApplicationType_Native
+            'application_type'   => IClient::ApplicationType_Native
         );
 
-        $response = $this->action("POST", "ClientApiController@create",
+        $response = $this->action("POST", "Api\\ClientApiController@create",
             $data,
             array(),
             array(),
             array());
 
-        $content = $response->getContent();
+        $content       = $response->getContent();
         $json_response = json_decode($content);
 
         $this->assertResponseStatus(201);
diff --git a/app/tests/ClientPublicKeyApiTest.php b/tests/ClientPublicKeyApiTest.php
similarity index 76%
rename from app/tests/ClientPublicKeyApiTest.php
rename to tests/ClientPublicKeyApiTest.php
index db032369..5630a184 100644
--- a/app/tests/ClientPublicKeyApiTest.php
+++ b/tests/ClientPublicKeyApiTest.php
@@ -11,12 +11,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 **/
-use oauth2\OAuth2Protocol;
-use oauth2\models\IClient;
-use auth\User;
+
+
 use jwk\JSONWebKeyTypes;
 use jwk\JSONWebKeyPublicKeyUseValues;
+use Models\OAuth2\Client;
+use jwa\JSONWebSignatureAndEncryptionAlgorithms;
 
+/**
+ * Class ClientPublicKeyApiTest
+ */
 class ClientPublicKeyApiTest extends TestCase {
 
     private $current_realm;
@@ -26,7 +30,7 @@ class ClientPublicKeyApiTest extends TestCase {
     protected function prepareForTests()
     {
         parent::prepareForTests();
-        //Route::enableFilters();
+        $this->withoutMiddleware();
         $this->current_realm = Config::get('app.url');
         $parts = parse_url($this->current_realm);
         $this->current_host = $parts['host'];
@@ -37,20 +41,25 @@ class ClientPublicKeyApiTest extends TestCase {
         $client_id = 'Jiz87D8/Vcvr6fvQbH4HyNgwTlfSyQ3x.openstack.client';
         $client    =  Client::where('client_id','=', $client_id)->first();
 
-        $data = array(
+        $data = array
+        (
             'kid'         => 'test key',
             'pem_content' => TestKeys::$public_key2_pem,
             'usage'       => JSONWebKeyPublicKeyUseValues::Signature,
-            'type'        => JSONWebKeyTypes::RSA
+            'type'        => JSONWebKeyTypes::RSA,
+            'active'      => false,
+            'valid_from'  => '01/01/2016',
+            'valid_to'    => '01/15/2016',
+            'alg'         => JSONWebSignatureAndEncryptionAlgorithms::RS512
         );
 
-        $response = $this->action("POST", "ClientPublicKeyApiController@create",
+        $response = $this->action("POST", "Api\ClientPublicKeyApiController@create",
             $wildcards = array('id' => $client->id),
             $data,
             array(),
             array());
 
-        $content = $response->getContent();
+        $content       = $response->getContent();
         $json_response = json_decode($content);
 
         $this->assertResponseStatus(201);
diff --git a/app/tests/CustomAuthProviderTest.php b/tests/CustomAuthProviderTest.php
similarity index 71%
rename from app/tests/CustomAuthProviderTest.php
rename to tests/CustomAuthProviderTest.php
index 850d4f6d..807b0ab1 100644
--- a/app/tests/CustomAuthProviderTest.php
+++ b/tests/CustomAuthProviderTest.php
@@ -12,9 +12,12 @@
 * limitations under the License.
 **/
 
-use auth\CustomAuthProvider;
-use utils\services\UtilsServiceCatalog;
-use openid\services\OpenIdServiceCatalog;
+use Auth\CustomAuthProvider;
+use Utils\Services\UtilsServiceCatalog;
+use OpenId\Services\OpenIdServiceCatalog;
+use Auth\Repositories\IUserRepository;
+use Auth\Repositories\IMemberRepository;
+use Auth\IAuthenticationExtensionService;
 
 /**
  * Class CustomAuthProviderTest
@@ -26,10 +29,10 @@ final class CustomAuthProviderTest extends TestCase {
      */
     public function testCreateProvider(){
 
-        $provider =   new CustomAuthProvider(
-            App::make('auth\\IUserRepository'),
-            App::make('auth\\IMemberRepository'),
-            App::make('auth\\IAuthenticationExtensionService'),
+        $provider =  new CustomAuthProvider(
+            App::make(IUserRepository::class),
+            App::make(IMemberRepository::class),
+            App::make(IAuthenticationExtensionService::class),
             App::make(OpenIdServiceCatalog::UserService),
             App::make(UtilsServiceCatalog::CheckPointService),
             App::make(UtilsServiceCatalog::TransactionService),
diff --git a/app/tests/DiffieHellmanTest.php b/tests/DiffieHellmanTest.php
similarity index 89%
rename from app/tests/DiffieHellmanTest.php
rename to tests/DiffieHellmanTest.php
index 90cfa43c..a1ead6c0 100644
--- a/app/tests/DiffieHellmanTest.php
+++ b/tests/DiffieHellmanTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use openid\helpers\AssocHandleGenerator;
-use openid\helpers\OpenIdCryptoHelper;
-use openid\requests\OpenIdDHAssociationSessionRequest;
+use OpenId\Helpers\AssocHandleGenerator;
+use OpenId\Helpers\OpenIdCryptoHelper;
+use OpenId\Requests\OpenIdDHAssociationSessionRequest;
 use Zend\Crypt\PublicKey\DiffieHellman;
 
 /**
diff --git a/app/tests/DiscoveryControllerTest.php b/tests/DiscoveryControllerTest.php
similarity index 72%
rename from app/tests/DiscoveryControllerTest.php
rename to tests/DiscoveryControllerTest.php
index 9874169a..6ba174f5 100644
--- a/app/tests/DiscoveryControllerTest.php
+++ b/tests/DiscoveryControllerTest.php
@@ -5,7 +5,7 @@ class DiscoveryControllerTest extends TestCase
 
     public function testIdpDiscovery()
     {
-        $response = $this->call('GET', '/discovery');
+        $response = $this->action("GET", "OpenId\DiscoveryController@idp");
         //"application/xrds+xml"
         $this->assertTrue($response->getStatusCode() === 200);
     }
diff --git a/app/tests/OAuth2ProtectedApiTest.php b/tests/OAuth2ProtectedApiTest.php
similarity index 59%
rename from app/tests/OAuth2ProtectedApiTest.php
rename to tests/OAuth2ProtectedApiTest.php
index 19251ae6..deae55dd 100644
--- a/app/tests/OAuth2ProtectedApiTest.php
+++ b/tests/OAuth2ProtectedApiTest.php
@@ -11,18 +11,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-use oauth2\OAuth2Protocol;
-use auth\User;
-use utils\services\IAuthService;
+
+use OAuth2\OAuth2Protocol;
+use Auth\User;
+use Utils\Services\IAuthService;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Config;
 
 /**
  * Class OAuth2ProtectedApiTest
  */
 abstract class OAuth2ProtectedApiTest extends OpenStackIDBaseTest {
 
+    /**
+     * @var string
+     */
     protected $access_token;
+    /**
+     * @var string
+     */
     protected $client_id;
+    /**
+     * @var string
+     */
     protected $client_secret;
+    /**
+     * @var string
+     */
     protected $current_realm;
 
     abstract protected function getScopes();
@@ -30,8 +45,6 @@ abstract class OAuth2ProtectedApiTest extends OpenStackIDBaseTest {
     protected function prepareForTests()
     {
         parent::prepareForTests();
-        Route::enableFilters();
-
         $this->current_realm = Config::get('app.url');
 
         $user =  User::where('identifier','=','sebastian.marcet')->first();
@@ -42,21 +55,21 @@ abstract class OAuth2ProtectedApiTest extends OpenStackIDBaseTest {
 
         $scope = $this->getScopes();
 
-        $this->client_id = 'Jiz87D8/Vcvr6fvQbH4HyNgwTlfSyQ3x.openstack.client';
+        $this->client_id     = 'Jiz87D8/Vcvr6fvQbH4HyNgwTlfSyQ3x.openstack.client';
         $this->client_secret = 'ITc/6Y5N7kOtGKhgITc/6Y5N7kOtGKhgITc/6Y5N7kOtGKhgITc/6Y5N7kOtGKhg';
 
-        $params = array(
-            'client_id' => $this->client_id,
-            'redirect_uri' => 'https://www.test.com/oauth2',
-            'response_type' => OAuth2Protocol::OAuth2Protocol_ResponseType_Code,
-            'scope' => implode(' ',$scope),
-            OAuth2Protocol::OAuth2Protocol_AccessType =>OAuth2Protocol::OAuth2Protocol_AccessType_Offline,
+        $params = array
+        (
+            'client_id'                               => $this->client_id,
+            'redirect_uri'                            => 'https://www.test.com/oauth2',
+            'response_type'                           => OAuth2Protocol::OAuth2Protocol_ResponseType_Code,
+            'scope'                                   => implode(' ',$scope),
+            OAuth2Protocol::OAuth2Protocol_AccessType => OAuth2Protocol::OAuth2Protocol_AccessType_Offline,
         );
 
-
         Session::set("openid.authorization.response", IAuthService::AuthorizationResponse_AllowOnce);
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -71,27 +84,31 @@ abstract class OAuth2ProtectedApiTest extends OpenStackIDBaseTest {
         $output = array();
         parse_str($query, $output);
 
-        $params = array(
-            'code' => $output['code'],
+        $params = array
+        (
+            'code'         => $output['code'],
             'redirect_uri' => 'https://www.test.com/oauth2',
-            'grant_type' => OAuth2Protocol::OAuth2Protocol_GrantType_AuthCode,
+            'grant_type'   => OAuth2Protocol::OAuth2Protocol_GrantType_AuthCode,
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@token",
+        $response = $this->action
+        (
+            $method = "POST",
+            $action = "OAuth2\OAuth2ProviderController@token",
             $params,
             array(),
             array(),
-            // Symfony interally prefixes headers with "HTTP", so
-            array("HTTP_Authorization" => " Basic " . base64_encode($this->client_id . ':' . $this->client_secret)));
+            array(),
+            array("HTTP_Authorization" => " Basic " . base64_encode($this->client_id . ':' . $this->client_secret))
+        );
 
         $status = $response->getStatusCode();
 
         $this->assertResponseStatus(200);
 
-        $content = $response->getContent();
-
-        $response = json_decode($content);
-        $access_token = $response->access_token;
+        $content       = $response->getContent();
+        $response      = json_decode($content);
+        $access_token  = $response->access_token;
         $refresh_token = $response->refresh_token;
 
         $this->access_token = $access_token;
diff --git a/app/tests/OAuth2ProtocolTest.php b/tests/OAuth2ProtocolTest.php
similarity index 87%
rename from app/tests/OAuth2ProtocolTest.php
rename to tests/OAuth2ProtocolTest.php
index bd57a3fd..4c0103d8 100644
--- a/app/tests/OAuth2ProtocolTest.php
+++ b/tests/OAuth2ProtocolTest.php
@@ -1,24 +1,11 @@
 <?php
 
-use auth\User;
+use Auth\User;
 use Illuminate\Support\Facades\App;
-use oauth2\OAuth2Protocol;
-use services\utils\ServerConfigurationService;
-use utils\services\IAuthService;
-use utils\services\UtilsServiceCatalog;
-
-class StubServerConfigurationService extends ServerConfigurationService
-{
-
-    public function getConfigValue($value)
-    {
-        if ($value === 'OAuth2.AccessToken.Lifetime' && isset($_ENV['access.token.lifetime'])) {
-            return intval($_ENV['access.token.lifetime']);
-        }
-
-        return parent::getConfigValue($value);
-    }
-}
+use OAuth2\OAuth2Protocol;
+use Utils\Services\IAuthService;
+use Utils\Services\UtilsServiceCatalog;
+use Illuminate\Support\Facades\Session;
 
 /**
  * Class OAuth2ProtocolTest
@@ -45,8 +32,6 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
     public function testAuthCode()
     {
 
-        Route::enableFilters();
-
         $client_id = 'Jiz87D8/Vcvr6fvQbH4HyNgwTlfSyQ3x.openstack.client';
 
         $params = array(
@@ -56,7 +41,7 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             'scope' => sprintf('%s/resource-server/read', $this->current_realm),
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -73,7 +58,7 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $auth_response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $auth_response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -99,8 +84,6 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
     public function testCancelAuthCode()
     {
 
-        Route::enableFilters();
-
         $client_id = 'Jiz87D8/Vcvr6fvQbH4HyNgwTlfSyQ3x.openstack.client';
 
         $params = array(
@@ -110,7 +93,7 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             'scope' => sprintf('%s/resource-server/read', $this->current_realm),
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -133,8 +116,6 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
     public function testAuthCodeInvalidRedirectUri()
     {
 
-        Route::enableFilters();
-
         $client_id = 'Jiz87D8/Vcvr6fvQbH4HyNgwTlfSyQ3x.openstack.client';
 
         $params = array(
@@ -144,7 +125,7 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             'scope' => sprintf('%s/resource-server/read', $this->current_realm),
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -177,11 +158,12 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
 
         Session::set("openid.authorization.response", IAuthService::AuthorizationResponse_AllowOnce);
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
-            array());
+            array()
+        );
 
         $status = $response->getStatusCode();
         $url = $response->getTargetUrl();
@@ -199,12 +181,17 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
         );
 
 
-        $response = $this->action("POST", "OAuth2ProviderController@token",
+        $response = $this->action
+        (
+            "POST",
+            "OAuth2\OAuth2ProviderController@token",
             $params,
             array(),
             array(),
-            // Symfony interally prefixes headers with "HTTP", so
-            array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
+            array(),
+            // Symfony internally prefixes headers with "HTTP", so
+            array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret))
+        );
 
         $status = $response->getStatusCode();
 
@@ -251,7 +238,7 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
 
         Session::set("openid.authorization.response", IAuthService::AuthorizationResponse_AllowOnce);
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -273,10 +260,11 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
         );
 
 
-        $response = $this->action("POST", "OAuth2ProviderController@token",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
             $params,
             array(),
             array(),
+            array(),
             // Symfony interally prefixes headers with "HTTP", so
             array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -293,10 +281,11 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
         $this->assertTrue(!empty($access_token));
         $this->assertTrue(!empty($refresh_token));
 
-        $response = $this->action("POST", "OAuth2ProviderController@token",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
             $params,
             array(),
             array(),
+            array(),
             // Symfony interally prefixes headers with "HTTP", so
             array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -327,7 +316,7 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
                 'scope' => sprintf('%s/resource-server/read', $this->current_realm),
             );
 
-            $response = $this->action("POST", "OAuth2ProviderController@authorize",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
                 $params,
                 array(),
                 array(),
@@ -352,10 +341,11 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             );
 
 
-            $response = $this->action("POST", "OAuth2ProviderController@token",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
                 $params,
                 array(),
                 array(),
+                array(),
                 // Symfony interally prefixes headers with "HTTP", so
                 array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -376,10 +366,11 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
                 'token' => $access_token,
             );
 
-            $response = $this->action("POST", "OAuth2ProviderController@introspection",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@introspection",
                 $params,
                 array(),
                 array(),
+                array(),
                 // Symfony interally prefixes headers with "HTTP", so
                 array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -409,10 +400,11 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             'token' => $access_token,
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@introspection",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@introspection",
             $params,
             array(),
             array(),
+            array(),
             // Symfony interally prefixes headers with "HTTP", so
             array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -438,10 +430,11 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             'token' => $access_token,
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@introspection",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@introspection",
             $params,
             array(),
             array(),
+            array(),
             // Symfony interally prefixes headers with "HTTP", so
             array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -476,7 +469,7 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
                 'scope' => sprintf('%s/resource-server/read', $this->current_realm),
             );
 
-            $response = $this->action("POST", "OAuth2ProviderController@authorize",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
                 $params,
                 array(),
                 array(),
@@ -501,10 +494,11 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             );
 
 
-            $response = $this->action("POST", "OAuth2ProviderController@token",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
                 $params,
                 array(),
                 array(),
+                array(),
                 // Symfony interally prefixes headers with "HTTP", so
                 array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -525,10 +519,11 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
                 'token' => $access_token,
             );
 
-            $response = $this->action("POST", "OAuth2ProviderController@introspection",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@introspection",
                 $params,
                 array(),
                 array(),
+                array(),
                 // Symfony interally prefixes headers with "HTTP", so
                 array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -538,10 +533,11 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
 
             $response = json_decode($content);
 
-            $response = $this->action("POST", "OAuth2ProviderController@introspection",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@introspection",
                 $params,
                 array(),
                 array(),
+                array(),
                 // Symfony interally prefixes headers with "HTTP", so
                 array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -579,7 +575,7 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
                 OAuth2Protocol::OAuth2Protocol_AccessType => OAuth2Protocol::OAuth2Protocol_AccessType_Offline
             );
 
-            $response = $this->action("POST", "OAuth2ProviderController@authorize",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
                 $params,
                 array(),
                 array(),
@@ -604,10 +600,11 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             );
 
 
-            $response = $this->action("POST", "OAuth2ProviderController@token",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
                 $params,
                 array(),
                 array(),
+                array(),
                 // Symfony interally prefixes headers with "HTTP", so
                 array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -630,10 +627,11 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
                 'grant_type' => OAuth2Protocol::OAuth2Protocol_GrantType_RefreshToken,
             );
 
-            $response = $this->action("POST", "OAuth2ProviderController@token",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
                 $params,
                 array(),
                 array(),
+                array(),
                 // Symfony interally prefixes headers with "HTTP", so
                 array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -670,53 +668,55 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
 
             //do authorization ...
 
-            $params = array(
-                'client_id' => $client_id,
-                'redirect_uri' => 'https://www.test.com/oauth2',
-                'response_type' => OAuth2Protocol::OAuth2Protocol_ResponseType_Code,
-                'scope' => sprintf('%s/resource-server/read', $this->current_realm),
+            $params = [
+                'client_id'                               => $client_id,
+                'redirect_uri'                            => 'https://www.test.com/oauth2',
+                'response_type'                           => OAuth2Protocol::OAuth2Protocol_ResponseType_Code,
+                'scope'                                   => sprintf('%s/resource-server/read', $this->current_realm),
                 OAuth2Protocol::OAuth2Protocol_AccessType => OAuth2Protocol::OAuth2Protocol_AccessType_Offline
-            );
+            ];
 
-            $response = $this->action("POST", "OAuth2ProviderController@authorize",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
                 $params,
                 array(),
                 array(),
                 array());
 
-            $status = $response->getStatusCode();
-            $url = $response->getTargetUrl();
+            $status  = $response->getStatusCode();
+            $url     = $response->getTargetUrl();
             $content = $response->getContent();
 
             // get auth code ...
-            $comps = @parse_url($url);
-            $query = $comps['query'];
+            $comps  = @parse_url($url);
+            $query  = $comps['query'];
             $output = array();
+
             parse_str($query, $output);
 
 
             //do get auth token...
             $params = array(
-                'code' => $output['code'],
+                'code'         => $output['code'],
                 'redirect_uri' => 'https://www.test.com/oauth2',
-                'grant_type' => OAuth2Protocol::OAuth2Protocol_GrantType_AuthCode,
+                'grant_type'   => OAuth2Protocol::OAuth2Protocol_GrantType_AuthCode,
             );
 
 
-            $response = $this->action("POST", "OAuth2ProviderController@token",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
                 $params,
                 array(),
                 array(),
+                array(),
                 // Symfony interally prefixes headers with "HTTP", so
                 array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
             $this->assertResponseStatus(200);
 
-            $content = $response->getContent();
+            $content       = $response->getContent();
 
-            $response = json_decode($content);
+            $response      = json_decode($content);
             //get access token and refresh token...
-            $access_token = $response->access_token;
+            $access_token  = $response->access_token;
             $refresh_token = $response->refresh_token;
 
             $this->assertTrue(!empty($access_token));
@@ -725,13 +725,14 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
 
             $params = array(
                 'refresh_token' => $refresh_token,
-                'grant_type' => OAuth2Protocol::OAuth2Protocol_GrantType_RefreshToken,
+                'grant_type'    => OAuth2Protocol::OAuth2Protocol_GrantType_RefreshToken,
             );
 
-            $response = $this->action("POST", "OAuth2ProviderController@token",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
                 $params,
                 array(),
                 array(),
+                array(),
                 // Symfony interally prefixes headers with "HTTP", so
                 array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -742,17 +743,18 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             $response = json_decode($content);
 
             //get new access token and new refresh token...
-            $new_access_token = $response->access_token;
+            $new_access_token  = $response->access_token;
             $new_refresh_token = $response->refresh_token;
 
             $this->assertTrue(!empty($new_access_token));
             $this->assertTrue(!empty($new_refresh_token));
 
             //do re refresh and we will get a 400 http error ...
-            $response = $this->action("POST", "OAuth2ProviderController@token",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
                 $params,
                 array(),
                 array(),
+                array(),
                 // Symfony interally prefixes headers with "HTTP", so
                 array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -786,7 +788,7 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
                 OAuth2Protocol::OAuth2Protocol_AccessType => OAuth2Protocol::OAuth2Protocol_AccessType_Offline
             );
 
-            $response = $this->action("POST", "OAuth2ProviderController@authorize",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
                 $params,
                 array(),
                 array(),
@@ -811,10 +813,11 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             );
 
 
-            $response = $this->action("POST", "OAuth2ProviderController@token",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
                 $params,
                 array(),
                 array(),
+                array(),
                 // Symfony interally prefixes headers with "HTTP", so
                 array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
             $this->assertResponseStatus(200);
@@ -838,10 +841,11 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
                 'grant_type' => OAuth2Protocol::OAuth2Protocol_GrantType_RefreshToken,
             );
 
-            $response = $this->action("POST", "OAuth2ProviderController@token",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
                 $params,
                 array(),
                 array(),
+                array(),
                 // Symfony interally prefixes headers with "HTTP", so
                 array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -867,7 +871,7 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             'state' => '123456'
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -906,7 +910,7 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             'state' => '123456'
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -935,7 +939,7 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_ClientId => $client_id
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@revoke",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@revoke",
             $params,
             array(),
             array(),
@@ -960,7 +964,7 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             'state' => '123456'
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -990,7 +994,7 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_ClientId => $client_id
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@revoke",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@revoke",
             $params,
             array(),
             array(),
@@ -1015,7 +1019,7 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             'state' => '123456'
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -1044,7 +1048,7 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_ClientId => $client_id
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@revoke",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@revoke",
             $params,
             array(),
             array(),
@@ -1070,7 +1074,7 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             'state' => '123456'
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -1098,7 +1102,7 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_ClientId => $client_id
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@revoke",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@revoke",
             $params,
             array(),
             array(),
@@ -1120,10 +1124,11 @@ class OAuth2ProtocolTest extends OpenStackIDBaseTest
                 OAuth2Protocol::OAuth2Protocol_Scope => sprintf('%s/resource-server/read', $this->current_realm),
             );
 
-            $response = $this->action("POST", "OAuth2ProviderController@token",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
                 $params,
                 array(),
                 array(),
+                array(),
                 // Symfony interally prefixes headers with "HTTP", so
                 array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
diff --git a/app/tests/OAuth2UserServiceApiTest.php b/tests/OAuth2UserServiceApiTest.php
similarity index 60%
rename from app/tests/OAuth2UserServiceApiTest.php
rename to tests/OAuth2UserServiceApiTest.php
index 72ff21e2..ab0644fd 100644
--- a/app/tests/OAuth2UserServiceApiTest.php
+++ b/tests/OAuth2UserServiceApiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use oauth2\resource_server\IUserService;
+use OAuth2\ResourceServer\IUserService;
 
 /**
  * Class OAuth2UserServiceApiTest
@@ -13,7 +13,8 @@ class OAuth2UserServiceApiTest extends OAuth2ProtectedApiTest {
      */
     public function testGetInfo(){
 
-        $response = $this->action("GET", "OAuth2UserApiController@me",
+        $response = $this->action("GET", "Api\OAuth2\OAuth2UserApiController@me",
+            array(),
             array(),
             array(),
             array(),
@@ -25,19 +26,20 @@ class OAuth2UserServiceApiTest extends OAuth2ProtectedApiTest {
     }
 
     public function testGetInfoCORS(){
-        $response = $this->action("OPTIONS", "OAuth2UserApiController@me",
+        $response = $this->action("GET", "Api\OAuth2\OAuth2UserApiController@me",
+            array(),
             array(),
             array(),
             array(),
             array(
-                "HTTP_Authorization" => " Bearer " .$this->access_token,
-                'HTTP_Origin' => array('www.test.com','www.test1.com'),
-                'HTTP_Access-Control-Request-Method'=>'GET',
+                "HTTP_Authorization"                  => " Bearer " .$this->access_token,
+                'HTTP_Origin'                         => array('www.test.com'),
+                'HTTP_Host'                           => 'local.openstackid.openstack.org',
+                'HTTP_Access-Control-Request-Method'  => 'GET',
             ));
 
-        $this->assertResponseStatus(403);
+        $this->assertResponseStatus(200);
         $content   = $response->getContent();
-        $user_info = json_decode($content);
     }
 
     protected function getScopes()
diff --git a/app/tests/OIDCProtocolTest.php b/tests/OIDCProtocolTest.php
similarity index 91%
rename from app/tests/OIDCProtocolTest.php
rename to tests/OIDCProtocolTest.php
index d4bf5c75..7f3add4a 100644
--- a/app/tests/OIDCProtocolTest.php
+++ b/tests/OIDCProtocolTest.php
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-use auth\User;
+use Auth\User;
 use Illuminate\Support\Facades\App;
 use jwa\JSONWebSignatureAndEncryptionAlgorithms;
 use jwe\IJWE;
@@ -26,12 +26,12 @@ use jws\impl\specs\JWS_ParamsSpecification;
 use jws\JWSFactory;
 use jwt\RegisteredJWTClaimNames;
 use jwt\utils\JWTClaimSetFactory;
-use oauth2\models\ClientAssertionAuthenticationContext;
-use oauth2\OAuth2Protocol;
+use OAuth2\Models\ClientAssertionAuthenticationContext;
+use OAuth2\OAuth2Protocol;
 use utils\factories\BasicJWTFactory;
 use utils\json_types\StringOrURI;
-use utils\services\IAuthService;
-use utils\services\UtilsServiceCatalog;
+use Utils\Services\IAuthService;
+use Utils\Services\UtilsServiceCatalog;
 use jwt\impl\UnsecuredJWT;
 /**
  * Class OIDCProtocolTest
@@ -49,7 +49,6 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
         parent::prepareForTests();
         App::singleton(UtilsServiceCatalog::ServerConfigurationService, 'StubServerConfigurationService');
         $this->current_realm = Config::get('app.url');
-        Route::enableFilters();
         Session::start();
     }
 
@@ -67,7 +66,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_Prompt => OAuth2Protocol::OAuth2Protocol_Prompt_None
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -104,7 +103,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_Display   => OAuth2Protocol::OAuth2Protocol_Display_Native
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -146,7 +145,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_Prompt => OAuth2Protocol::OAuth2Protocol_Prompt_Consent
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -175,7 +174,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -191,7 +190,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             '_token' => Session::token()
         ));
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -230,7 +229,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_Prompt => sprintf('%s %s', OAuth2Protocol::OAuth2Protocol_Prompt_Consent, OAuth2Protocol::OAuth2Protocol_Prompt_Login)
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -259,7 +258,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -275,7 +274,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             '_token' => Session::token()
         ));
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -310,7 +309,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_MaxAge => 3200
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -339,7 +338,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -359,7 +358,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get auth code
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -394,7 +393,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_MaxAge => 3200
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -426,7 +425,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             'client_id' => $client_id,
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -452,7 +451,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -472,7 +471,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get auth code
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -506,7 +505,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_MaxAge => 1
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -537,7 +536,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         sleep(2);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -568,7 +567,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_MaxAge => 3200
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -597,7 +596,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -618,7 +617,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get auth code
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -642,10 +641,11 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             'grant_type' => OAuth2Protocol::OAuth2Protocol_GrantType_AuthCode,
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@token",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
             $params,
             array(),
             array(),
+            array(),
             // Symfony interally prefixes headers with "HTTP", so
             array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -713,7 +713,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_MaxAge => 3200
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -742,7 +742,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -763,7 +763,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get auth code
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -787,10 +787,11 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             'grant_type' => OAuth2Protocol::OAuth2Protocol_GrantType_AuthCode,
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@token",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
             $params,
             array(),
             array(),
+            array(),
             // Symfony interally prefixes headers with "HTTP", so
             array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -856,7 +857,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_Display   => OAuth2Protocol::OAuth2Protocol_Display_Native
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -882,7 +883,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -905,7 +906,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get auth code
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -929,10 +930,11 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             'grant_type' => OAuth2Protocol::OAuth2Protocol_GrantType_AuthCode,
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@token",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
             $params,
             array(),
             array(),
+            array(),
             // Symfony interally prefixes headers with "HTTP", so
             array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -970,7 +972,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_MaxAge    => 3200,
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params_auth_code,
             array(),
             array(),
@@ -999,7 +1001,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -1020,7 +1022,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get auth code
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -1044,10 +1046,11 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             'grant_type' => OAuth2Protocol::OAuth2Protocol_GrantType_AuthCode,
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@token",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
             $params,
             array(),
             array(),
+            array(),
             // Symfony interally prefixes headers with "HTTP", so
             array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -1070,7 +1073,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $iteration = 0;
         do {
-            $response = $this->action("POST", "OAuth2ProviderController@authorize",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
                 $params_auth_code,
                 array(),
                 array(),
@@ -1093,7 +1096,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
             // get auth code
 
-            $response = $this->action("GET", "OAuth2ProviderController@authorize",
+            $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
                 array(),
                 array(),
                 array(),
@@ -1120,10 +1123,11 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
                 'grant_type'   => OAuth2Protocol::OAuth2Protocol_GrantType_AuthCode,
             );
 
-            $response = $this->action("POST", "OAuth2ProviderController@token",
+            $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
                 $params,
                 array(),
                 array(),
+                array(),
                 // Symfony interally prefixes headers with "HTTP", so
                 array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -1165,7 +1169,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_ResponseMode => OAuth2Protocol::OAuth2Protocol_ResponseMode_FormPost
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -1194,7 +1198,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -1215,7 +1219,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get auth code
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -1239,10 +1243,11 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
         );
 
 
-        $response = $this->action("POST", "OAuth2ProviderController@token",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
             $params,
             array(),
             array(),
+            array(),
             // Symfony interally prefixes headers with "HTTP", so
             array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -1310,7 +1315,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_ResponseMode => OAuth2Protocol::OAuth2Protocol_ResponseMode_FormPost
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -1339,7 +1344,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -1360,7 +1365,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get auth code
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -1384,10 +1389,11 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
         );
 
 
-        $response = $this->action("POST", "OAuth2ProviderController@token",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
             $params,
             array(),
             array(),
+            array(),
             // Symfony interally prefixes headers with "HTTP", so
             array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -1423,7 +1429,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_Prompt => OAuth2Protocol::OAuth2Protocol_Prompt_None
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -1447,7 +1453,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_MaxAge => 3200
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -1476,7 +1482,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -1497,7 +1503,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get auth code
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -1523,7 +1529,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             (
                 RegisteredJWTClaimNames::Issuer => $client_id,
                 RegisteredJWTClaimNames::Subject => $client_id,
-                RegisteredJWTClaimNames::Audience => URL::action("OAuth2ProviderController@token"),
+                RegisteredJWTClaimNames::Audience => URL::action("OAuth2\OAuth2ProviderController@token"),
                 RegisteredJWTClaimNames::JWTID => '123456789',
                 RegisteredJWTClaimNames::ExpirationTime => $now + 3600,
                 RegisteredJWTClaimNames::IssuedAt => $now
@@ -1564,7 +1570,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
         $response = $this->action
         (
             "POST",
-            "OAuth2ProviderController@token",
+            "OAuth2\OAuth2ProviderController@token",
             $params,
             array(),
             array(),
@@ -1625,7 +1631,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_MaxAge => 3200
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -1654,7 +1660,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -1675,7 +1681,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get auth code
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -1701,7 +1707,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             (
                 RegisteredJWTClaimNames::Issuer => $client_id,
                 RegisteredJWTClaimNames::Subject => $client_id,
-                RegisteredJWTClaimNames::Audience => URL::action("OAuth2ProviderController@token"),
+                RegisteredJWTClaimNames::Audience => URL::action("OAuth2\OAuth2ProviderController@token"),
                 RegisteredJWTClaimNames::JWTID => '123456789',
                 RegisteredJWTClaimNames::ExpirationTime => $now + 3600,
                 RegisteredJWTClaimNames::IssuedAt => $now
@@ -1745,7 +1751,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
         $response = $this->action
         (
             "POST",
-            "OAuth2ProviderController@token",
+            "OAuth2\OAuth2ProviderController@token",
             $params,
             array(),
             array(),
@@ -1783,7 +1789,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_Nonce => 'ctqg5FeNoYnZ',
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -1805,7 +1811,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -1821,7 +1827,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get response
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -1863,7 +1869,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_Nonce => 'ctqg5FeNoYnZ',
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -1886,7 +1892,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -1902,7 +1908,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get response
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -1943,7 +1949,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_Nonce => 'ctqg5FeNoYnZ',
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -1966,7 +1972,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -1982,7 +1988,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get response
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -2008,7 +2014,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
         $params[OAuth2Protocol::OAuth2Protocol_Prompt] = OAuth2Protocol::OAuth2Protocol_Prompt_None;
         $params['scope'] = sprintf('%s profile email', OAuth2Protocol::OpenIdConnect_Scope);
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -2050,7 +2056,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_Nonce => 'ctqg5FeNoYnZ',
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -2073,7 +2079,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -2089,7 +2095,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get response
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -2132,7 +2138,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_Nonce => 'ctqg5FeNoYnZ',
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -2154,7 +2160,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -2170,7 +2176,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get response
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -2194,7 +2200,10 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
     public function testUserInfoEndpointGETAndBearerHeader()
     {
         $access_token = $this->testToken();
-        $response = $this->action("GET", "OAuth2UserApiController@userInfo",
+        $response = $this->action(
+            "GET",
+            "Api\OAuth2\OAuth2UserApiController@userInfo",
+            array(),
             array(),
             array(),
             array(),
@@ -2211,7 +2220,8 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
     public function testUserInfoEndpointPOSTAndBearerHeader()
     {
         $access_token = $this->testToken();
-        $response = $this->action("POST", "OAuth2UserApiController@userInfo",
+        $response = $this->action("POST", "Api\OAuth2\OAuth2UserApiController@userInfo",
+            array(),
             array(),
             array(),
             array(),
@@ -2228,7 +2238,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
     public function testUserInfoEndpointPOSTAndBearerBody()
     {
         $access_token = $this->testToken();
-        $response = $this->action("POST", "OAuth2UserApiController@userInfo",
+        $response = $this->action("POST", "Api\OAuth2\OAuth2UserApiController@userInfo",
             array(),
             array
             (
@@ -2254,7 +2264,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             false
         );
 
-        $response = $this->action("POST", "OAuth2UserApiController@userInfo",
+        $response = $this->action("POST", "Api\OAuth2\OAuth2UserApiController@userInfo",
             array(),
             array
             (
@@ -2290,7 +2300,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_Nonce => 'ctqg5FeNoYnZ',
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -2319,7 +2329,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -2339,7 +2349,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get auth code
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -2369,10 +2379,11 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             'grant_type' => OAuth2Protocol::OAuth2Protocol_GrantType_AuthCode,
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@token",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
             $params,
             array(),
             array(),
+            array(),
             // Symfony interally prefixes headers with "HTTP", so
             array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -2395,7 +2406,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_Nonce => 'ctqg5FeNoYnZ',
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -2424,7 +2435,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -2444,7 +2455,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get auth code
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -2522,7 +2533,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_Nonce => 'ctqg5FeNoYnZ',
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -2576,7 +2587,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_Nonce => 'ctqg5FeNoYnZ',
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -2617,7 +2628,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_Nonce => 'ctqg5FeNoYnZ',
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -2646,7 +2657,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -2666,7 +2677,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get auth code
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -2696,10 +2707,11 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             'grant_type' => OAuth2Protocol::OAuth2Protocol_GrantType_AuthCode,
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@token",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
             $params,
             array(),
             array(),
+            array(),
             // Symfony interally prefixes headers with "HTTP", so
             array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -2733,7 +2745,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_Nonce => 'ctqg5FeNoYnZ',
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -2762,7 +2774,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -2782,7 +2794,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get auth code
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -2813,10 +2825,11 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             'grant_type' => OAuth2Protocol::OAuth2Protocol_GrantType_AuthCode,
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@token",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
             $params,
             array(),
             array(),
+            array(),
             // Symfony interally prefixes headers with "HTTP", so
             array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -2839,7 +2852,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
             OAuth2Protocol::OAuth2Protocol_Nonce => 'ctqg5FeNoYnZ',
         );
 
-        $response = $this->action("POST", "OAuth2ProviderController@authorize",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@auth",
             $params,
             array(),
             array(),
@@ -2868,7 +2881,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -2888,7 +2901,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // get auth code
 
-        $response = $this->action("GET", "OAuth2ProviderController@authorize",
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@auth",
             array(),
             array(),
             array(),
@@ -2914,10 +2927,11 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
         );
 
         // 1st
-        $response = $this->action("POST", "OAuth2ProviderController@token",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
             $params,
             array(),
             array(),
+            array(),
             // Symfony interally prefixes headers with "HTTP", so
             array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -2932,10 +2946,11 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
         // 2nd
 
-        $response = $this->action("POST", "OAuth2ProviderController@token",
+        $response = $this->action("POST", "OAuth2\OAuth2ProviderController@token",
             $params,
             array(),
             array(),
+            array(),
             // Symfony interally prefixes headers with "HTTP", so
             array("HTTP_Authorization" => " Basic " . base64_encode($client_id . ':' . $client_secret)));
 
@@ -2953,7 +2968,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
     public function testDiscovery()
     {
-        $response = $this->action("GET", "OAuth2ProviderController@discovery");
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@discovery");
 
         $this->assertResponseStatus(200);
 
@@ -2970,7 +2985,7 @@ class OIDCProtocolTest extends OpenStackIDBaseTest
 
     public function testJWK()
     {
-        $response = $this->action("GET", "OAuth2ProviderController@certs");
+        $response = $this->action("GET", "OAuth2\OAuth2ProviderController@certs");
 
         $this->assertResponseStatus(200);
 
diff --git a/app/tests/OpenIdProtocolTest.php b/tests/OpenIdProtocolTest.php
similarity index 95%
rename from app/tests/OpenIdProtocolTest.php
rename to tests/OpenIdProtocolTest.php
index 27461cd3..9064a9b9 100644
--- a/app/tests/OpenIdProtocolTest.php
+++ b/tests/OpenIdProtocolTest.php
@@ -1,13 +1,15 @@
 <?php
 
-use auth\User;
-use openid\extensions\implementations\OpenIdOAuth2Extension;
-use openid\extensions\implementations\OpenIdSREGExtension;
-use openid\helpers\OpenIdCryptoHelper;
-use openid\OpenIdProtocol;
-use utils\services\IAuthService;
+use Auth\User;
+use OpenId\Extensions\Implementations\OpenIdOAuth2Extension;
+use OpenId\Extensions\Implementations\OpenIdSREGExtension;
+use OpenId\Helpers\OpenIdCryptoHelper;
+use OpenId\OpenIdProtocol;
+use Utils\Services\IAuthService;
 use Zend\Crypt\PublicKey\DiffieHellman;
-
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Config;
+use Models\OpenId\OpenIdTrustedSite;
 /**
  * Class OpenIdProtocolTest
  * Test Suite for OpenId Protocol
@@ -37,11 +39,8 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
     protected function prepareForTests()
     {
         parent::prepareForTests();
-        Route::enableFilters();
         $this->current_realm = Config::get('app.url');
-
-        $this->user = User::where('identifier', '=', 'sebastian.marcet')->first();
-
+        $this->user          = User::where('identifier', '=', 'sebastian.marcet')->first();
         $this->be($this->user);
         Session::start();
     }
@@ -126,7 +125,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
             OpenIdProtocol::param(OpenIdProtocol::OpenIdProtocol_DHConsumerPublic) => $b64_public,
         );
 
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $params);
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint", $params);
 
         $this->assertResponseStatus(200);
 
@@ -161,7 +160,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
             OpenIdProtocol::param(OpenIdProtocol::OpenIdProtocol_DHConsumerPublic) => $b64_public,
         );
 
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $params);
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint", $params);
 
         $this->assertResponseStatus(200);
 
@@ -190,7 +189,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
             OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_SessionType) => OpenIdProtocol::AssociationSessionTypeNoEncryption,
         );
 
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $params);
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint", $params);
 
         $this->assertResponseStatus(200);
 
@@ -223,7 +222,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
             OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_ClaimedId) => "http://specs.openid.net/auth/2.0/identifier_select",
         );
 
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $params);
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint", $params);
 
         $this->assertResponseStatus(302);
 
@@ -240,7 +239,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
 
         $this->assertResponseStatus(302);
 
-        $auth_response = $this->action("GET", "OpenIdProviderController@endpoint",
+        $auth_response = $this->action("GET", "OpenId\OpenIdProviderController@endpoint",
             array(),
             array(),
             array(),
@@ -255,7 +254,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
         $this->assertTrue(isset($openid_response[OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_ReturnTo)]));
 
         //http://openid.net/specs/openid-authentication-2_0.html#check_auth
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $this->prepareCheckAuthenticationParams($openid_response));
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint", $this->prepareCheckAuthenticationParams($openid_response));
         $openid_response = $this->getOpenIdResponseLineBreak($response->getContent());
         $this->assertResponseStatus(200);
         $this->assertTrue($openid_response['is_valid'] === 'true');
@@ -278,7 +277,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
             OpenIdProtocol::param(OpenIdProtocol::OpenIdProtocol_DHConsumerPublic) => $b64_public,
         );
 
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $params);
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint", $params);
 
         $this->assertResponseStatus(200);
 
@@ -307,7 +306,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
             OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_AssocHandle) => $openid_response['assoc_handle'],
         );
 
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $params);
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint", $params);
 
         $this->assertResponseStatus(302);
 
@@ -359,7 +358,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
             OpenIdProtocol::param(OpenIdProtocol::OpenIdProtocol_DHConsumerPublic) => $b64_public,
         );
 
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $params);
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint", $params);
 
         $this->assertResponseStatus(400);
 
@@ -378,7 +377,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
             OpenIdProtocol::param(OpenIdProtocol::OpenIdProtocol_DHConsumerPublic) => 'AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQE=',
         );
 
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $params);
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint", $params);
 
         $this->assertResponseStatus(400);
     }
@@ -398,7 +397,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
             'openid_claimed_id' => 'http://specs.openid.net/auth/2.0/identifier_select',
         );
 
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $params);
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint", $params);
 
         $this->assertResponseStatus(404);
     }
@@ -425,7 +424,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
             OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_ClaimedId) => "http://specs.openid.net/auth/2.0/identifier_select",
         );
 
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $params);
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint", $params);
 
         $this->assertResponseStatus(302);
 
@@ -476,7 +475,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
             OpenIdProtocol::param(OpenIdProtocol::OpenIDProtocol_ClaimedId) => "http://specs.openid.net/auth/2.0/identifier_select",
         );
 
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $params);
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint", $params);
 
         $this->assertResponseStatus(302);
 
@@ -518,7 +517,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
 
         );
 
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $params);
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint", $params);
 
         $this->assertResponseStatus(302);
 
@@ -565,7 +564,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
         $this->assertTrue(!empty($email) && $email === 'sebastian@tipit.net');
 
         //http://openid.net/specs/openid-authentication-2_0.html#check_auth
-        $response = $this->action("POST", "OpenIdProviderController@endpoint",
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint",
             $this->prepareCheckAuthenticationParams($openid_response));
         $openid_response = $this->getOpenIdResponseLineBreak($response->getContent());
         $this->assertResponseStatus(200);
@@ -592,7 +591,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
 
         );
 
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $params);
+        $response = $this->action("POST", "OpenId\\OpenIdProviderController@endpoint", $params);
 
         $this->assertResponseStatus(302);
 
@@ -639,8 +638,12 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
         $this->assertTrue(!empty($email) && $email === 'sebastian@tipit.net');
 
         //http://openid.net/specs/openid-authentication-2_0.html#check_auth
-        $response = $this->action("POST", "OpenIdProviderController@endpoint",
-            $this->prepareCheckAuthenticationParams($openid_response));
+        $response = $this->action(
+            "POST",
+            "OpenId\\OpenIdProviderController@endpoint",
+            $this->prepareCheckAuthenticationParams($openid_response)
+        );
+
         $openid_response = $this->getOpenIdResponseLineBreak($response->getContent());
         $this->assertResponseStatus(200);
         $this->assertTrue($openid_response['is_valid'] === 'true');
@@ -683,7 +686,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
             OpenIdSREGExtension::param(OpenIdSREGExtension::Required) => implode(",", $sreg_required_params),
         );
 
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $params);
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint", $params);
 
         $this->assertResponseStatus(302);
 
@@ -695,7 +698,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
 
         $consent_html_content = $response->getContent();
 
-        $this->assertTrue(str_contains($consent_html_content, 'Welcome to openstackId - consent'));
+        $this->assertTrue(str_contains($consent_html_content, 'Welcome to OpenStackId - consent'));
         $this->assertTrue(str_contains($consent_html_content, 'The site has also requested some personal information'));
         $this->assertTrue(str_contains($consent_html_content, 'The site has also requested some permissions for following OAuth2 application'));
 
@@ -761,7 +764,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
         $this->assertTrue(!empty($email) && $email === 'sebastian@tipit.net');
 
         //http://openid.net/specs/openid-authentication-2_0.html#check_auth
-        $response = $this->action("POST", "OpenIdProviderController@endpoint",
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint",
             $this->prepareCheckAuthenticationParams($openid_response));
         $openid_response = $this->getOpenIdResponseLineBreak($response->getContent());
         $this->assertResponseStatus(200);
@@ -798,7 +801,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
             OpenIdOAuth2Extension::param(OpenIdOAuth2Extension::State) => uniqid(),
         );
 
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $params);
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint", $params);
 
         $this->assertResponseStatus(302);
 
@@ -842,7 +845,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
 
 
         //http://openid.net/specs/openid-authentication-2_0.html#check_auth
-        $response = $this->action("POST", "OpenIdProviderController@endpoint",
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint",
             $this->prepareCheckAuthenticationParams($openid_response));
         $openid_response = $this->getOpenIdResponseLineBreak($response->getContent());
         $this->assertResponseStatus(200);
@@ -880,7 +883,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
             OpenIdOAuth2Extension::param(OpenIdOAuth2Extension::State) => uniqid(),
         );
 
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $params);
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint", $params);
 
         $this->assertResponseStatus(302);
 
@@ -924,7 +927,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
 
 
         //http://openid.net/specs/openid-authentication-2_0.html#check_auth
-        $response = $this->action("POST", "OpenIdProviderController@endpoint",
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint",
             $this->prepareCheckAuthenticationParams($openid_response));
         $openid_response = $this->getOpenIdResponseLineBreak($response->getContent());
         $this->assertResponseStatus(200);
@@ -962,7 +965,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
             OpenIdOAuth2Extension::param(OpenIdOAuth2Extension::State) => uniqid(),
         );
 
-        $response = $this->action("POST", "OpenIdProviderController@endpoint", $params);
+        $response = $this->action("POST", "OpenId\OpenIdProviderController@endpoint", $params);
 
         $this->assertResponseStatus(302);
 
@@ -975,6 +978,7 @@ class OpenIdProtocolTest extends OpenStackIDBaseTest
             array(),
             array(),
             array(),
+            array(),
             // Symfony interally prefixes headers with "HTTP", so
             array('HTTP_Accept' => 'text/html; q=0.3, application/xhtml+xml; q=0.5, application/xrds+xml'));
         $this->assertResponseStatus(200);
diff --git a/app/tests/OpenStackIDBaseTest.php b/tests/OpenStackIDBaseTest.php
similarity index 97%
rename from app/tests/OpenStackIDBaseTest.php
rename to tests/OpenStackIDBaseTest.php
index 0fc3d6a9..de86a3a2 100644
--- a/app/tests/OpenStackIDBaseTest.php
+++ b/tests/OpenStackIDBaseTest.php
@@ -12,6 +12,9 @@
  * limitations under the License.
  **/
 
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\DB;
+
 /**
  * Class OpenStackIDBaseTest
  */
diff --git a/app/tests/ResourceServerApiTest.php b/tests/ResourceServerApiTest.php
similarity index 75%
rename from app/tests/ResourceServerApiTest.php
rename to tests/ResourceServerApiTest.php
index 561264d1..965428ad 100644
--- a/app/tests/ResourceServerApiTest.php
+++ b/tests/ResourceServerApiTest.php
@@ -1,5 +1,10 @@
 <?php
 
+use Models\OAuth2\ResourceServer;
+use Illuminate\Support\Facades\Config;
+use Auth\User;
+use Illuminate\Support\Facades\Session;
+
 /**
  * Class ResourceServerApiTest
  * Test ResourceServer REST API
@@ -18,6 +23,9 @@ class ResourceServerApiTest extends TestCase
         $this->current_realm = Config::get('app.url');
         $parts = parse_url($this->current_realm);
         $this->current_host = $parts['host'];
+        $user = User::where('identifier', '=', 'sebastian.marcet')->first();
+        $this->be($user);
+        Session::start();
     }
 
     public function testGetById()
@@ -25,7 +33,7 @@ class ResourceServerApiTest extends TestCase
 
         $resource_server = ResourceServer::where('host', '=', $this->current_host)->first();
 
-        $response = $this->action("GET", "ApiResourceServerController@get",
+        $response = $this->action("GET", "Api\\ApiResourceServerController@get",
             $parameters = array('id' => $resource_server->id),
             array(),
             array(),
@@ -41,16 +49,17 @@ class ResourceServerApiTest extends TestCase
     public function testGetByPage()
     {
 
-        $response = $this->action("GET", "ApiResourceServerController@getByPage",
+        $response = $this->action("GET", "Api\\ApiResourceServerController@getByPage",
             $parameters = array('page_nbr' => 1, 'page_size' => 10),
             array(),
             array(),
             array());
 
+        $this->assertResponseStatus(200);
         $content = $response->getContent();
         $list = json_decode($content);
         $this->assertTrue(isset($list->total_items) && intval($list->total_items) > 0);
-        $this->assertResponseStatus(200);
+
     }
 
     public function testCreate()
@@ -63,17 +72,17 @@ class ResourceServerApiTest extends TestCase
             'active' => true,
         );
 
-        $response = $this->action("POST", "ApiResourceServerController@create",
+        $response = $this->action("POST", "Api\\ApiResourceServerController@create",
             $data,
             array(),
             array(),
             array());
-
+        $this->assertResponseStatus(201);
         $content = $response->getContent();
         $json_response = json_decode($content);
         $this->assertTrue(isset($json_response->resource_server_id));
         $this->assertTrue(!empty($json_response->resource_server_id));
-        $this->assertResponseStatus(201);
+
     }
 
     public function testRegenerateClientSecret()
@@ -87,7 +96,7 @@ class ResourceServerApiTest extends TestCase
         );
 
 
-        $response = $this->action("POST", "ApiResourceServerController@create",
+        $response = $this->action("POST", "Api\\ApiResourceServerController@create",
             $data,
             array(),
             array(),
@@ -99,7 +108,7 @@ class ResourceServerApiTest extends TestCase
 
         $new_id = $json_response->resource_server_id;
 
-        $response = $this->action("GET", "ApiResourceServerController@get", $parameters = array('id' => $new_id),
+        $response = $this->action("GET", "Api\\ApiResourceServerController@get", $parameters = array('id' => $new_id),
             array(),
             array(),
             array());
@@ -111,7 +120,7 @@ class ResourceServerApiTest extends TestCase
 
         $client_secret = $json_response->client_secret;
 
-        $response = $this->action("PUT", "ApiResourceServerController@regenerateClientSecret",
+        $response = $this->action("PUT", "Api\\ApiResourceServerController@regenerateClientSecret",
             $parameters = array('id' => $new_id),
             array(),
             array(),
@@ -142,7 +151,7 @@ class ResourceServerApiTest extends TestCase
         );
 
 
-        $response = $this->action("POST", "ApiResourceServerController@create",
+        $response = $this->action("POST", "Api\\ApiResourceServerController@create",
             $parameters = $data,
             array(),
             array(),
@@ -154,7 +163,7 @@ class ResourceServerApiTest extends TestCase
 
         $new_id = $json_response->resource_server_id;
 
-        $response = $this->action("DELETE", "ApiResourceServerController@delete", $parameters = array('id' => $new_id),
+        $response = $this->action("DELETE", "Api\\ApiResourceServerController@delete", $parameters = array('id' => $new_id),
             array(),
             array(),
             array());
@@ -162,7 +171,7 @@ class ResourceServerApiTest extends TestCase
         $this->assertResponseStatus(204);
 
 
-        $response = $this->action("GET", "ApiResourceServerController@get", $parameters = array('id' => $new_id),
+        $response = $this->action("GET", "Api\\ApiResourceServerController@get", $parameters = array('id' => $new_id),
             array(),
             array(),
             array());
@@ -183,7 +192,7 @@ class ResourceServerApiTest extends TestCase
 
         $new_id = $resource_server->id;
 
-        $response = $this->action("DELETE", "ApiResourceServerController@delete", $parameters = array('id' => $new_id),
+        $response = $this->action("DELETE", "Api\\ApiResourceServerController@delete", $parameters = array('id' => $new_id),
             array(),
             array(),
             array());
@@ -192,7 +201,7 @@ class ResourceServerApiTest extends TestCase
         $this->assertResponseStatus(204);
 
 
-        $response = $this->action("GET", "ApiResourceServerController@get", $parameters = array('id' => $new_id),
+        $response = $this->action("GET", "Api\\ApiResourceServerController@get", $parameters = array('id' => $new_id),
             array(),
             array(),
             array());
@@ -211,7 +220,7 @@ class ResourceServerApiTest extends TestCase
             'active' => true,
         );
 
-        $response = $this->action("POST", "ApiResourceServerController@create", $parameters = $data,
+        $response = $this->action("POST", "Api\\ApiResourceServerController@create", $parameters = $data,
             array(),
             array(),
             array());
@@ -229,7 +238,7 @@ class ResourceServerApiTest extends TestCase
             'friendly_name' => 'Resource Server 6',
         );
 
-        $response = $this->action("PUT", "ApiResourceServerController@update", $parameters = $data_update, array(),
+        $response = $this->action("PUT", "Api\\ApiResourceServerController@update", $parameters = $data_update, array(),
             array(),
             array());
 
@@ -239,7 +248,7 @@ class ResourceServerApiTest extends TestCase
 
         $this->assertResponseStatus(200);
 
-        $response = $this->action("GET", "ApiResourceServerController@get", $parameters = array('id' => $new_id),
+        $response = $this->action("GET", "Api\\ApiResourceServerController@get", $parameters = array('id' => $new_id),
             array(),
             array(),
             array());
@@ -263,17 +272,17 @@ class ResourceServerApiTest extends TestCase
             'active' => true,
         );
 
-        $response = $this->action("POST", "ApiResourceServerController@create", $data);
+        $response = $this->action("POST", "Api\\ApiResourceServerController@create", $data);
         $this->assertResponseStatus(201);
         $content = $response->getContent();
         $json_response = json_decode($content);
         $new_id = $json_response->resource_server_id;
-        $response = $this->action("DELETE", "ApiResourceServerController@deactivate", array('id' => $new_id));
+        $response = $this->action("DELETE", "Api\\ApiResourceServerController@deactivate", array('id' => $new_id));
         $this->assertResponseStatus(200);
         $content = $response->getContent();
         $json_response = json_decode($content);
         $this->assertTrue($json_response === 'ok');
-        $response = $this->action("GET", "ApiResourceServerController@get", $parameters = array('id' => $new_id));
+        $response = $this->action("GET", "Api\\ApiResourceServerController@get", $parameters = array('id' => $new_id));
         $this->assertResponseStatus(200);
         $content = $response->getContent();
         $updated_values = json_decode($content);
diff --git a/tests/StubServerConfigurationService.php b/tests/StubServerConfigurationService.php
new file mode 100644
index 00000000..a21f399d
--- /dev/null
+++ b/tests/StubServerConfigurationService.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+use Services\Utils\ServerConfigurationService;
+/**
+ * Class StubServerConfigurationService
+ */
+class StubServerConfigurationService extends ServerConfigurationService
+{
+
+    public function getConfigValue($value)
+    {
+        if ($value === 'OAuth2.AccessToken.Lifetime' && isset($_ENV['access.token.lifetime'])) {
+            return intval($_ENV['access.token.lifetime']);
+        }
+
+        return parent::getConfigValue($value);
+    }
+}
\ No newline at end of file
diff --git a/tests/TestCase.php b/tests/TestCase.php
new file mode 100644
index 00000000..0233df38
--- /dev/null
+++ b/tests/TestCase.php
@@ -0,0 +1,57 @@
+<?php
+
+use Illuminate\Support\Facades\Redis;
+
+/**
+ * Class TestCase
+ */
+class TestCase extends Illuminate\Foundation\Testing\TestCase
+{
+    private $redis;
+
+    /**
+     * The base URL to use while testing the application.
+     *
+     * @var string
+     */
+    protected $baseUrl = 'http://localhost';
+
+    /**
+     * Creates the application.
+     *
+     * @return \Illuminate\Foundation\Application
+     */
+    public function createApplication()
+    {
+        $app = require __DIR__.'/../bootstrap/app.php';
+
+        $app->make(Illuminate\Contracts\Console\Kernel::class)->bootstrap();
+
+        return $app;
+    }
+
+    public function __construct(){
+
+    }
+
+    public function setUp()
+    {
+        parent::setUp(); // Don't forget this!
+        $this->redis = Redis::connection();
+        $this->redis->flushall();
+        $this->prepareForTests();
+    }
+
+
+    /**
+     * Migrates the database and set the mailer to 'pretend'.
+     * This will cause the tests to run quickly.
+     *
+     */
+    protected function prepareForTests()
+    {
+        Artisan::call('migrate');
+        //Mail::pretend(true);
+        $this->seed('TestSeeder');
+    }
+}
diff --git a/tests/TokenRepositoryTest.php b/tests/TokenRepositoryTest.php
new file mode 100644
index 00000000..a0d106d2
--- /dev/null
+++ b/tests/TokenRepositoryTest.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * Copyright 2016 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+class TokenRepositoryTest extends TestCase
+{
+    public function testAccessTokenRepository(){
+        $repository = $this->app[\OAuth2\Repositories\IAccessTokenRepository::class];
+        $this->assertTrue(!is_null($repository));
+        $this->assertTrue($repository instanceof \OAuth2\Repositories\IAccessTokenRepository);
+        $paginator = $repository->getAllValidByClientIdentifier(105);
+        $this->assertTrue($paginator->total() == 0);
+    }
+}
\ No newline at end of file
diff --git a/app/tests/TrustedSitesServiceTest.php b/tests/TrustedSitesServiceTest.php
similarity index 74%
rename from app/tests/TrustedSitesServiceTest.php
rename to tests/TrustedSitesServiceTest.php
index 7f36ab8b..12e8bc02 100644
--- a/app/tests/TrustedSitesServiceTest.php
+++ b/tests/TrustedSitesServiceTest.php
@@ -1,15 +1,19 @@
 <?php
-use openid\services\OpenIdServiceCatalog;
-use utils\services\IAuthService;
-use Way\Tests\Factory;
 
+use OpenId\Services\OpenIdServiceCatalog;
+use Utils\Services\IAuthService;
+use OpenId\Repositories\IOpenIdTrustedSiteRepository;
+use OpenId\Models\IOpenIdUser;
+use Auth\User;
+use Repositories\EloquentOpenIdTrustedSiteRepository;
+use Way\Tests\Factory;
 /**
  * Class TrustedSitesServiceTest
  */
 class TrustedSitesServiceTest extends TestCase {
 
-	public function __construct(){
-
+	public function __construct()
+    {
 	}
 
 	protected function prepareForTests()
@@ -22,15 +26,14 @@ class TrustedSitesServiceTest extends TestCase {
         Mockery::close();
     }
 
-
 	public function testBehaviorAdd(){
 
-		$repo_mock = Mockery::mock('repositories\EloquentOpenIdTrustedSiteRepository');
+		$repo_mock = Mockery::mock(EloquentOpenIdTrustedSiteRepository::class);
 
 		$repo_mock->shouldReceive('add')->andReturn(true)->once();
-	    $this->app->instance('openid\repositories\IOpenIdTrustedSiteRepository', $repo_mock);
+	    $this->app->instance(IOpenIdTrustedSiteRepository::class, $repo_mock);
 
-		$mock_user = Mockery::mock('openid\model\IOpenIdUser');
+		$mock_user = Mockery::mock(IOpenIdUser::class);
 		$mock_user->shouldReceive('getId')->andReturn(1);
 
 		$service = $this->app[OpenIdServiceCatalog::TrustedSitesService];
@@ -46,7 +49,7 @@ class TrustedSitesServiceTest extends TestCase {
 
 		$service = $this->app[OpenIdServiceCatalog::TrustedSitesService];
 
-		$user = Factory::create('auth\User');
+		$user = Factory::create(User::class);
 
 		$res = $service->addTrustedSite($user,
 			$realm = 'https://www.test.com',
@@ -65,7 +68,7 @@ class TrustedSitesServiceTest extends TestCase {
 
 		$service = $this->app[OpenIdServiceCatalog::TrustedSitesService];
 
-		$user = Factory::create('auth\User');
+		$user = Factory::create(User::class);
 
 		$res  = $service->addTrustedSite($user,	$realm, IAuthService::AuthorizationResponse_AllowForever, $data = array('email','profile','address'));
 
diff --git a/app/tests/UserGeneratorServiceTest.php b/tests/UserGeneratorServiceTest.php
similarity index 86%
rename from app/tests/UserGeneratorServiceTest.php
rename to tests/UserGeneratorServiceTest.php
index 6802926d..fba263fa 100644
--- a/app/tests/UserGeneratorServiceTest.php
+++ b/tests/UserGeneratorServiceTest.php
@@ -12,6 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+use Auth\UserNameGeneratorService;
+use Auth\Repositories\IMemberRepository;
+
+/**
+ * Class UserGeneratorServiceTest
+ */
 class UserGeneratorServiceTest extends TestCase {
 
     public function __construct(){
@@ -26,8 +32,8 @@ class UserGeneratorServiceTest extends TestCase {
     public function testBuildUsers()
     {
 
-        $member_repository           = App::make('auth\IMemberRepository');
-        $user_name_service_generator = new \auth\UserNameGeneratorService();
+        $member_repository           = App::make(IMemberRepository::class);
+        $user_name_service_generator = new UserNameGeneratorService();
 
         $member1 = $member_repository->getByEmail("mkiss@tipit.net");
         $member2 = $member_repository->getByEmail("fujg573@tipit.net");
diff --git a/app/tests/UserServiceTest.php b/tests/UserServiceTest.php
similarity index 84%
rename from app/tests/UserServiceTest.php
rename to tests/UserServiceTest.php
index 43b81e9c..d148c33a 100644
--- a/app/tests/UserServiceTest.php
+++ b/tests/UserServiceTest.php
@@ -1,7 +1,5 @@
 <?php
 
-use services\oauth2\HttpIClientJWKSetReader;
-
 /**
  * Copyright 2015 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +12,13 @@ use services\oauth2\HttpIClientJWKSetReader;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+
+use Auth\Repositories\IMemberRepository;
+use OpenId\Services\IUserService;
+
+/**
+ * Class UserServiceTest
+ */
 class UserServiceTest extends TestCase
 {
 
@@ -24,8 +29,8 @@ class UserServiceTest extends TestCase
 
     public function testBuildUsers()
     {
-        $member_repository = App::make('auth\IMemberRepository');
-        $user_service      = App::make('openid\services\IUserService');
+        $member_repository = App::make(IMemberRepository::class);
+        $user_service      = App::make(IUserService::class);
 
         $member1 = $member_repository->getByEmail("sebastian@tipit.net");
         $member2 = $member_repository->getByEmail("sebastian+1@tipit.net");
diff --git a/app/tests/UserTest.php b/tests/UserTest.php
similarity index 78%
rename from app/tests/UserTest.php
rename to tests/UserTest.php
index 7684d9f6..706d85ca 100644
--- a/app/tests/UserTest.php
+++ b/tests/UserTest.php
@@ -1,8 +1,13 @@
 <?php
 
-use auth\User;
-use openid\services\OpenIdServiceCatalog;
+use Auth\User;
+use Models\Member;
+use OpenId\Services\OpenIdServiceCatalog;
+use Illuminate\Support\Facades\App;
 
+/**
+ * Class UserTest
+ */
 class UserTest extends TestCase
 {
 
diff --git a/app/tests/XRDSDocumentTest.php b/tests/XRDSDocumentTest.php
similarity index 51%
rename from app/tests/XRDSDocumentTest.php
rename to tests/XRDSDocumentTest.php
index 2d41745d..b3753e3d 100644
--- a/app/tests/XRDSDocumentTest.php
+++ b/tests/XRDSDocumentTest.php
@@ -1,8 +1,22 @@
 <?php
+/**
+ * Copyright 2015 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
 
-use openid\XRDS\XRDSDocumentBuilder;
-use openid\XRDS\XRDSService;
-
+use OpenId\Xrds\XRDSDocumentBuilder;
+use OpenId\Xrds\XRDSService;
+/**
+ * Class XRDSDocumentTest
+ */
 class XRDSDocumentTest extends TestCase
 {
     public function testBuildDocument()
diff --git a/app/tests/features/bootstrap/FeatureContext.php b/tests/features/bootstrap/FeatureContext.php
similarity index 100%
rename from app/tests/features/bootstrap/FeatureContext.php
rename to tests/features/bootstrap/FeatureContext.php
diff --git a/app/tests/features/bootstrap/LaravelContext.php b/tests/features/bootstrap/LaravelContext.php
similarity index 100%
rename from app/tests/features/bootstrap/LaravelContext.php
rename to tests/features/bootstrap/LaravelContext.php
diff --git a/app/tests/features/get_auth_code.feature b/tests/features/get_auth_code.feature
similarity index 88%
rename from app/tests/features/get_auth_code.feature
rename to tests/features/get_auth_code.feature
index 8c0d2542..65079878 100644
--- a/app/tests/features/get_auth_code.feature
+++ b/tests/features/get_auth_code.feature
@@ -11,7 +11,7 @@ Feature: Get OAuth2 Auth Code
       | response_type | code                                              |
       | scope         | profile                                           |
     And exits client Id "Jiz87D8/Vcvr6fvQbH4HyNgwTlfSyQ3x.openstack.client"
-    And navigate to controller action "OAuth2ProviderController@authorize" with HTTP method "POST"
+    And navigate to controller action "OAuth2\OAuth2ProviderController@auth" with HTTP method "POST"
     When i get log as user "test@test.com" using password "1qaz2wsx"
     And allow consent "AllowOnce"
     Then i get a valid Auth code