diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a09c56d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/.idea
diff --git a/README.md b/README.md
index 821c0c7..a49d528 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ return [
         // 'frontend/config/main.php' and/or 'backend/config/main.php' (OR you can add it
         // to 'common/config' if you remove it from frontend/backend)
         'user' => [
-            'class' => 'amnah\yii2\user\components\User',
+            'class' => 'faro\core\user\components\User',
         ],
         'mailer' => [
             'class' => 'yii\swiftmailer\Mailer',
@@ -60,7 +60,7 @@ return [
     ],
     'modules' => [
         'user' => [
-            'class' => 'amnah\yii2\user\Module',
+            'class' => 'faro\core\user\Module',
             // set custom module properties here ...
         ],
     ],
@@ -211,7 +211,7 @@ To do so, you can use the helper command ```CopyController```.
 // app/config/console.php
 'modules' => [
     'user' => [
-        'class' => 'amnah\yii2\user\Module',
+        'class' => 'faro\core\user\Module',
     ],
 ],
 ```
@@ -235,7 +235,7 @@ php yii user/copy --from=@vendor/amnah/yii2-user --to=@app/modules/user --namesp
 ```
 
 **Alternatively,** you can do this manually. Just copy/paste the files wherever you'd like and
-change the namespaces in the files. Replace ```amnah\yii2\user``` with ```app\modules\user```.
+change the namespaces in the files. Replace ```faro\core\user``` with ```app\modules\user```.
 
 ## Todo
 * Tests
diff --git a/SOCIAL.md b/SOCIAL.md
index fc60068..957e2a0 100644
--- a/SOCIAL.md
+++ b/SOCIAL.md
@@ -45,7 +45,7 @@ auth clients**
                 'clientSecret' => 'yyyyyyyyyy',
             ],
             'reddit' => [
-                'class' => 'amnah\yii2\user\components\RedditAuth',
+                'class' => 'faro\core\user\components\RedditAuth',
                 'clientId' => 'xxxxxxxxxx',
                 'clientSecret' => 'yyyyyyyyyy',
                 'scope' => 'identity', // comma separated string, NO SPACES
@@ -113,8 +113,8 @@ Let's take a look at the basic implementation for facebook:
  */
 protected function setInfoFacebook($attributes)
 {
-    /** @var \amnah\yii2\user\models\User    $user */
-    /** @var \amnah\yii2\user\models\Profile $profile */
+    /** @var \faro\core\user\models\User    $user */
+    /** @var \faro\core\user\models\Profile $profile */
     $user = Yii::$app->getModule("user")->model("User");
     $profile = Yii::$app->getModule("user")->model("Profile");
 
diff --git a/composer.json b/composer.json
index af83867..5ef4deb 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "amnah/yii2-user",
+    "name": "faro/yii2-user",
     "description": "Yii 2 user authentication module",
     "keywords": ["yii", "yii2", "user", "auth", "authentication"],
     "type": "yii2-extension",
@@ -12,9 +12,35 @@
     ],
     "require": {
         "yiisoft/yii2": "*",
-        "yiisoft/yii2-authclient": "*"
+        "yiisoft/yii2-authclient": "*",
+        "faro/core": "2022.1.*"
     },
     "autoload": {
-        "psr-4": { "amnah\\yii2\\user\\": "" }
-    }
+        "psr-4": { "faro\\core\\user\\": "src" }
+    },
+    "extra": {
+        "branch-alias": {}
+    },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://asset-packagist.org"
+        },
+        {
+            "type": "vcs",
+            "url":  "git@github.com:FARO-DataLab/faro-core.git"
+        },
+        {
+            "type": "vcs",
+            "url":  "git@github.com:FARO-DataLab/faro-media.git"
+        },
+        {
+            "type": "vcs",
+            "url":  "git@github.com:FARO-DataLab/faro-googleanalytics.git"
+        },
+        {
+            "type": "vcs",
+            "url":  "git@github.com:FARO-DataLab/yii2-user.git"
+        }
+    ]
 }
\ No newline at end of file
diff --git a/Module.php b/src/Module.php
similarity index 88%
rename from Module.php
rename to src/Module.php
index 11f6a29..a98671f 100644
--- a/Module.php
+++ b/src/Module.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace amnah\yii2\user;
+namespace faro\core\user;
 
+use faro\core\FaroBaseModule;
 use Yii;
 use yii\base\InvalidConfigException;
 use yii\db\ActiveRecord;
@@ -11,17 +12,17 @@
  *
  * @author amnah <amnah.dev@gmail.com>
  */
-class Module extends \yii\base\Module
+class Module extends FaroBaseModule
 {
     /**
      * @var string Module version
      */
-    protected $version = "5.0.8";
+    protected $version = "2022.1-dev";
 
     /**
      * @var string Alias for module
      */
-    public $alias = "@user";
+    public $alias = "@faro/core/user";
 
     /**
      * @var bool If true, users are required to enter an email
@@ -100,11 +101,11 @@ class Module extends \yii\base\Module
     public $forceTranslation = false;
 
     /**
-     * @var array Model classes, e.g., ["User" => "amnah\yii2\user\models\User"]
+     * @var array Model classes, e.g., ["User" => "faro\core\user\models\User"]
      * Usage:
      *   $user = Yii::$app->getModule("user")->model("User", $config);
      *   (equivalent to)
-     *   $user = new \amnah\yii2\user\models\User($config);
+     *   $user = new \faro\core\user\models\User($config);
      *
      * The model classes here will be merged with/override the [[getDefaultModelClasses()|default ones]]
      */
@@ -182,8 +183,8 @@ protected function checkModuleProperties()
         // "common/config" instead of "frontend/config" and/or "backend/config"
         //   -> this results in users failing to login without any feedback/error message
         $userComponent = Yii::$app->get('user', false);
-        if ($userComponent && !$userComponent instanceof \amnah\yii2\user\components\User) {
-            throw new InvalidConfigException('Yii::$app->user is not set properly. It needs to extend \amnah\yii2\user\components\User');
+        if ($userComponent && !$userComponent instanceof \faro\core\user\components\User) {
+            throw new InvalidConfigException('Yii::$app->user is not set properly. It needs to extend \faro\core\user\components\User');
         }
     }
 
@@ -199,20 +200,20 @@ protected function getDefaultModelClasses()
         } elseif (class_exists('app\models\User')) {
             $userClass = 'app\models\User';
         } else {
-            $userClass = 'amnah\yii2\user\models\User';
+            $userClass = 'faro\core\user\models\User';
         }
 
         return [
             'User' => $userClass,
-            'Profile' => 'amnah\yii2\user\models\Profile',
-            'Role' => 'amnah\yii2\user\models\Role',
-            'UserToken' => 'amnah\yii2\user\models\UserToken',
-            'UserAuth' => 'amnah\yii2\user\models\UserAuth',
-            'ForgotForm' => 'amnah\yii2\user\models\forms\ForgotForm',
-            'LoginForm' => 'amnah\yii2\user\models\forms\LoginForm',
-            'ResendForm' => 'amnah\yii2\user\models\forms\ResendForm',
-            'UserSearch' => 'amnah\yii2\user\models\search\UserSearch',
-            'LoginEmailForm' => 'amnah\yii2\user\models\forms\LoginEmailForm',
+            'Profile' => 'faro\core\user\models\Profile',
+            'Role' => 'faro\core\user\models\Role',
+            'UserToken' => 'faro\core\user\models\UserToken',
+            'UserAuth' => 'faro\core\user\models\UserAuth',
+            'ForgotForm' => 'faro\core\user\models\forms\ForgotForm',
+            'LoginForm' => 'faro\core\user\models\forms\LoginForm',
+            'ResendForm' => 'faro\core\user\models\forms\ResendForm',
+            'UserSearch' => 'faro\core\user\models\search\UserSearch',
+            'LoginEmailForm' => 'faro\core\user\models\forms\LoginEmailForm',
         ];
     }
 
diff --git a/components/RedditAuth.php b/src/components/RedditAuth.php
similarity index 98%
rename from components/RedditAuth.php
rename to src/components/RedditAuth.php
index 7d52655..8b1ffaa 100644
--- a/components/RedditAuth.php
+++ b/src/components/RedditAuth.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace amnah\yii2\user\components;
+namespace faro\core\user\components;
 
 use Yii;
 use yii\authclient\OAuth2;
diff --git a/components/User.php b/src/components/User.php
similarity index 86%
rename from components/User.php
rename to src/components/User.php
index e33bd95..27a0a77 100644
--- a/components/User.php
+++ b/src/components/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace amnah\yii2\user\components;
+namespace faro\core\user\components;
 
 use Yii;
 
@@ -12,7 +12,7 @@ class User extends \yii\web\User
     /**
      * @inheritdoc
      */
-    public $identityClass = 'amnah\yii2\user\models\User';
+    public $identityClass = 'faro\core\user\models\User';
 
     /**
      * @inheritdoc
@@ -29,7 +29,7 @@ class User extends \yii\web\User
      */
     public function getIsGuest()
     {
-        /** @var \amnah\yii2\user\models\User $user */
+        /** @var \faro\core\user\models\User $user */
 
         // check if user is banned. if so, log user out and redirect home
         // https://github.com/amnah/yii2-user/issues/99
@@ -56,7 +56,7 @@ public function getIsLoggedIn()
      */
     public function afterLogin($identity, $cookieBased, $duration)
     {
-        /** @var \amnah\yii2\user\models\User $identity */
+        /** @var \faro\core\user\models\User $identity */
         $identity->updateLoginMeta();
         parent::afterLogin($identity, $cookieBased, $duration);
     }
@@ -67,7 +67,7 @@ public function afterLogin($identity, $cookieBased, $duration)
      */
     public function getDisplayName()
     {
-        /** @var \amnah\yii2\user\models\User $user */
+        /** @var \faro\core\user\models\User $user */
         $user = $this->getIdentity();
         return $user ? $user->getDisplayName() : "";
     }
@@ -90,7 +90,7 @@ public function can($permissionName, $params = [], $allowCaching = true)
         }
 
         // otherwise use our own custom permission (via the role table)
-        /** @var \amnah\yii2\user\models\User $user */
+        /** @var \faro\core\user\models\User $user */
         $user = $this->getIdentity();
         return $user ? $user->can($permissionName) : false;
     }
diff --git a/controllers/AdminController.php b/src/controllers/AdminController.php
similarity index 83%
rename from controllers/AdminController.php
rename to src/controllers/AdminController.php
index b75bf29..fe1b55b 100644
--- a/controllers/AdminController.php
+++ b/src/controllers/AdminController.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace amnah\yii2\user\controllers;
+namespace faro\core\user\controllers;
 
 use Yii;
-use amnah\yii2\user\models\User;
+use faro\core\user\models\User;
+use yii\filters\AccessControl;
 use yii\web\Controller;
 use yii\web\ForbiddenHttpException;
 use yii\web\NotFoundHttpException;
