diff --git a/core/app/src/app/app-initializer.ts b/core/app/src/app/app-initializer.ts
index f6759c3d3..f00ca06ae 100644
--- a/core/app/src/app/app-initializer.ts
+++ b/core/app/src/app/app-initializer.ts
@@ -26,7 +26,7 @@ export class AppInit {
 
                 routes.push({
                     path: 'Login',
-                    loadChildren: () => import('../components/login/login.module').then(m => m.LoginUiModule),
+                    loadChildren: () => import('../../views/login/components/login/login.module').then(m => m.LoginUiModule),
                     canActivate: [LoginAuthGuard],
                     runGuardsAndResolvers: 'always',
                     resolve: {
diff --git a/core/app/src/services/auth/auth.service.ts b/core/app/src/services/auth/auth.service.ts
index 9a05e236f..241e0563d 100644
--- a/core/app/src/services/auth/auth.service.ts
+++ b/core/app/src/services/auth/auth.service.ts
@@ -3,7 +3,7 @@ import {Router} from '@angular/router';
 import {HttpClient, HttpErrorResponse, HttpHeaders, HttpParams} from '@angular/common/http';
 import {BehaviorSubject, Observable, Subscription, throwError} from 'rxjs';
 import {catchError, distinctUntilChanged, finalize, take} from 'rxjs/operators';
-import {LoginUiComponent} from '@components/login/login.component';
+import {LoginUiComponent} from '@views/login/components/login/login.component';
 import {User} from '@services/user/user';
 import {MessageService} from '@services/message/message.service';
 import {StateManager} from '@base/store/state-manager';
@@ -23,11 +23,12 @@ export interface SessionStatus {
     providedIn: 'root'
 })
 export class AuthService {
-    protected timerSet = false;
-    private currentUserSubject = new BehaviorSubject<User>({} as User);
-    currentUser$ = this.currentUserSubject.asObservable().pipe(distinctUntilChanged());
+
+    currentUser$: Observable<User>;
     isUserLoggedIn: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
     defaultTimeout = '3600';
+    protected timerSet = false;
+    private currentUserSubject = new BehaviorSubject<User>({} as User);
 
     constructor(
         private http: HttpClient,
@@ -39,6 +40,7 @@ export class AuthService {
         protected appStateStore: AppStateStore,
         protected localStorage: LocalStorageService
     ) {
+        this.currentUser$ = this.currentUserSubject.asObservable().pipe(distinctUntilChanged());
     }
 
     getCurrentUser(): User {
diff --git a/core/app/src/components/login/login.component.html b/core/app/views/login/components/login/login.component.html
similarity index 100%
rename from core/app/src/components/login/login.component.html
rename to core/app/views/login/components/login/login.component.html
diff --git a/core/app/src/components/login/login.component.spec.ts b/core/app/views/login/components/login/login.component.spec.ts
similarity index 100%
rename from core/app/src/components/login/login.component.spec.ts
rename to core/app/views/login/components/login/login.component.spec.ts
diff --git a/core/app/src/components/login/login.component.ts b/core/app/views/login/components/login/login.component.ts
similarity index 96%
rename from core/app/src/components/login/login.component.ts
rename to core/app/views/login/components/login/login.component.ts
index f66a84fce..2d876c38d 100644
--- a/core/app/src/components/login/login.component.ts
+++ b/core/app/views/login/components/login/login.component.ts
@@ -7,7 +7,7 @@ import {fadeIn} from 'ng-animate';
 import {AuthService} from '@services/auth/auth.service';
 import {MessageService} from '@services/message/message.service';
 import {RecoverPasswordService} from '@services/process/processes/recover-password/recover-password';
-import {SystemConfigStore, SystemConfigMap} from '@store/system-config/system-config.store';
+import {SystemConfigMap, SystemConfigStore} from '@store/system-config/system-config.store';
 import {LanguageStore, LanguageStringMap} from '@store/language/language.store';
 import {Process} from '@services/process/process.service';
 
@@ -74,11 +74,11 @@ export class LoginUiComponent {
     }
 
     doLanguageChange(language: string): void {
-        this.languageStore.changeLanguage(language)
+        this.languageStore.changeLanguage(language);
     }
 
     doGetCurrentLanguage(): string {
-        return this.languageStore.getCurrentLanguage()
+        return this.languageStore.getCurrentLanguage();
     }
 
     flipCard(): void {
diff --git a/core/app/src/components/login/login.module.ts b/core/app/views/login/components/login/login.module.ts
similarity index 87%
rename from core/app/src/components/login/login.module.ts
rename to core/app/views/login/components/login/login.module.ts
index 4d728680c..9b6f20c85 100644
--- a/core/app/src/components/login/login.module.ts
+++ b/core/app/views/login/components/login/login.module.ts
@@ -2,9 +2,9 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {FormsModule} from '@angular/forms';
 import {RouterModule} from '@angular/router';
-import {AppManagerModule} from '../../app-manager/app-manager.module';
+import {AppManagerModule} from '@base/app-manager/app-manager.module';
 import {LoginUiComponent} from './login.component';
-import {LogoUiModule} from '../logo/logo.module';
+import {LogoUiModule} from '@components/logo/logo.module';
 import {LoginUiRoutes} from './login.routes';
 import {AngularSvgIconModule} from 'angular-svg-icon';
 import {ImageModule} from '@components/image/image.module';
diff --git a/core/app/src/components/login/login.routes.ts b/core/app/views/login/components/login/login.routes.ts
similarity index 98%
rename from core/app/src/components/login/login.routes.ts
rename to core/app/views/login/components/login/login.routes.ts
index 8bc7586eb..b6375164b 100644
--- a/core/app/src/components/login/login.routes.ts
+++ b/core/app/views/login/components/login/login.routes.ts
@@ -6,4 +6,4 @@ export const LoginUiRoutes: Route[] = [
         path: '',
         component: LoginUiComponent
     }
-];
\ No newline at end of file
+];