diff --git a/app/Http/routes.php b/app/Http/routes.php
index cce17faf..cb9c88ed 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -1,27 +1,8 @@
 <?php
 
-/*
-|--------------------------------------------------------------------------
-| Routes File
-|--------------------------------------------------------------------------
-|
-| Here is where you will register all of the routes in an application.
-| It's a breeze. Simply tell Laravel the URIs it should respond to
-| and give it the controller to call when that URI is requested.
-|
-*/
-
-/*
-|--------------------------------------------------------------------------
-| Application Routes
-|--------------------------------------------------------------------------
-|
-| This route group applies the "web" middleware group to every route
-| it contains. The "web" middleware group is defined in your HTTP
-| kernel and includes session state, CSRF protection, and more.
-|
-*/
-
+/**
+ * This routing groups is used for routing along public part of website
+ */
 Route::group(['middleware' => ['web']], function () {
 
     // display login form
@@ -29,46 +10,49 @@ Route::group(['middleware' => ['web']], function () {
         return view('admin.loginForm.form');
     });
 
-    // ---------------------------------------------------------------
-    // @todo move to admin group (protect it)
+    // handle login
+    Route::post('admin/login', 'Admin\Login@postLogin')
+         ->name('login');
+});
+
+/*******************************************************************************/
+
+/**
+ * This route group serves to handle request in admin
+ */
+Route::group([
+                 'middleware' => ['auth'],
+                 'namespace'  => 'Admin',
+                 'prefix'     => 'admin'
+             ], function () {
+
+    // display dashboard with some usefull information
+    Route::get('/', 'Dashboard@getIndex');
 
     // display form for creating new user
-    Route::get('admin/users/new', 'Admin\UserManagement@getNewUser')
+    Route::get('admin/users/new', 'UserManagement@getNewUser')
          ->name('users.new');
 
     // display form for edit of existing user
-    Route::get('admin/users/edit/{id}', 'Admin\UserManagement@getEditExistingUser')
+    Route::get('admin/users/edit/{id}', 'UserManagement@getEditExistingUser')
          ->name('users.edit');
 
     // display user detail in admin
-    Route::get('admin/users/{id}', 'Admin\UserManagement@getDetail')
+    Route::get('admin/users/{id}', 'UserManagement@getDetail')
          ->name('users.detail');
 
     // display list of all users registered into our system
-    Route::get('admin/users/overview/{state?}', 'Admin\UsersManagement@getOverview')
+    Route::get('admin/users/overview/{state?}', 'UsersManagement@getOverview')
          ->name('users.overview');
 
     // POST methods
     // ------------------------------------------
 
     // create new user
-    Route::post('admin/users/new', 'Admin\UserManagement@postRegistration')
+    Route::post('admin/users/new', 'UserManagement@postRegistration')
          ->name('admin.users.registration');
 
     // edit existing user
-    Route::post('admin/users/new', 'Admin\UserManagement@postRegistration')
+    Route::post('admin/users/edit', 'UserManagement@postUpdateUser')
          ->name('admin.users.edit');
-
-    // handle login
-    Route::post('admin/login', 'Admin\Login@postLogin')
-         ->name('login');
-});
-
-// list of admin routes
-Route::group([
-                 'middleware' => ['auth'],
-                 'namespace'  => 'Admin',
-                 'prefix'     => 'admin'
-             ], function () {
-    Route::get('/', 'Dashboard@getIndex');
 });