@@ -17,7 +18,7 @@
 class AdminController extends Controller
 {
     /**
-     * @var \amnah\yii2\user\Module
+     * @var \faro\core\user\Module
      * @inheritdoc
      */
     public $module;
@@ -27,12 +28,8 @@ class AdminController extends Controller
      */
     public function init()
     {
-        // check for admin permission (`tbl_role.can_admin`)
-        // note: check for Yii::$app->user first because it doesn't exist in console commands (throws exception)
-        if (!empty(Yii::$app->user) && !Yii::$app->user->can("admin")) {
-            throw new ForbiddenHttpException('You are not allowed to perform this action.');
-        }
-
+        $this->view->params["navbar_menu_selected"] = "administracion";
+        $this->view->params["ocultar_selector_fechas"] = true;
         parent::init();
     }
 
@@ -42,8 +39,18 @@ public function init()
     public function behaviors()
     {
         return [
+            'access' => [
+                'class' => AccessControl::class,
+                'rules' => [
+                    [
+                        'actions' => ['index', 'view', 'create', 'update', 'delete'],
+                        'allow' => true,
+                        'roles' => ['admin']
+                    ]
+                ],
+            ],
             'verbs' => [
-                'class' => VerbFilter::className(),
+                'class' => VerbFilter::class,
                 'actions' => [
                     'delete' => ['post'],
                 ],
@@ -57,7 +64,7 @@ public function behaviors()
      */
     public function actionIndex()
     {
-        /** @var \amnah\yii2\user\models\search\UserSearch $searchModel */
+        /** @var \faro\core\user\models\search\UserSearch $searchModel */
         $searchModel = $this->module->model("UserSearch");
         $dataProvider = $searchModel->search(Yii::$app->request->getQueryParams());
 
@@ -83,8 +90,8 @@ public function actionView($id)
      */
     public function actionCreate()
     {
-        /** @var \amnah\yii2\user\models\User $user */
-        /** @var \amnah\yii2\user\models\Profile $profile */
+        /** @var \faro\core\user\models\User $user */
+        /** @var \faro\core\user\models\Profile $profile */
 
         $user = $this->module->model("User");
         $user->setScenario("admin");
@@ -174,7 +181,7 @@ public function actionDelete($id)
      */
     protected function findModel($id)
     {
-        /** @var \amnah\yii2\user\models\User $user */
+        /** @var \faro\core\user\models\User $user */
         $user = $this->module->model("User");
         $user = $user::findOne($id);
         if ($user) {
diff --git a/controllers/AuthController.php b/src/controllers/AuthController.php
similarity index 89%
rename from controllers/AuthController.php
rename to src/controllers/AuthController.php
index cc378df..814fd6d 100644
--- a/controllers/AuthController.php
+++ b/src/controllers/AuthController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace amnah\yii2\user\controllers;
+namespace faro\core\user\controllers;
 
 use Yii;
 use yii\web\Controller;
@@ -11,7 +11,7 @@
 class AuthController extends Controller
 {
     /**
-     * @var \amnah\yii2\user\Module
+     * @var \faro\core\user\Module
      * @inheritdoc
      */
     public $module;
@@ -87,11 +87,11 @@ public function loginRegisterCallback($client)
      * `user_id` yet because that can either be the currently logged in user OR a user
      * matched by email address
      * @param \yii\authclient\BaseClient $client
-     * @return \amnah\yii2\user\models\UserAuth
+     * @return \faro\core\user\models\UserAuth
      */
     protected function initUserAuth($client)
     {
-        /** @var \amnah\yii2\user\models\UserAuth $userAuth */
+        /** @var \faro\core\user\models\UserAuth $userAuth */
 
         // build data. note that we don't set `user_id` yet
         $attributes = $client->getUserAttributes();
@@ -117,9 +117,9 @@ protected function initUserAuth($client)
      */
     protected function attemptLogin($client)
     {
-        /** @var \amnah\yii2\user\models\User $user */
-        /** @var \amnah\yii2\user\models\UserAuth $userAuth */
-        /** @var \amnah\yii2\user\models\UserToken $userToken */
+        /** @var \faro\core\user\models\User $user */
+        /** @var \faro\core\user\models\UserAuth $userAuth */
+        /** @var \faro\core\user\models\UserToken $userToken */
         $user = $this->module->model("User");
         $userAuth = $this->module->model("UserAuth");
         $userToken = $this->module->model("UserToken");
@@ -175,13 +175,13 @@ protected function attemptLogin($client)
     /**
      * Register a new user using client attributes and then associate userAuth
      * @param \yii\authclient\BaseClient $client
-     * @param \amnah\yii2\user\models\UserAuth $userAuth
+     * @param \faro\core\user\models\UserAuth $userAuth
      */
     protected function registerAndLoginUser($client, $userAuth)
     {
-        /** @var \amnah\yii2\user\models\User $user */
-        /** @var \amnah\yii2\user\models\Profile $profile */
-        /** @var \amnah\yii2\user\models\Role $role */
+        /** @var \faro\core\user\models\User $user */
+        /** @var \faro\core\user\models\Profile $profile */
+        /** @var \faro\core\user\models\Role $role */
         $role = $this->module->model("Role");
 
         // set user and profile info
@@ -206,7 +206,7 @@ protected function registerAndLoginUser($client, $userAuth)
     /**
      * Double checks username to ensure that it isn't already taken. If so,
      * revert to fallback
-     * @param \amnah\yii2\user\models\User $user
+     * @param \faro\core\user\models\User $user
      * @param string $fallbackUsername
      * @return mixed
      */
@@ -230,8 +230,8 @@ protected function doubleCheckUsername($user, $fallbackUsername)
      */
     protected function setInfoFacebook($attributes)
     {
-        /** @var \amnah\yii2\user\models\User $user */
-        /** @var \amnah\yii2\user\models\Profile $profile */
+        /** @var \faro\core\user\models\User $user */
+        /** @var \faro\core\user\models\Profile $profile */
         $user = $this->module->model("User");
         $profile = $this->module->model("Profile");
 
@@ -261,8 +261,8 @@ protected function setInfoFacebook($attributes)
      */
     protected function setInfoTwitter($attributes)
     {
-        /** @var \amnah\yii2\user\models\User $user */
-        /** @var \amnah\yii2\user\models\Profile $profile */
+        /** @var \faro\core\user\models\User $user */
+        /** @var \faro\core\user\models\Profile $profile */
         $user = $this->module->model("User");
         $profile = $this->module->model("Profile");
 
@@ -279,8 +279,8 @@ protected function setInfoTwitter($attributes)
      */
     protected function setInfoGoogle($attributes)
     {
-        /** @var \amnah\yii2\user\models\User $user */
-        /** @var \amnah\yii2\user\models\Profile $profile */
+        /** @var \faro\core\user\models\User $user */
+        /** @var \faro\core\user\models\Profile $profile */
         $user = $this->module->model("User");
         $profile = $this->module->model("Profile");
 
@@ -297,8 +297,8 @@ protected function setInfoGoogle($attributes)
      */
     protected function setInfoReddit($attributes)
     {
-        /** @var \amnah\yii2\user\models\User $user */
-        /** @var \amnah\yii2\user\models\Profile $profile */
+        /** @var \faro\core\user\models\User $user */
+        /** @var \faro\core\user\models\Profile $profile */
         $user = $this->module->model("User");
         $profile = $this->module->model("Profile");
 
@@ -314,8 +314,8 @@ protected function setInfoReddit($attributes)
      */
     protected function setInfoLinkedIn($attributes)
     {
-        /** @var \amnah\yii2\user\models\User $user */
-        /** @var \amnah\yii2\user\models\Profile $profile */
+        /** @var \faro\core\user\models\User $user */
+        /** @var \faro\core\user\models\Profile $profile */
         $user = $this->module->model("User");
         $profile = $this->module->model("Profile");
 
@@ -334,8 +334,8 @@ protected function setInfoLinkedIn($attributes)
      */
     protected function setInfoVkontakte($attributes)
     {
-        /** @var \amnah\yii2\user\models\User $user */
-        /** @var \amnah\yii2\user\models\Profile $profile */
+        /** @var \faro\core\user\models\User $user */
+        /** @var \faro\core\user\models\Profile $profile */
         $user = $this->module->model("User");
         $profile = $this->module->model("Profile");
 
diff --git a/controllers/CopyController.php b/src/controllers/CopyController.php
similarity index 99%
rename from controllers/CopyController.php
rename to src/controllers/CopyController.php
index 8e3637c..da7c951 100644
--- a/controllers/CopyController.php
+++ b/src/controllers/CopyController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace amnah\yii2\user\controllers;
+namespace faro\core\user\controllers;
 
 use Yii;
 use yii\web\HttpException;
diff --git a/controllers/DefaultController.php b/src/controllers/DefaultController.php
similarity index 87%
rename from controllers/DefaultController.php
rename to src/controllers/DefaultController.php
index dc4e17d..49ee1fe 100644
--- a/controllers/DefaultController.php
+++ b/src/controllers/DefaultController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace amnah\yii2\user\controllers;
+namespace faro\core\user\controllers;
 
 use Yii;
 use yii\web\Controller;
@@ -15,7 +15,7 @@
 class DefaultController extends Controller
 {
     /**
-     * @var \amnah\yii2\user\Module
+     * @var \faro\core\user\Module
      * @inheritdoc
      */
     public $module;
@@ -75,7 +75,7 @@ public function actionIndex()
      */
     public function actionLogin()
     {
-        /** @var \amnah\yii2\user\models\forms\LoginForm $model */
+        /** @var \faro\core\user\models\forms\LoginForm $model */
         $model = $this->module->model("LoginForm");
 
         // load post data and login
@@ -84,6 +84,8 @@ public function actionLogin()
             $returnUrl = $this->performLogin($model->getUser(), $model->rememberMe);
             return $this->redirect($returnUrl);
         }
+        
+        $this->layout = "@vendor/faro/core/src/themes/dmp2020/layouts/login";
 
         return $this->render('login', compact("model"));
     }
@@ -93,7 +95,7 @@ public function actionLogin()
      */
     public function actionLoginEmail()
     {
-        /** @var \amnah\yii2\user\models\forms\LoginEmailForm $loginEmailForm */
+        /** @var \faro\core\user\models\forms\LoginEmailForm $loginEmailForm */
         $loginEmailForm = $this->module->model("LoginEmailForm");
 
         // load post data and validate
@@ -113,10 +115,10 @@ public function actionLoginEmail()
      */
     public function actionLoginCallback($token)
     {
-        /** @var \amnah\yii2\user\models\User $user */
-        /** @var \amnah\yii2\user\models\Profile $profile */
-        /** @var \amnah\yii2\user\models\Role $role */
-        /** @var \amnah\yii2\user\models\UserToken $userToken */
+        /** @var \faro\core\user\models\User $user */
+        /** @var \faro\core\user\models\Profile $profile */
+        /** @var \faro\core\user\models\Role $role */
+        /** @var \faro\core\user\models\UserToken $userToken */
 
         $user = $this->module->model("User");
         $profile = $this->module->model("Profile");
@@ -196,9 +198,9 @@ public function actionLogout()
      */
     public function actionRegister()
     {
-        /** @var \amnah\yii2\user\models\User $user */
-        /** @var \amnah\yii2\user\models\Profile $profile */
-        /** @var \amnah\yii2\user\models\Role $role */
+        /** @var \faro\core\user\models\User $user */
+        /** @var \faro\core\user\models\Profile $profile */
+        /** @var \faro\core\user\models\Role $role */
 
         // set up new user/profile objects
         $user = $this->module->model("User", ["scenario" => "register"]);
@@ -242,11 +244,11 @@ public function actionRegister()
 
     /**
      * Process data after registration
-     * @param \amnah\yii2\user\models\User $user
+     * @param \faro\core\user\models\User $user
      */
     protected function afterRegister($user)
     {
-        /** @var \amnah\yii2\user\models\UserToken $userToken */
+        /** @var \faro\core\user\models\UserToken $userToken */
         $userToken = $this->module->model("UserToken");
 
         // determine userToken type to see if we need to send email
@@ -275,8 +277,8 @@ protected function afterRegister($user)
      */
     public function actionConfirm($token)
     {
-        /** @var \amnah\yii2\user\models\UserToken $userToken */
-        /** @var \amnah\yii2\user\models\User $user */
+        /** @var \faro\core\user\models\UserToken $userToken */
+        /** @var \faro\core\user\models\User $user */
 
         // search for userToken
         $success = false;
@@ -307,8 +309,8 @@ public function actionConfirm($token)
      */
     public function actionAccount()
     {
-        /** @var \amnah\yii2\user\models\User $user */
-        /** @var \amnah\yii2\user\models\UserToken $userToken */
+        /** @var \faro\core\user\models\User $user */
+        /** @var \faro\core\user\models\UserToken $userToken */
 
         // set up user and load post data
         $user = Yii::$app->user->identity;
@@ -352,7 +354,7 @@ public function actionAccount()
      */
     public function actionProfile()
     {
-        /** @var \amnah\yii2\user\models\Profile $profile */
+        /** @var \faro\core\user\models\Profile $profile */
 
         // set up profile and load post data
         $profile = Yii::$app->user->identity->profile;
@@ -379,7 +381,7 @@ public function actionProfile()
      */
     public function actionResend()
     {
-        /** @var \amnah\yii2\user\models\forms\ResendForm $model */
+        /** @var \faro\core\user\models\forms\ResendForm $model */
 
         // load post data and send email
         $model = $this->module->model("ResendForm");
@@ -398,8 +400,8 @@ public function actionResend()
      */
     public function actionResendChange()
     {
-        /** @var \amnah\yii2\user\models\User $user */
-        /** @var \amnah\yii2\user\models\UserToken $userToken */
+        /** @var \faro\core\user\models\User $user */
+        /** @var \faro\core\user\models\UserToken $userToken */
 
         // find userToken of type email change
         $user = Yii::$app->user->identity;
@@ -420,8 +422,8 @@ public function actionResendChange()
      */
     public function actionCancel()
     {
-        /** @var \amnah\yii2\user\models\User $user */
-        /** @var \amnah\yii2\user\models\UserToken $userToken */
+        /** @var \faro\core\user\models\User $user */
+        /** @var \faro\core\user\models\UserToken $userToken */
 
         // find userToken of type email change
         $user = Yii::$app->user->identity;
@@ -440,14 +442,20 @@ public function actionCancel()
      */
     public function actionForgot()
     {
-        /** @var \amnah\yii2\user\models\forms\ForgotForm $model */
+        /** @var \faro\core\user\models\forms\ForgotForm $model */
 
         // load post data and send email
+        $this->layout = '@faro/core/themes/faro20221/layouts/login';
         $model = $this->module->model("ForgotForm");
-        if ($model->load(Yii::$app->request->post()) && $model->sendForgotEmail()) {
+        if ($model->load(Yii::$app->request->post())) {
 
             // set flash (which will show on the current page)
-            Yii::$app->session->setFlash("Forgot-success", Yii::t("user", "Instructions to reset your password have been sent"));
+            if ($model->sendForgotEmail()) {
+                Yii::$app->session->setFlash("success", Yii::t("user", "Instructions to reset your password have been sent"));
+            } else {
+                Yii::$app->session->setFlash("error", Yii::t("user", "No se pudo enviar el email"));
+            }
+            
             return $this->refresh();
         }
 
@@ -459,10 +467,11 @@ public function actionForgot()
      */
     public function actionReset($token)
     {
-        /** @var \amnah\yii2\user\models\User $user */
-        /** @var \amnah\yii2\user\models\UserToken $userToken */
+        /** @var \faro\core\user\models\User $user */
+        /** @var \faro\core\user\models\UserToken $userToken */
 
         // get user token and check expiration
+        $this->layout = '@faro/core/themes/faro20221/layouts/login';
         $userToken = $this->module->model("UserToken");
         $userToken = $userToken::findByToken($token, $userToken::TYPE_PASSWORD_RESET);
         if (!$userToken) {
diff --git a/helpers/Timezone.php b/src/helpers/Timezone.php
similarity index 96%
rename from helpers/Timezone.php
rename to src/helpers/Timezone.php
index ee87bf6..856d002 100644
--- a/helpers/Timezone.php
+++ b/src/helpers/Timezone.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace amnah\yii2\user\helpers;
+namespace faro\core\user\helpers;
 
 use DateTime;
 use DateTimeZone;
diff --git a/mail/confirmEmail.php b/src/mail/confirmEmail.php
similarity index 68%
rename from mail/confirmEmail.php
rename to src/mail/confirmEmail.php
index 5181d99..3441908 100644
--- a/mail/confirmEmail.php
+++ b/src/mail/confirmEmail.php
@@ -5,9 +5,9 @@
 
 /**
  * @var string $subject
- * @var \amnah\yii2\user\models\User $user
- * @var \amnah\yii2\user\models\Profile $profile
- * @var \amnah\yii2\user\models\UserToken $userToken
+ * @var \faro\core\user\models\User $user
+ * @var \faro\core\user\models\Profile $profile
+ * @var \faro\core\user\models\UserToken $userToken
  */
 
 $url = Url::toRoute(["/user/confirm", "token" => $userToken->token], true);
diff --git a/mail/forgotPassword.php b/src/mail/forgotPassword.php
similarity index 75%
rename from mail/forgotPassword.php
rename to src/mail/forgotPassword.php
index 9e03513..c8ddc8a 100644
--- a/mail/forgotPassword.php
+++ b/src/mail/forgotPassword.php
@@ -5,8 +5,8 @@
 
 /**
  * @var string $subject
- * @var \amnah\yii2\user\models\User $user
- * @var \amnah\yii2\user\models\UserToken $userToken
+ * @var \faro\core\user\models\User $user
+ * @var \faro\core\user\models\UserToken $userToken
  */
 
 $url = Url::toRoute(["/user/reset", "token" => $userToken->token], true);
diff --git a/mail/layouts/html.php b/src/mail/layouts/html.php
similarity index 100%
rename from mail/layouts/html.php
rename to src/mail/layouts/html.php
diff --git a/mail/loginToken.php b/src/mail/loginToken.php
similarity index 70%
rename from mail/loginToken.php
rename to src/mail/loginToken.php
index 9668c56..9377737 100644
--- a/mail/loginToken.php
+++ b/src/mail/loginToken.php
@@ -5,8 +5,8 @@
 
 /**
  * @var string $subject
- * @var \amnah\yii2\user\models\User $user
- * @var \amnah\yii2\user\models\UserToken $userToken
+ * @var \faro\core\user\models\User $user
+ * @var \faro\core\user\models\UserToken $userToken
  */
 
 $url = Url::toRoute(["/user/login-callback", "token" => $userToken->token], true);
diff --git a/messages/de/user.php b/src/messages/de/user.php
similarity index 100%
rename from messages/de/user.php
rename to src/messages/de/user.php
diff --git a/messages/es/user.php b/src/messages/es/user.php
similarity index 100%
rename from messages/es/user.php
rename to src/messages/es/user.php
diff --git a/messages/fa/user.php b/src/messages/fa/user.php
similarity index 100%
rename from messages/fa/user.php
rename to src/messages/fa/user.php
diff --git a/messages/hu/user.php b/src/messages/hu/user.php
similarity index 100%
rename from messages/hu/user.php
rename to src/messages/hu/user.php
diff --git a/messages/it/user.php b/src/messages/it/user.php
similarity index 100%
rename from messages/it/user.php
rename to src/messages/it/user.php
diff --git a/messages/ja/user.php b/src/messages/ja/user.php
similarity index 100%
rename from messages/ja/user.php
rename to src/messages/ja/user.php
diff --git a/messages/pl/user.php b/src/messages/pl/user.php
similarity index 100%
rename from messages/pl/user.php
rename to src/messages/pl/user.php
diff --git a/messages/pt-BR/user.php b/src/messages/pt-BR/user.php
similarity index 100%
rename from messages/pt-BR/user.php
rename to src/messages/pt-BR/user.php
diff --git a/messages/pt/user.php b/src/messages/pt/user.php
similarity index 100%
rename from messages/pt/user.php
rename to src/messages/pt/user.php
diff --git a/messages/ru/user.php b/src/messages/ru/user.php
similarity index 100%
rename from messages/ru/user.php
rename to src/messages/ru/user.php
diff --git a/messages/sk/user.php b/src/messages/sk/user.php
similarity index 100%
rename from messages/sk/user.php
rename to src/messages/sk/user.php
diff --git a/messages/th/user.php b/src/messages/th/user.php
similarity index 100%
rename from messages/th/user.php
rename to src/messages/th/user.php
diff --git a/messages/uk/user.php b/src/messages/uk/user.php
similarity index 100%
rename from messages/uk/user.php
rename to src/messages/uk/user.php
diff --git a/messages/zh-CN/user.php b/src/messages/zh-CN/user.php
similarity index 100%
rename from messages/zh-CN/user.php
rename to src/messages/zh-CN/user.php
diff --git a/migrations/m150214_044831_init_user.php b/src/migrations/m150214_044831_init_user.php
similarity index 68%
rename from migrations/m150214_044831_init_user.php
rename to src/migrations/m150214_044831_init_user.php
index 058f620..7041fbc 100644
--- a/migrations/m150214_044831_init_user.php
+++ b/src/migrations/m150214_044831_init_user.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace faro\core\user\migrations;
+
+use Yii;
 use yii\db\Schema;
 use yii\db\Migration;
 
@@ -13,14 +16,14 @@ public function up()
         }
 
         // create tables. note the specific order
-        $this->createTable('{{%role}}', [
+        $this->createTable('{{%core_acl_rol}}', [
             'id' => Schema::TYPE_PK,
             'name' => Schema::TYPE_STRING . ' not null',
             'created_at' => Schema::TYPE_TIMESTAMP . ' null',
             'updated_at' => Schema::TYPE_TIMESTAMP . ' null',
             'can_admin' => Schema::TYPE_SMALLINT . ' not null default 0',
         ], $tableOptions);
-        $this->createTable('{{%user}}', [
+        $this->createTable('{{%core_acl_usuario}}', [
             'id' => Schema::TYPE_PK,
             'role_id' => Schema::TYPE_INTEGER . ' not null',
             'status' => Schema::TYPE_SMALLINT . ' not null',
@@ -37,7 +40,7 @@ public function up()
             'banned_at' => Schema::TYPE_TIMESTAMP . ' null',
             'banned_reason' => Schema::TYPE_STRING . ' null',
         ], $tableOptions);
-        $this->createTable('{{%user_token}}', [
+        $this->createTable('{{%core_acl_usuario_token}}', [
             'id' => Schema::TYPE_PK,
             'user_id' => Schema::TYPE_INTEGER . ' null',
             'type' => Schema::TYPE_SMALLINT . ' not null',
@@ -46,7 +49,7 @@ public function up()
             'created_at' => Schema::TYPE_TIMESTAMP . ' null',
             'expired_at' => Schema::TYPE_TIMESTAMP . ' null',
         ], $tableOptions);
-        $this->createTable('{{%profile}}', [
+        $this->createTable('{{%core_acl_perfil}}', [
             'id' => Schema::TYPE_PK,
             'user_id' => Schema::TYPE_INTEGER . ' not null',
             'created_at' => Schema::TYPE_TIMESTAMP . ' null',
@@ -54,7 +57,7 @@ public function up()
             'full_name' => Schema::TYPE_STRING . ' null',
             'timezone' => Schema::TYPE_STRING . ' null',
         ], $tableOptions);
-        $this->createTable('{{%user_auth}}', [
+        $this->createTable('{{%core_acl_usuario_auth}}', [
             'id' => Schema::TYPE_PK,
             'user_id' => Schema::TYPE_INTEGER . ' not null',
             'provider' => Schema::TYPE_STRING . ' not null',
@@ -65,20 +68,20 @@ public function up()
         ], $tableOptions);
 
         // add indexes for performance optimization
-        $this->createIndex('{{%user_email}}', '{{%user}}', 'email', true);
-        $this->createIndex('{{%user_username}}', '{{%user}}', 'username', true);
-        $this->createIndex('{{%user_token_token}}', '{{%user_token}}', 'token', true);
-        $this->createIndex('{{%user_auth_provider_id}}', '{{%user_auth}}', 'provider_id', false);
+        $this->createIndex('{{%core_acl_usuario_email}}', '{{%core_acl_usuario}}', 'email', true);
+        $this->createIndex('{{%core_acl_usuario_username}}', '{{%core_acl_usuario}}', 'username', true);
+        $this->createIndex('{{%core_acl_usuario_token_token}}', '{{%core_acl_usuario_token}}', 'token', true);
+        $this->createIndex('{{%core_acl_usuario_auth_provider_id}}', '{{%core_acl_usuario_auth}}', 'provider_id', false);
 
         // add foreign keys for data integrity
-        $this->addForeignKey('{{%user_role_id}}', '{{%user}}', 'role_id', '{{%role}}', 'id');
-        $this->addForeignKey('{{%profile_user_id}}', '{{%profile}}', 'user_id', '{{%user}}', 'id');
-        $this->addForeignKey('{{%user_token_user_id}}', '{{%user_token}}', 'user_id', '{{%user}}', 'id');
-        $this->addForeignKey('{{%user_auth_user_id}}', '{{%user_auth}}', 'user_id', '{{%user}}', 'id');
+        $this->addForeignKey('{{%core_acl_usuario_role_id}}', '{{%core_acl_usuario}}', 'role_id', '{{%core_acl_rol}}', 'id');
+        $this->addForeignKey('{{%core_acl_perfil_user_id}}', '{{%core_acl_perfil}}', 'user_id', '{{%core_acl_usuario}}', 'id');
+        $this->addForeignKey('{{%core_acl_usuario_token_user_id}}', '{{%core_acl_usuario_token}}', 'user_id', '{{%core_acl_usuario}}', 'id');
+        $this->addForeignKey('{{%core_acl_usuario_auth_user_id}}', '{{%core_acl_usuario_auth}}', 'user_id', '{{%core_acl_usuario}}', 'id');
 
         // insert role data
         $columns = ['name', 'can_admin', 'created_at'];
-        $this->batchInsert('{{%role}}', $columns, [
+        $this->batchInsert('{{%core_acl_rol}}', $columns, [
             ['Admin', 1, gmdate('Y-m-d H:i:s')],
             ['User', 0, gmdate('Y-m-d H:i:s')],
         ]);
@@ -86,11 +89,11 @@ public function up()
         // insert admin user: neo/neo
         $security = Yii::$app->security;
         $columns = ['role_id', 'email', 'username', 'password', 'status', 'created_at', 'access_token', 'auth_key'];
-        $this->batchInsert('{{%user}}', $columns, [
+        $this->batchInsert('{{%core_acl_usuario}}', $columns, [
             [
                 1, // Role::ROLE_ADMIN
-                'neo@neo.com',
-                'neo',
+                'admin@faro.works',
+                'admin',
                 '$2y$13$dyVw4WkZGkABf2UrGWrhHO4ZmVBv.K4puhOL59Y9jQhIdj63TlV.O', // neo
                 1, // User::STATUS_ACTIVE
                 gmdate('Y-m-d H:i:s'),
@@ -101,7 +104,7 @@ public function up()
 
         // insert profile data
         $columns = ['user_id', 'full_name', 'created_at'];
-        $this->batchInsert('{{%profile}}', $columns, [
+        $this->batchInsert('{{%core_acl_perfil}}', $columns, [
             [1, 'the one', gmdate('Y-m-d H:i:s')],
         ]);
     }
@@ -109,10 +112,10 @@ public function up()
     public function down()
     {
         // drop tables in reverse order (for foreign key constraints)
-        $this->dropTable('{{%user_auth}}');
-        $this->dropTable('{{%profile}}');
-        $this->dropTable('{{%user_token}}');
-        $this->dropTable('{{%user}}');
-        $this->dropTable('{{%role}}');
+        $this->dropTable('{{%core_acl_usuario_auth}}');
+        $this->dropTable('{{%core_acl_perfil}}');
+        $this->dropTable('{{%core_acl_usuario_token}}');
+        $this->dropTable('{{%core_acl_usuario}}');
+        $this->dropTable('{{%core_acl_rol}}');
     }
 }
diff --git a/models/Profile.php b/src/models/Profile.php
similarity index 86%
rename from models/Profile.php
rename to src/models/Profile.php
index 5690fa9..d02bfa5 100644
--- a/models/Profile.php
+++ b/src/models/Profile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace amnah\yii2\user\models;
+namespace faro\core\user\models;
 
 use Yii;
 use yii\db\ActiveRecord;
@@ -20,10 +20,19 @@
 class Profile extends ActiveRecord
 {
     /**
-     * @var \amnah\yii2\user\Module
+     * @var \faro\core\user\Module
      */
     public $module;
 
+    /**
+     * @return string
+     */
+    public static function tableName()
+    {
+        return '{{%core_acl_perfil}}';
+    }
+
+
     /**
      * @inheritdoc
      */
@@ -40,7 +49,8 @@ public function init()
     public function rules()
     {
         return [
-            [['full_name'], 'string', 'max' => 255],
+            [['full_name'], 'string', 'min' => 3, 'max' => 255],
+            [['full_name'], 'required'],
             [['timezone'], 'string', 'max' => 255],
         ];
     }
diff --git a/models/Role.php b/src/models/Role.php
similarity index 90%
rename from models/Role.php
rename to src/models/Role.php
index cb6f4e4..402c6d2 100644
--- a/models/Role.php
+++ b/src/models/Role.php
@@ -1,9 +1,12 @@
 <?php
 
-namespace amnah\yii2\user\models;
+namespace faro\core\user\models;
 
+use faro\core\models\FaroBaseActiveRecord;
 use Yii;
 use yii\db\ActiveRecord;
+use yii\helpers\Inflector;
+use yii\helpers\StringHelper;
 
 /**
  * This is the model class for table "tbl_role".
@@ -16,7 +19,7 @@
  *
  * @property User[] $users
  */
-class Role extends ActiveRecord
+class Role extends FaroBaseActiveRecord
 {
     /**
      * @var int Admin user role
@@ -29,10 +32,15 @@ class Role extends ActiveRecord
     const ROLE_USER = 2;
 
     /**
-     * @var \amnah\yii2\user\Module
+     * @var \faro\core\user\Module
      */
     public $module;
 
+    public static function tableName()
+    {
+        return '{{%core_acl_rol}}';
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/models/User.php b/src/models/User.php
similarity index 98%
rename from models/User.php
rename to src/models/User.php
index 1f766a2..d9fd44e 100644
--- a/models/User.php
+++ b/src/models/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace amnah\yii2\user\models;
+namespace faro\core\user\models;
 
 use Yii;
 use yii\db\ActiveRecord;
@@ -72,10 +72,18 @@ class User extends ActiveRecord implements IdentityInterface
     protected $permissionCache = [];
 
     /**
-     * @var \amnah\yii2\user\Module
+     * @var \faro\core\user\Module
      */
     public $module;
 
+    /**
+     * @return string
+     */
+    public static function tableName()
+    {
+        return '{{%core_acl_usuario}}';
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/models/UserAuth.php b/src/models/UserAuth.php
similarity index 91%
rename from models/UserAuth.php
rename to src/models/UserAuth.php
index e311ff0..20bc4c4 100644
--- a/models/UserAuth.php
+++ b/src/models/UserAuth.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace amnah\yii2\user\models;
+namespace faro\core\user\models;
 
 use Yii;
 use yii\db\ActiveRecord;
@@ -21,10 +21,19 @@
 class UserAuth extends ActiveRecord
 {
     /**
-     * @var \amnah\yii2\user\Module
+     * @var \faro\core\user\Module
      */
     public $module;
 
+    /**
+     * @return string
+     */
+    public static function tableName()
+    {
+        return '{{%core_acl_usuario_token}}';
+    }
+
+
     /**
      * @inheritdoc
      */
diff --git a/models/UserToken.php b/src/models/UserToken.php
similarity index 95%
rename from models/UserToken.php
rename to src/models/UserToken.php
index 465c23a..32dfb07 100644
--- a/models/UserToken.php
+++ b/src/models/UserToken.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace amnah\yii2\user\models;
+namespace faro\core\user\models;
 
 use Yii;
 use yii\db\ActiveRecord;
@@ -41,59 +41,16 @@ class UserToken extends ActiveRecord
     const TYPE_EMAIL_LOGIN = 4;
 
     /**
-     * @var \amnah\yii2\user\Module
+     * @var \faro\core\user\Module
      */
     public $module;
 
     /**
-     * @inheritdoc
-     */
-    public function init()
-    {
-        if (!$this->module) {
-            $this->module = Yii::$app->getModule("user");
-        }
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels()
-    {
-        return [
-            'id' => Yii::t('user', 'ID'),
-            'user_id' => Yii::t('user', 'User ID'),
-            'type' => Yii::t('user', 'Type'),
-            'token' => Yii::t('user', 'Token'),
-            'data' => Yii::t('user', 'Data'),
-            'created_at' => Yii::t('user', 'Created At'),
-            'expired_at' => Yii::t('user', 'Expired At'),
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function behaviors()
-    {
-        return [
-            'timestamp' => [
-                'class' => 'yii\behaviors\TimestampBehavior',
-                'updatedAtAttribute' => false,
-                'value' => function ($event) {
-                    return gmdate("Y-m-d H:i:s");
-                },
-            ],
-        ];
-    }
-
-    /**
-     * @return \yii\db\ActiveQuery
+     * @return string
      */
-    public function getUser()
+    public static function tableName()
     {
-        $user = $this->module->model("User");
-        return $this->hasOne($user::className(), ['id' => 'user_id']);
+        return "{{%core_acl_usuario_token}}";
     }
 
     /**
@@ -129,6 +86,18 @@ public static function generate($userId, $type, $data = null, $expireTime = null
         return $model;
     }
 
+    /**
+     * Find a userToken by userId
+     * @param int $userId
+     * @param array|int $type
+     * @param bool $checkExpiration
+     * @return static
+     */
+    public static function findByUser($userId, $type, $checkExpiration = true)
+    {
+        return static::findBy("user_id", $userId, $type, $checkExpiration);
+    }
+
     /**
      * Find a userToken by specified field/value
      * @param string $field
@@ -139,7 +108,7 @@ public static function generate($userId, $type, $data = null, $expireTime = null
      */
     public static function findBy($field, $value, $type, $checkExpiration)
     {
-        $query = static::find()->where([$field => $value, "type" => $type ]);
+        $query = static::find()->where([$field => $value, "type" => $type]);
         if ($checkExpiration) {
             $now = gmdate("Y-m-d H:i:s");
             $query->andWhere("([[expired_at]] >= '$now' or [[expired_at]] is NULL)");
@@ -148,15 +117,15 @@ public static function findBy($field, $value, $type, $checkExpiration)
     }
 
     /**
-     * Find a userToken by userId
-     * @param int $userId
+     * Find a userToken by data
+     * @param string $data
      * @param array|int $type
      * @param bool $checkExpiration
      * @return static
      */
-    public static function findByUser($userId, $type, $checkExpiration = true)
+    public static function findByData($data, $type, $checkExpiration = true)
     {
-        return static::findBy("user_id", $userId, $type, $checkExpiration);
+        return static::findBy("data", $data, $type, $checkExpiration);
     }
 
     /**
@@ -172,14 +141,53 @@ public static function findByToken($token, $type, $checkExpiration = true)
     }
 
     /**
-     * Find a userToken by data
-     * @param string $data
-     * @param array|int $type
-     * @param bool $checkExpiration
-     * @return static
+     * @inheritdoc
      */
-    public static function findByData($data, $type, $checkExpiration = true)
+    public function init()
     {
-        return static::findBy("data", $data, $type, $checkExpiration);
+        if (!$this->module) {
+            $this->module = Yii::$app->getModule("user");
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => Yii::t('user', 'ID'),
+            'user_id' => Yii::t('user', 'User ID'),
+            'type' => Yii::t('user', 'Type'),
+            'token' => Yii::t('user', 'Token'),
+            'data' => Yii::t('user', 'Data'),
+            'created_at' => Yii::t('user', 'Created At'),
+            'expired_at' => Yii::t('user', 'Expired At'),
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            'timestamp' => [
+                'class' => 'yii\behaviors\TimestampBehavior',
+                'updatedAtAttribute' => false,
+                'value' => function ($event) {
+                    return gmdate("Y-m-d H:i:s");
+                },
+            ],
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getUser()
+    {
+        $user = $this->module->model("User");
+        return $this->hasOne($user::className(), ['id' => 'user_id']);
     }
 }
\ No newline at end of file
diff --git a/models/forms/ForgotForm.php b/src/models/forms/ForgotForm.php
similarity index 85%
rename from models/forms/ForgotForm.php
rename to src/models/forms/ForgotForm.php
index 4eb2180..b71f26d 100644
--- a/models/forms/ForgotForm.php
+++ b/src/models/forms/ForgotForm.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace amnah\yii2\user\models\forms;
+namespace faro\core\user\models\forms;
 
 use Yii;
 use yii\base\Model;
+use yii\helpers\VarDumper;
 use yii\swiftmailer\Mailer;
 use yii\swiftmailer\Message;
 
@@ -18,12 +19,12 @@ class ForgotForm extends Model
     public $email;
 
     /**
-     * @var \amnah\yii2\user\models\User
+     * @var \faro\core\user\models\User
      */
     protected $user = false;
 
     /**
-     * @var \amnah\yii2\user\Module
+     * @var \faro\core\user\Module
      */
     public $module;
 
@@ -64,7 +65,7 @@ public function validateEmail()
 
     /**
      * Get user based on email
-     * @return \amnah\yii2\user\models\User|null
+     * @return \faro\core\user\models\User|null
      */
     public function getUser()
     {
@@ -94,7 +95,7 @@ public function sendForgotEmail()
     {
         /** @var Mailer $mailer */
         /** @var Message $message */
-        /** @var \amnah\yii2\user\models\UserToken $userToken */
+        /** @var \faro\core\user\models\UserToken $userToken */
 
         if ($this->validate()) {
 
@@ -117,9 +118,16 @@ public function sendForgotEmail()
             // send email
             $subject = Yii::$app->id . " - " . Yii::t("user", "Forgot password");
             $result = $mailer->compose('forgotPassword', compact("subject", "user", "userToken"))
+                ->setFrom(Yii::$app->params["senderEmail"])
                 ->setTo($user->email)
                 ->setSubject($subject)
                 ->send();
+            
+            if (!$result) {
+                VarDumper::dump("no se pudo");
+                VarDumper::dump($mailer->getErrors());
+                die();
+            }
 
             // restore view path and return result
             $mailer->viewPath = $oldViewPath;
diff --git a/models/forms/LoginEmailForm.php b/src/models/forms/LoginEmailForm.php
similarity index 96%
rename from models/forms/LoginEmailForm.php
rename to src/models/forms/LoginEmailForm.php
index 772f89a..04996cf 100644
--- a/models/forms/LoginEmailForm.php
+++ b/src/models/forms/LoginEmailForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace amnah\yii2\user\models\forms;
+namespace faro\core\user\models\forms;
 
 use Yii;
 use yii\swiftmailer\Mailer;
@@ -57,7 +57,7 @@ public function sendEmail()
     {
         /** @var Mailer $mailer */
         /** @var Message $message */
-        /** @var \amnah\yii2\user\models\UserToken $userToken */
+        /** @var \faro\core\user\models\UserToken $userToken */
 
         if (!$this->validate()) {
             return false;
diff --git a/models/forms/LoginForm.php b/src/models/forms/LoginForm.php
similarity index 93%
rename from models/forms/LoginForm.php
rename to src/models/forms/LoginForm.php
index af39a97..e89ead8 100644
--- a/models/forms/LoginForm.php
+++ b/src/models/forms/LoginForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace amnah\yii2\user\models\forms;
+namespace faro\core\user\models\forms;
 
 use Yii;
 use yii\base\Model;
@@ -26,12 +26,12 @@ class LoginForm extends Model
     public $rememberMe = true;
 
     /**
-     * @var \amnah\yii2\user\models\User
+     * @var \faro\core\user\models\User
      */
     protected $user = false;
 
     /**
-     * @var \amnah\yii2\user\Module
+     * @var \faro\core\user\Module
      */
     public $module;
 
@@ -85,7 +85,7 @@ public function validateUser()
 
         // check status and resend email if inactive
         if ($user && $user->status == $user::STATUS_INACTIVE) {
-            /** @var \amnah\yii2\user\models\UserToken $userToken */
+            /** @var \faro\core\user\models\UserToken $userToken */
             $userToken = $this->module->model("UserToken");
             $userToken = $userToken::generate($user->id, $userToken::TYPE_EMAIL_ACTIVATE);
             $user->sendEmailConfirmation($userToken);
@@ -103,7 +103,7 @@ public function validatePassword()
             return;
         }
 
-        /** @var \amnah\yii2\user\models\User $user */
+        /** @var \faro\core\user\models\User $user */
 
         // check if password is correct
         $user = $this->getUser();
@@ -114,7 +114,7 @@ public function validatePassword()
 
     /**
      * Get user based on email and/or username
-     * @return \amnah\yii2\user\models\User|null
+     * @return \faro\core\user\models\User|null
      */
     public function getUser()
     {
diff --git a/models/forms/ResendForm.php b/src/models/forms/ResendForm.php
similarity index 88%
rename from models/forms/ResendForm.php
rename to src/models/forms/ResendForm.php
index 05d4af7..09b3104 100644
--- a/models/forms/ResendForm.php
+++ b/src/models/forms/ResendForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace amnah\yii2\user\models\forms;
+namespace faro\core\user\models\forms;
 
 use Yii;
 use yii\base\Model;
@@ -16,12 +16,12 @@ class ResendForm extends Model
     public $email;
 
     /**
-     * @var \amnah\yii2\user\models\User
+     * @var \faro\core\user\models\User
      */
     protected $user = false;
 
     /**
-     * @var \amnah\yii2\user\Module
+     * @var \faro\core\user\Module
      */
     public $module;
 
@@ -66,15 +66,15 @@ public function validateEmailInactive()
 
     /**
      * Get user based on email
-     * @return \amnah\yii2\user\models\User|null
+     * @return \faro\core\user\models\User|null
      */
     public function getUser()
     {
         // get and store user
         if ($this->user === false) {
 
-            /** @var \amnah\yii2\user\models\User $user */
-            /** @var \amnah\yii2\user\models\UserToken $userToken */
+            /** @var \faro\core\user\models\User $user */
+            /** @var \faro\core\user\models\UserToken $userToken */
             $user = $this->module->model("User");
             $userToken = $this->module->model("UserToken");
 
@@ -110,7 +110,7 @@ public function sendEmail()
             return false;
         }
 
-        /** @var \amnah\yii2\user\models\UserToken $userToken */
+        /** @var \faro\core\user\models\UserToken $userToken */
         $user = $this->getUser();
         $userToken = $this->module->model("UserToken");
 
diff --git a/models/search/UserSearch.php b/src/models/search/UserSearch.php
similarity index 93%
rename from models/search/UserSearch.php
rename to src/models/search/UserSearch.php
index 7881880..468ee36 100644
--- a/models/search/UserSearch.php
+++ b/src/models/search/UserSearch.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace amnah\yii2\user\models\search;
+namespace faro\core\user\models\search;
 
 use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
-use amnah\yii2\user\models\User;
+use faro\core\user\models\User;
 
 /**
- * UserSearch represents the model behind the search form about `amnah\yii2\user\models\User`.
+ * UserSearch represents the model behind the search form about `faro\core\user\models\User`.
  */
 class UserSearch extends User
 {
@@ -17,7 +17,7 @@ class UserSearch extends User
      */
     public static function tableName()
     {
-        return "{{%user}}";
+        return "{{%core_acl_usuario}}";
     }
 
     /**
@@ -56,8 +56,8 @@ public function attributes()
      */
     public function search($params)
     {
-        /** @var \amnah\yii2\user\models\User $user */
-        /** @var \amnah\yii2\user\models\Profile $profile */
+        /** @var \faro\core\user\models\User $user */
+        /** @var \faro\core\user\models\Profile $profile */
 
         // get models
         $user = $this->module->model("User");
diff --git a/views/admin/_form.php b/src/views/admin/_form.php
similarity index 89%
rename from views/admin/_form.php
rename to src/views/admin/_form.php
index 5a861ee..1ed6a35 100644
--- a/views/admin/_form.php
+++ b/src/views/admin/_form.php
@@ -5,10 +5,10 @@
 
 /**
  * @var yii\web\View $this
- * @var amnah\yii2\user\Module $module
- * @var amnah\yii2\user\models\User $user
- * @var amnah\yii2\user\models\Profile $profile
- * @var amnah\yii2\user\models\Role $role
+ * @var faro\core\user\Module $module
+ * @var faro\core\user\models\User $user
+ * @var faro\core\user\models\Profile $profile
+ * @var faro\core\user\models\Role $role
  * @var yii\widgets\ActiveForm $form
  */
 
diff --git a/views/admin/_search.php b/src/views/admin/_search.php
similarity index 95%
rename from views/admin/_search.php
rename to src/views/admin/_search.php
index c010fe4..cde0cee 100644
--- a/views/admin/_search.php
+++ b/src/views/admin/_search.php
@@ -5,7 +5,7 @@
 
 /**
  * @var yii\web\View $this
- * @var amnah\yii2\user\models\search\UserSearch $model
+ * @var faro\core\user\models\search\UserSearch $model
  * @var yii\widgets\ActiveForm $form
  */
 ?>
diff --git a/views/admin/create.php b/src/views/admin/create.php
similarity index 62%
rename from views/admin/create.php
rename to src/views/admin/create.php
index 55c0e55..babcd2e 100644
--- a/views/admin/create.php
+++ b/src/views/admin/create.php
@@ -1,26 +1,30 @@
 <?php
 
+use faro\core\widgets\Panel;
 use yii\helpers\Html;
 
 /**
  * @var yii\web\View $this
- * @var amnah\yii2\user\models\User $user
- * @var amnah\yii2\user\models\Profile $profile
+ * @var faro\core\user\models\User $user
+ * @var faro\core\user\models\Profile $profile
  */
 
 $this->title = Yii::t('user', 'Create {modelClass}', [
-  'modelClass' => 'User',
+  'modelClass' => 'Usuario',
 ]);
+
 $this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Users'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="user-create">
 
-    <h1><?= Html::encode($this->title) ?></h1>
+    <?php Panel::begin(['header' => 'Agregar usuario']) ?>
 
     <?= $this->render('_form', [
         'user' => $user,
         'profile' => $profile,
     ]) ?>
+    
+    <?php Panel::end() ?>
 
 </div>
\ No newline at end of file
diff --git a/views/admin/index.php b/src/views/admin/index.php
similarity index 50%
rename from views/admin/index.php
rename to src/views/admin/index.php
index 052e7e6..90e8ff6 100644
--- a/views/admin/index.php
+++ b/src/views/admin/index.php
@@ -1,15 +1,19 @@
 <?php
 
+use faro\core\components\ControlUsuarios;
+use faro\core\components\FaroGridView;
+use faro\core\widgets\AccionesLayoutWidget;
+use faro\core\widgets\Panel;
 use yii\helpers\Html;
 use yii\grid\GridView;
 
 /**
  * @var yii\web\View $this
  * @var yii\data\ActiveDataProvider $dataProvider
- * @var amnah\yii2\user\Module $module
- * @var amnah\yii2\user\models\search\UserSearch $searchModel
- * @var amnah\yii2\user\models\User $user
- * @var amnah\yii2\user\models\Role $role
+ * @var faro\core\user\Module $module
+ * @var faro\core\user\models\search\UserSearch $searchModel
+ * @var faro\core\user\models\User $user
+ * @var faro\core\user\models\Role $role
  */
 
 $module = $this->context->module;
@@ -17,50 +21,64 @@
 $role = $module->model("Role");
 
 $this->title = Yii::t('user', 'Users');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Administración'), 'url' => ['/faro/admin']];
 $this->params['breadcrumbs'][] = $this->title;
+
+$this->params["navbar_menu_selected"] = "administracion";
+
+if (ControlUsuarios::esAdmin()) {
+    AccionesLayoutWidget::agregarBoton(
+        \yii\bootstrap4\Html::a("<i class='fas fa-plus-circle'></i> Nuevo usuario", ['create'],
+            ["class" => "dropdown-item"])
+    );
+}
 ?>
+
 <div class="user-index">
 
-    <h1><?= Html::encode($this->title) ?></h1>
+    <?php Panel::begin(['header' => 'Listado de usuarios']) ?>
 
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
 
-    <p>
-        <?= Html::a(Yii::t('user', 'Create {modelClass}', [
-          'modelClass' => 'User',
-        ]), ['create'], ['class' => 'btn btn-success']) ?>
-    </p>
-
     <?php \yii\widgets\Pjax::begin(); ?>
-    <?= GridView::widget([
+    <?= FaroGridView::widget([
         'dataProvider' => $dataProvider,
-        'filterModel' => $searchModel,
+        'filterModel' => null,
+        'headerContainer' => ['class' => ''],
+        'striped' => false,
+        "bordered" => false,
+        "layout" => "{items}\n{pager}",
         'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
-
-            'id',
             [
                 'attribute' => 'role_id',
                 'label' => Yii::t('user', 'Role'),
                 'filter' => $role::dropdown(),
-                'value' => function($model, $index, $dataColumn) use ($role) {
+                'value' => function ($model, $index, $dataColumn) use ($role) {
                     $roleDropdown = $role::dropdown();
                     return $roleDropdown[$model->role_id];
                 },
             ],
+            'profile.full_name' => [
+                "attribute" => "profile.full_name",
+                "format" => "raw",
+                "value" => function ($model) {
+                    return \yii\bootstrap4\Html::a($model->profile->full_name,
+                        ["view", "id" => $model->id]);
+                }
+            ],
+            'email:email',
             [
                 'attribute' => 'status',
                 'label' => Yii::t('user', 'Status'),
                 'filter' => $user::statusDropdown(),
-                'value' => function($model, $index, $dataColumn) use ($user) {
+                'value' => function ($model, $index, $dataColumn) use ($user) {
                     $statusDropdown = $user::statusDropdown();
                     return $statusDropdown[$model->status];
                 },
             ],
-            'email:email',
-            'profile.full_name',
+
             'profile.timezone',
-            'created_at',
+            'created_at:relativeTime',
             // 'username',
             // 'password',
             // 'auth_key',
@@ -71,10 +89,9 @@
             // 'updated_at',
             // 'banned_at',
             // 'banned_reason',
-
-            ['class' => 'yii\grid\ActionColumn'],
         ],
     ]); ?>
     <?php \yii\widgets\Pjax::end(); ?>
 
+    <?php Panel::end() ?>
 </div>
diff --git a/src/views/admin/update.php b/src/views/admin/update.php
new file mode 100644
index 0000000..96fd064
--- /dev/null
+++ b/src/views/admin/update.php
@@ -0,0 +1,54 @@
+<?php
+
+use faro\core\widgets\Panel;
+use yii\bootstrap4\Alert;
+use yii\helpers\Html;
+
+/**
+ * @var yii\web\View $this
+ * @var faro\core\user\models\User $user
+ * @var faro\core\user\models\Profile $profile
+ */
+
+$this->title = "Actualizar usuario " . $user->profile->full_name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Administración'), 'url' => ['/faro/admin']];
+$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Users'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $user->profile->full_name, 'url' => ['view', 'id' => $user->id]];
+$this->params['breadcrumbs'][] = Yii::t('user', 'Update');
+?>
+<div class="user-update">
+
+    <?php Panel::begin(["header" => "Editar usuario"]) ?>
+
+    <?= $this->render('_form', [
+        'user' => $user,
+        'profile' => $profile,
+    ]) ?>
+    
+    <?php Panel::end() ?>
+
+
+    <?php Panel::begin(["header" => "Eliminar campaña", "margenTop" => true]) ?>
+
+    <p>Para eliminar este usuario ingresá desde acá. Si creés que en un futuro puede volver a ser
+    necesario te sugerimos que lo desactives.</p>
+
+    <?= Alert::widget([
+        "body" => "<i class='fas fa-exclamation-triangle mr-2'></i> Esta acción no puede deshacerse",
+        "closeButton" => false,
+        "options" => ["class" => "alert-danger"]
+    ]) ?>
+
+    <?=
+    Html::a("Eliminar usuario", ['delete', 'id' => $user->id], [
+        'class' => 'btn btn-danger btn-block shadow-sm d-sm-inline-block',
+        'data' => [
+            'confirm' => Yii::t('app', 'Esta seguro que desea eliminar este usuario?'),
+            'method' => 'post',
+        ],
+    ])
+    ?>
+
+    <?php Panel::end() ?>
+
+</div>
diff --git a/views/admin/view.php b/src/views/admin/view.php
similarity index 55%
rename from views/admin/view.php
rename to src/views/admin/view.php
index 7547ceb..0b91e7c 100644
--- a/views/admin/view.php
+++ b/src/views/admin/view.php
@@ -1,32 +1,32 @@
 <?php
 
+use faro\core\components\ControlUsuarios;
+use faro\core\widgets\AccionesLayoutWidget;
+use faro\core\widgets\Panel;
 use yii\helpers\Html;
 use yii\widgets\DetailView;
 
 /**
  * @var yii\web\View $this
- * @var amnah\yii2\user\models\User $user
+ * @var faro\core\user\models\User $user
  */
 
-$this->title = $user->id;
+$this->title = $user->profile->full_name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Administración'), 'url' => ['/faro/admin']];
 $this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Users'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
-?>
-<div class="user-view">
 
-    <h1><?= Html::encode($this->title) ?></h1>
+if (ControlUsuarios::esAdmin()) {
+    AccionesLayoutWidget::agregarBoton(
+        \yii\bootstrap4\Html::a("<i class='fas fa-edit'></i> Editar usuario", ['update', "id" => $user->id], ["class" => "dropdown-item"])
+    );
+}
+?>
 
-    <p>
-        <?= Html::a(Yii::t('user', 'Update'), ['update', 'id' => $user->id], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(Yii::t('user', 'Delete'), ['delete', 'id' => $user->id], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('user', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ]) ?>
-    </p>
+<div class="user-view">
 
+    <?php Panel::begin(['header' => 'Ver usuario']) ?>
+    
     <?= DetailView::widget([
         'model' => $user,
         'attributes' => [
@@ -48,5 +48,7 @@
             'banned_reason',
         ],
     ]) ?>
+    
+    <?php Panel::end() ?>
 
 </div>
diff --git a/views/default/account.php b/src/views/default/account.php
similarity index 95%
rename from views/default/account.php
rename to src/views/default/account.php
index d55d985..84ab683 100644
--- a/views/default/account.php
+++ b/src/views/default/account.php
@@ -6,9 +6,9 @@
 /**
  * @var yii\web\View $this
  * @var yii\widgets\ActiveForm $form
- * @var amnah\yii2\user\Module $module
- * @var amnah\yii2\user\models\User $user
- * @var amnah\yii2\user\models\UserToken $userToken
+ * @var faro\core\user\Module $module
+ * @var faro\core\user\models\User $user
+ * @var faro\core\user\models\UserToken $userToken
  */
 
 $module = $this->context->module;
diff --git a/views/default/confirm.php b/src/views/default/confirm.php
similarity index 100%
rename from views/default/confirm.php
rename to src/views/default/confirm.php
diff --git a/src/views/default/forgot.php b/src/views/default/forgot.php
new file mode 100644
index 0000000..2d65489
--- /dev/null
+++ b/src/views/default/forgot.php
@@ -0,0 +1,81 @@
+<?php
+
+use faro\core\FaroCoreAsset;
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/**
+ * @var yii\web\View $this
+ * @var yii\widgets\ActiveForm $form
+ * @var faro\core\user\models\forms\ForgotForm $model
+ */
+
+FaroCoreAsset::register($this);
+
+$this->title = Yii::t('user', 'Olvidaste tu contraseña?');
+$this->params['breadcrumbs'][] = $this->title;
+
+$directoryFaroAsset = Yii::$app->assetManager->getPublishedUrl('@faro/core/assets');
+$imagen = $directoryFaroAsset . "/img/logo_vertical.jpg";
+?>
+<div class="container">
+
+    <!-- Outer Row -->
+    <div class="row justify-content-center">
+
+        <div class="col-xl-10 col-lg-12 col-md-9">
+
+            <div class="card o-hidden border-0 shadow-lg my-5">
+                <div class="card-body p-5">
+                    <!-- Nested Row within Card Body -->
+                    <div class="row">
+                        <div class="col-lg-6 d-none d-lg-block bg-login-image"
+                             style="background-image: url(<?= $imagen ?>);"></div>
+                        <div class="col-lg-6">
+                            <div class="">
+                                <div class="text-left">
+                                    <h1 class="h4 text-gray-900 mb-4"><?= Html::encode($this->title) ?></h1>
+                                </div>
+
+                                <div class="user-default-reset">
+
+                                    <?php if ($flash = Yii::$app->session->getFlash('success')): ?>
+
+                                        <div class="alert alert-success">
+                                            <p><?= $flash ?></p>
+                                        </div>
+
+                                    <?php else: ?>
+
+
+                                        <?php $form = ActiveForm::begin(['id' => 'forgot-form']); ?>
+                                    
+                                        <p><b>No te preocupes,</b> ingresá tu email y te enviaremos un link para reiniciarla!</p>
+                                    
+                                        <?= $form->field($model, 'email') ?>
+                                        <div class="form-group">
+                                            <?= Html::submitButton(Yii::t('user', 'Submit'),
+                                                ['class' => 'btn btn-primary']) ?>
+                                        </div>
+                                        <?php ActiveForm::end(); ?>
+
+
+                                    <?php endif; ?>
+
+
+                                </div>
+
+
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+
+    </div>
+
+</div>
+
+
diff --git a/views/default/index.php b/src/views/default/index.php
similarity index 96%
rename from views/default/index.php
rename to src/views/default/index.php
index 56d3fa9..d3e82e3 100644
--- a/views/default/index.php
+++ b/src/views/default/index.php
@@ -4,7 +4,7 @@
 
 /**
  * @var yii\web\View $this
- * @var amnah\yii2\user\Module $module
+ * @var faro\core\user\Module $module
  * @var array $actions
  */
 
diff --git a/src/views/default/login.php b/src/views/default/login.php
new file mode 100644
index 0000000..70a2c93
--- /dev/null
+++ b/src/views/default/login.php
@@ -0,0 +1,123 @@
+<?php
+
+use faro\core\FaroCoreAsset;
+use yii\bootstrap4\ActiveForm;
+use yii\helpers\Html;
+
+/**
+ * @var yii\web\View $this
+ * @var yii\widgets\ActiveForm $form
+ * @var faro\core\user\models\forms\LoginForm $model
+ */
+
+FaroCoreAsset::register($this);
+
+$this->title = 'Login';
+$this->params['breadcrumbs'][] = $this->title;
+
+$asset = FaroCoreAsset::register($this);
+$imagen = $asset->baseUrl . "/img/logo_vertical.jpg";
+
+?>
+
+<div class="container">
+
+    <!-- Outer Row -->
+    <div class="row justify-content-center">
+
+        <div class="col-xl-10 col-lg-12 col-md-9">
+
+            <div class="card o-hidden border-0 shadow-lg my-5">
+                <div class="card-body p-5">
+                    <!-- Nested Row within Card Body -->
+                    <div class="row">
+                        <div class="col-lg-6 d-none d-lg-block bg-login-image" style="background-image: url(<?= $imagen ?>);"></div>
+                        <div class="col-lg-6">
+                            <div class="">
+                                <div class="text-left">
+                                    <h1 class="h4 text-gray-900 mb-4">Bienvenido!</h1>
+                                </div>
+                                <?php $form = ActiveForm::begin([
+                                    'id' => 'login-form',
+                                    'layout' => 'horizontal',
+                                    'options' => ['class' => 'user'],
+                                    'fieldConfig' => [
+                                        'template' => "{label}\n<div class=\"col-12\">{input}</div>\n<div class=\"col-12\">{error}</div>",
+                                        'labelOptions' => ['class' => 'col-lg-1 control-label'],
+                                    ],
+                                ]); ?>
+
+
+                                <?= $form->field($model, 'email')->textInput(['autofocus' => true, 'placeholder' => 'Email', 'class' => 'form-control form-control-user'])->label(false) ?>
+
+                                <?= $form->field($model, 'password')->passwordInput(['placeholder' => 'Password', 'class' => 'form-control form-control-user'])->label(false) ?>
+
+                                <?= $form->field($model, 'rememberMe')->checkbox([
+                                    'template' => "<div class=\"col-12 text-right\">{input} {label}</div>\n<div class=\"col-12\">{error}</div>",
+                                ]) ?>
+
+                                <div class="form-group">
+                                    <div class="col-12">
+                                        <?= Html::submitButton('Login', ['class' => 'btn btn-primary btn-user btn-block', 'name' => 'login-button']) ?>
+                                    </div>
+                                    
+                                    <div class="col-12 text-right mt-2">
+                                        <?= Html::a(Yii::t("user", "Olvidaste la contraseña") . "?", ["/user/forgot"]) ?>
+                                        <?php // echo Html::a(Yii::t("user", "Resend confirmation email"), ["/user/resend"]) ?>
+                                    </div>
+                                </div>
+                                
+                                
+
+                                <!-- 
+                                <div class="form-group">
+                                    <input type="email" class="form-control form-control-user" id="exampleInputEmail" aria-describedby="emailHelp" placeholder="Enter Email Address...">
+                                </div>
+                                <div class="form-group">
+                                    <input type="password" class="form-control form-control-user" id="exampleInputPassword" placeholder="Password">
+                                </div>
+                                <div class="form-group">
+                                    <div class="custom-control custom-checkbox small">
+                                        <input type="checkbox" class="custom-control-input" id="customCheck">
+                                        <label class="custom-control-label" for="customCheck">Remember Me</label>
+                                    </div>
+                                </div>
+                                <a href="index.html" class="btn btn-primary btn-user btn-block">
+                                    Login
+                                </a>
+                               <hr>
+                                <a href="index.html" class="btn btn-google btn-user btn-block">
+                                    <i class="fab fa-google fa-fw"></i> Login with Google
+                                </a>
+                                <a href="index.html" class="btn btn-facebook btn-user btn-block">
+                                    <i class="fab fa-facebook-f fa-fw"></i> Login with Facebook
+                                </a>-->
+                                <?php ActiveForm::end(); ?>
+                                <!--                                <hr>-->
+                                <!--                                <div class="text-center">-->
+                                <!--                                    <a class="small" href="forgot-password.html">Forgot Password?</a>-->
+                                <!--                                </div>-->
+                                <!--                                <div class="text-center">-->
+                                <!--                                    <a class="small" href="register.html">Create an Account!</a>-->
+                                <!--                                </div>-->
+
+                                <?php if (Yii::$app->get("authClientCollection", false)): ?>
+                                    <div class="col-lg-offset-2 col-lg-10">
+                                        <?= yii\authclient\widgets\AuthChoice::widget([
+                                            'baseAuthUrl' => ['/user/auth/login']
+                                        ]) ?>
+                                    </div>
+                                <?php endif; ?>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+
+    </div>
+
+</div>
+
+
diff --git a/views/default/loginCallback.php b/src/views/default/loginCallback.php
similarity index 88%
rename from views/default/loginCallback.php
rename to src/views/default/loginCallback.php
index 979e500..abeb766 100644
--- a/views/default/loginCallback.php
+++ b/src/views/default/loginCallback.php
@@ -5,10 +5,10 @@
 
 /**
  * @var yii\web\View $this
- * @var amnah\yii2\user\Module $module
- * @var amnah\yii2\user\models\User $user
- * @var amnah\yii2\user\models\Profile $profile
- * @var amnah\yii2\user\models\UserToken $userToken
+ * @var faro\core\user\Module $module
+ * @var faro\core\user\models\User $user
+ * @var faro\core\user\models\Profile $profile
+ * @var faro\core\user\models\UserToken $userToken
  */
 
 $module = $this->context->module;
diff --git a/views/default/loginEmail.php b/src/views/default/loginEmail.php
similarity index 94%
rename from views/default/loginEmail.php
rename to src/views/default/loginEmail.php
index 1bba583..7648031 100644
--- a/views/default/loginEmail.php
+++ b/src/views/default/loginEmail.php
@@ -5,8 +5,8 @@
 
 /**
  * @var yii\web\View $this
- * @var amnah\yii2\user\Module $module
- * @var amnah\yii2\user\models\forms\LoginEmailForm $loginEmailForm
+ * @var faro\core\user\Module $module
+ * @var faro\core\user\models\forms\LoginEmailForm $loginEmailForm
  */
 
 $module = $this->context->module;
diff --git a/views/default/profile.php b/src/views/default/profile.php
similarity index 82%
rename from views/default/profile.php
rename to src/views/default/profile.php
index 1272e78..3ed1e11 100644
--- a/views/default/profile.php
+++ b/src/views/default/profile.php
@@ -1,30 +1,23 @@
 <?php
 
+use faro\core\widgets\Panel;
 use yii\helpers\Html;
 use yii\helpers\ArrayHelper;
 use yii\widgets\ActiveForm;
-use amnah\yii2\user\helpers\Timezone;
+use faro\core\user\helpers\Timezone;
 
 /**
  * @var yii\web\View $this
  * @var yii\widgets\ActiveForm $form
- * @var amnah\yii2\user\models\Profile $profile
+ * @var faro\core\user\models\Profile $profile
  */
 
 $this->title = Yii::t('user', 'Profile');
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="user-default-profile">
-
-    <h1><?= Html::encode($this->title) ?></h1>
-
-    <?php if ($flash = Yii::$app->session->getFlash("Profile-success")): ?>
-
-        <div class="alert alert-success">
-            <p><?= $flash ?></p>
-        </div>
-
-    <?php endif; ?>
+    
+    <?php Panel::begin(['header' => 'Actualizar perfil']) ?>
 
     <?php $form = ActiveForm::begin([
         'id' => 'profile-form',
@@ -54,5 +47,7 @@
     </div>
 
     <?php ActiveForm::end(); ?>
+    
+    <?php Panel::end() ?>
 
 </div>
\ No newline at end of file
diff --git a/views/default/register.php b/src/views/default/register.php
similarity index 94%
rename from views/default/register.php
rename to src/views/default/register.php
index b96c29c..bf70cde 100644
--- a/views/default/register.php
+++ b/src/views/default/register.php
@@ -6,9 +6,9 @@
 /**
  * @var yii\web\View $this
  * @var yii\widgets\ActiveForm $form
- * @var amnah\yii2\user\Module $module
- * @var amnah\yii2\user\models\User $user
- * @var amnah\yii2\user\models\User $profile
+ * @var faro\core\user\Module $module
+ * @var faro\core\user\models\User $user
+ * @var faro\core\user\models\User $profile
  * @var string $userDisplayName
  */
 
diff --git a/views/default/resend.php b/src/views/default/resend.php
similarity index 94%
rename from views/default/resend.php
rename to src/views/default/resend.php
index b0726a1..9ef7843 100644
--- a/views/default/resend.php
+++ b/src/views/default/resend.php
@@ -6,7 +6,7 @@
 /**
  * @var yii\web\View $this
  * @var yii\widgets\ActiveForm $form
- * @var amnah\yii2\user\models\forms\ResendForm $model
+ * @var faro\core\user\models\forms\ResendForm $model
  */
 
 $this->title = Yii::t('user', 'Resend');
diff --git a/src/views/default/reset.php b/src/views/default/reset.php
new file mode 100644
index 0000000..0a5052f
--- /dev/null
+++ b/src/views/default/reset.php
@@ -0,0 +1,93 @@
+<?php
+
+use faro\core\FaroCoreAsset;
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/**
+ * @var yii\web\View $this
+ * @var yii\widgets\ActiveForm $form
+ * @var faro\core\user\models\User $user
+ * @var bool $success
+ * @var bool $invalidToken
+ */
+
+FaroCoreAsset::register($this);
+
+$this->title = Yii::t('user', 'Resetear contraseña');
+$this->params['breadcrumbs'][] = $this->title;
+
+$directoryFaroAsset = Yii::$app->assetManager->getPublishedUrl('@faro/core/assets');
+$imagen = $directoryFaroAsset . "/img/logo_vertical.jpg";
+?>
+<div class="container">
+
+    <!-- Outer Row -->
+    <div class="row justify-content-center">
+
+        <div class="col-xl-10 col-lg-12 col-md-9">
+
+            <div class="card o-hidden border-0 shadow-lg my-5">
+                <div class="card-body p-0">
+                    <!-- Nested Row within Card Body -->
+                    <div class="row">
+                        <div class="col-lg-6 d-none d-lg-block bg-login-image"
+                             style="background-image: url(<?= $imagen ?>);"></div>
+                        <div class="col-lg-6">
+                            <div class="p-5">
+                                <div class="text-left">
+                                    <h1 class="h4 text-gray-900 mb-4"><?= Html::encode($this->title) ?></h1>
+                                </div>
+
+                                <div class="user-default-reset">
+                                    
+                                    <?php if (!empty($success)): ?>
+
+                                        <div class="alert alert-success">
+
+                                            <p><?= Yii::t("user", "Password has been reset") ?></p>
+                                            <p><?= Html::a(Yii::t("user", "Log in here"), ["/user/login"]) ?></p>
+
+                                        </div>
+
+                                    <?php elseif (!empty($invalidToken)): ?>
+
+                                        <div class="alert alert-danger">
+                                            <p><?= Yii::t("user", "Invalid token") ?></p>
+                                        </div>
+
+                                    <?php else: ?>
+
+
+                                        <div class="alert alert-warning">
+                                            <p><?= Yii::t("user", "Email") ?> [ <?= $user->email ?> ]</p>
+                                        </div>
+
+                                        <?php $form = ActiveForm::begin(['id' => 'reset-form']); ?>
+
+                                        <?= $form->field($user, 'newPassword')->passwordInput() ?>
+                                        <?= $form->field($user, 'newPasswordConfirm')->passwordInput() ?>
+                                        <div class="form-group">
+                                            <?= Html::submitButton(Yii::t("user", "Reset"),
+                                                ['class' => 'btn btn-primary']) ?>
+                                        </div>
+                                        <?php ActiveForm::end(); ?>
+                                      
+
+                                    <?php endif; ?>
+
+                                </div>
+
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+
+    </div>
+
+</div>
+
+
diff --git a/views/admin/update.php b/views/admin/update.php
deleted file mode 100644
index dd6b7e1..0000000
--- a/views/admin/update.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-use yii\helpers\Html;
-
-/**
- * @var yii\web\View $this
- * @var amnah\yii2\user\models\User $user
- * @var amnah\yii2\user\models\Profile $profile
- */
-
-$this->title = Yii::t('user', 'Update {modelClass}: ', [
-  'modelClass' => 'User',
-]) . ' ' . $user->id;
-$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Users'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = ['label' => $user->id, 'url' => ['view', 'id' => $user->id]];
-$this->params['breadcrumbs'][] = Yii::t('user', 'Update');
-?>
-<div class="user-update">
-
-    <h1><?= Html::encode($this->title) ?></h1>
-
-    <?= $this->render('_form', [
-        'user' => $user,
-        'profile' => $profile,
-    ]) ?>
-
-</div>
diff --git a/views/default/forgot.php b/views/default/forgot.php
deleted file mode 100644
index 7f399f4..0000000
--- a/views/default/forgot.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
-
-/**
- * @var yii\web\View $this
- * @var yii\widgets\ActiveForm $form
- * @var amnah\yii2\user\models\forms\ForgotForm $model
- */
-
-$this->title = Yii::t('user', 'Forgot password');
-$this->params['breadcrumbs'][] = $this->title;
-?>
-<div class="user-default-forgot">
-
-    <h1><?= Html::encode($this->title) ?></h1>
-
-    <?php if ($flash = Yii::$app->session->getFlash('Forgot-success')): ?>
-
-        <div class="alert alert-success">
-            <p><?= $flash ?></p>
-        </div>
-
-    <?php else: ?>
-
-        <div class="row">
-            <div class="col-lg-5">
-                <?php $form = ActiveForm::begin(['id' => 'forgot-form']); ?>
-                    <?= $form->field($model, 'email') ?>
-                    <div class="form-group">
-                        <?= Html::submitButton(Yii::t('user', 'Submit'), ['class' => 'btn btn-primary']) ?>
-                    </div>
-                <?php ActiveForm::end(); ?>
-            </div>
-        </div>
-
-    <?php endif; ?>
-
-</div>
diff --git a/views/default/login.php b/views/default/login.php
deleted file mode 100644
index 8be2ddd..0000000
--- a/views/default/login.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
-
-/**
- * @var yii\web\View $this
- * @var yii\widgets\ActiveForm $form
- * @var amnah\yii2\user\models\forms\LoginForm $model
- */
-
-$this->title = Yii::t('user', 'Login');
-$this->params['breadcrumbs'][] = $this->title;
-?>
-<div class="user-default-login">
-
-    <h1><?= Html::encode($this->title) ?></h1>
-
-    <?php $form = ActiveForm::begin([
-        'id' => 'login-form',
-        'options' => ['class' => 'form-horizontal'],
-        'fieldConfig' => [
-            'template' => "{label}\n<div class=\"col-lg-3\">{input}</div>\n<div class=\"col-lg-7\">{error}</div>",
-            'labelOptions' => ['class' => 'col-lg-2 control-label'],
-        ],
-
-    ]); ?>
-
-    <?= $form->field($model, 'email') ?>
-    <?= $form->field($model, 'password')->passwordInput() ?>
-    <?= $form->field($model, 'rememberMe', [
-        'template' => "{label}<div class=\"col-lg-offset-2 col-lg-3\">{input}</div>\n<div class=\"col-lg-7\">{error}</div>",
-    ])->checkbox() ?>
-
-    <div class="form-group">
-        <div class="col-lg-offset-2 col-lg-10">
-            <?= Html::submitButton(Yii::t('user', 'Login'), ['class' => 'btn btn-primary']) ?>
-
-            <br/><br/>
-            <?= Html::a(Yii::t("user", "Register"), ["/user/register"]) ?> /
-            <?= Html::a(Yii::t("user", "Forgot password") . "?", ["/user/forgot"]) ?> /
-            <?= Html::a(Yii::t("user", "Resend confirmation email"), ["/user/resend"]) ?>
-        </div>
-    </div>
-
-    <?php ActiveForm::end(); ?>
-
-    <?php if (Yii::$app->get("authClientCollection", false)): ?>
-        <div class="col-lg-offset-2 col-lg-10">
-            <?= yii\authclient\widgets\AuthChoice::widget([
-                'baseAuthUrl' => ['/user/auth/login']
-            ]) ?>
-        </div>
-    <?php endif; ?>
-
-    <div class="col-lg-offset-2" style="color:#999;">
-        You may login with <strong>neo/neo</strong>.<br>
-        To modify the username/password, log in first and then <?= HTML::a("update your account", ["/user/account"]) ?>.
-    </div>
-
-</div>
diff --git a/views/default/reset.php b/views/default/reset.php
deleted file mode 100644
index 2f6d62e..0000000
--- a/views/default/reset.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
-
-/**
- * @var yii\web\View $this
- * @var yii\widgets\ActiveForm $form
- * @var amnah\yii2\user\models\User $user
- * @var bool $success
- * @var bool $invalidToken
- */
-
-$this->title = Yii::t('user', 'Reset');
-$this->params['breadcrumbs'][] = $this->title;
-?>
-<div class="user-default-reset">
-
-    <h1><?= Html::encode($this->title) ?></h1>
-
-    <?php if (!empty($success)): ?>
-
-        <div class="alert alert-success">
-
-            <p><?= Yii::t("user", "Password has been reset") ?></p>
-            <p><?= Html::a(Yii::t("user", "Log in here"), ["/user/login"]) ?></p>
-
-        </div>
-
-    <?php elseif (!empty($invalidToken)): ?>
-
-        <div class="alert alert-danger">
-            <p><?= Yii::t("user", "Invalid token") ?></p>
-        </div>
-
-    <?php else: ?>
-
-        <div class="row">
-            <div class="col-lg-5">
-
-                <div class="alert alert-warning">
-                    <p><?= Yii::t("user", "Email") ?> [ <?= $user->email ?> ]</p>
-                </div>
-
-                <?php $form = ActiveForm::begin(['id' => 'reset-form']); ?>
-
-                    <?= $form->field($user, 'newPassword')->passwordInput() ?>
-                    <?= $form->field($user, 'newPasswordConfirm')->passwordInput() ?>
-                    <div class="form-group">
-                        <?= Html::submitButton(Yii::t("user", "Reset"), ['class' => 'btn btn-primary']) ?>
-                    </div>
-                <?php ActiveForm::end(); ?>
-            </div>
-        </div>
-
-    <?php endif; ?>
-
-</div>
\ No newline at end of file