diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index e3174dd..365b334 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -3,8 +3,8 @@ import { Routes, RouterModule } from '@angular/router';
 
 const routes: Routes = [
   { path: '', loadChildren: './pages/pages.module#PagesModule' },
-  { path: 'auth', loadChildren: './pages/auth/auth.module#AuthModule' },
-  { path: 'errors', loadChildren: './pages/errors/errors.module#ErrorsModule' },
+  { path: 'auth', loadChildren: './pages/auth/auth-page.module#AuthPageModule' },
+  { path: 'errors', loadChildren: './pages/errors/errors-page.module#ErrorsPageModule' },
   { path: '**', redirectTo: 'errors/404' }
 ];
 
diff --git a/src/app/packages/member/components/modify/modify.module.ts b/src/app/packages/member/components/modify/modify.module.ts
new file mode 100644
index 0000000..b999b7e
--- /dev/null
+++ b/src/app/packages/member/components/modify/modify.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ModifyComponent } from './modify.component';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+  ],
+  declarations: [
+    ModifyComponent,
+  ],
+  exports: [
+    ModifyComponent
+  ]
+})
+export class ModifyModule { }
diff --git a/src/app/packages/member/components/reset-password/reset-password.module.ts b/src/app/packages/member/components/reset-password/reset-password.module.ts
new file mode 100644
index 0000000..e88a191
--- /dev/null
+++ b/src/app/packages/member/components/reset-password/reset-password.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ResetPasswordComponent } from './reset-password.component';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+  ],
+  declarations: [
+    ResetPasswordComponent,
+  ],
+  exports: [
+    ResetPasswordComponent
+  ]
+})
+export class ResetPasswordModule { }
diff --git a/src/app/packages/member/components/signin/signin.component.html b/src/app/packages/member/components/signin/signin.component.html
index a8e7b3c..9202149 100644
--- a/src/app/packages/member/components/signin/signin.component.html
+++ b/src/app/packages/member/components/signin/signin.component.html
@@ -1 +1 @@
-<div>signin</div>
\ No newline at end of file
+<div>signin</div>
diff --git a/src/app/packages/member/components/signin/signin.module.ts b/src/app/packages/member/components/signin/signin.module.ts
new file mode 100644
index 0000000..7b3570d
--- /dev/null
+++ b/src/app/packages/member/components/signin/signin.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SigninComponent } from './signin.component';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+  ],
+  declarations: [
+    SigninComponent,
+  ],
+  exports: [
+    SigninComponent
+  ]
+})
+export class SigninModule { }
diff --git a/src/app/packages/member/components/signup/signup.module.ts b/src/app/packages/member/components/signup/signup.module.ts
new file mode 100644
index 0000000..8e86c64
--- /dev/null
+++ b/src/app/packages/member/components/signup/signup.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SignupComponent } from './signup.component';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+  ],
+  declarations: [
+    SignupComponent,
+  ],
+  exports: [
+    SignupComponent
+  ]
+})
+export class SignupModule { }
diff --git a/src/app/packages/member/member.module.ts b/src/app/packages/member/member.module.ts
deleted file mode 100644
index cf7d66e..0000000
--- a/src/app/packages/member/member.module.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-import { SigninComponent } from './components/signin/signin.component';
-import { SignupComponent } from './components/signup/signup.component';
-import { ModifyComponent } from './components/modify/modify.component';
-import { ResetPasswordComponent } from './components/reset-password/reset-password.component';
-
-@NgModule({
-  imports: [
-    CommonModule
-  ],
-  declarations: [
-    SigninComponent,
-    SignupComponent,
-    ModifyComponent,
-    ResetPasswordComponent,
-  ],
-  exports: [
-    SigninComponent,
-    SignupComponent,
-    ModifyComponent,
-    ResetPasswordComponent,
-  ]
-})
-export class MemberModule { }
diff --git a/src/app/pages/auth/auth-page-routing.module.ts b/src/app/pages/auth/auth-page-routing.module.ts
new file mode 100644
index 0000000..664a37d
--- /dev/null
+++ b/src/app/pages/auth/auth-page-routing.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { AuthPageComponent } from './auth-page.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: AuthPageComponent,
+    children: [
+      { path: '', redirectTo: 'signin' },
+      { path: 'signin', loadChildren: './signin/signin-page.module#SigninPageModule' },
+      { path: 'signup', loadChildren: './signup/signup-page.module#SignupPageModule' },
+      { path: 'reset-password', loadChildren: './reset-password/reset-password-page.module#ResetPasswordPageModule' },
+    ]
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class AuthPageRoutingModule { }
diff --git a/src/app/pages/auth/auth.component.html b/src/app/pages/auth/auth-page.component.html
similarity index 100%
rename from src/app/pages/auth/auth.component.html
rename to src/app/pages/auth/auth-page.component.html
diff --git a/src/app/pages/auth/auth.component.scss b/src/app/pages/auth/auth-page.component.scss
similarity index 100%
rename from src/app/pages/auth/auth.component.scss
rename to src/app/pages/auth/auth-page.component.scss
diff --git a/src/app/pages/auth/signin/signin.component.spec.ts b/src/app/pages/auth/auth-page.component.spec.ts
similarity index 55%
rename from src/app/pages/auth/signin/signin.component.spec.ts
rename to src/app/pages/auth/auth-page.component.spec.ts
index c64b0b2..46c03ce 100644
--- a/src/app/pages/auth/signin/signin.component.spec.ts
+++ b/src/app/pages/auth/auth-page.component.spec.ts
@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { SigninComponent } from './signin.component';
+import { AuthPageComponent } from './auth-page.component';
 
-describe('SigninComponent', () => {
-  let component: SigninComponent;
-  let fixture: ComponentFixture<SigninComponent>;
+describe('AuthPageComponent', () => {
+  let component: AuthPageComponent;
+  let fixture: ComponentFixture<AuthPageComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ SigninComponent ]
+      declarations: [ AuthPageComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SigninComponent);
+    fixture = TestBed.createComponent(AuthPageComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/pages/auth/auth.component.ts b/src/app/pages/auth/auth-page.component.ts
similarity index 50%
rename from src/app/pages/auth/auth.component.ts
rename to src/app/pages/auth/auth-page.component.ts
index 70dd577..f977c1b 100644
--- a/src/app/pages/auth/auth.component.ts
+++ b/src/app/pages/auth/auth-page.component.ts
@@ -2,10 +2,10 @@ import { Component, OnInit } from '@angular/core';
 
 @Component({
   selector: 'of-pages-auth',
-  templateUrl: './auth.component.html',
-  styleUrls: ['./auth.component.scss']
+  templateUrl: './auth-page.component.html',
+  styleUrls: ['./auth-page.component.scss']
 })
-export class AuthComponent implements OnInit {
+export class AuthPageComponent implements OnInit {
 
   constructor() { }
 
diff --git a/src/app/pages/auth/auth-page.module.ts b/src/app/pages/auth/auth-page.module.ts
new file mode 100644
index 0000000..0e9d5a8
--- /dev/null
+++ b/src/app/pages/auth/auth-page.module.ts
@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { AuthPageComponent } from './auth-page.component';
+import { AuthPageRoutingModule } from './auth-page-routing.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    AuthPageRoutingModule,
+  ],
+  declarations: [
+    AuthPageComponent,
+  ]
+})
+export class AuthPageModule { }
diff --git a/src/app/pages/auth/auth-routing.module.ts b/src/app/pages/auth/auth-routing.module.ts
deleted file mode 100644
index 7de6a4d..0000000
--- a/src/app/pages/auth/auth-routing.module.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-import { AuthComponent } from './auth.component';
-import { SigninComponent } from './signin/signin.component';
-import { SignupComponent } from './signup/signup.component';
-import { ResetPasswordComponent } from './reset-password/reset-password.component';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: AuthComponent,
-    children: [
-      { path: '', redirectTo: 'signin' },
-      { path: 'signin', component: SigninComponent },
-      { path: 'signup', component: SignupComponent },
-      { path: 'reset-password', component: ResetPasswordComponent },
-    ]
-  }
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
-})
-export class AuthRoutingModule { }
diff --git a/src/app/pages/auth/auth.module.ts b/src/app/pages/auth/auth.module.ts
deleted file mode 100644
index 0711fa5..0000000
--- a/src/app/pages/auth/auth.module.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { AuthComponent } from './auth.component';
-import { AuthRoutingModule } from './auth-routing.module';
-import { SigninComponent } from './signin/signin.component';
-import { SignupComponent } from './signup/signup.component';
-import { ResetPasswordComponent } from './reset-password/reset-password.component';
-import { MemberModule } from 'app/packages/member/member.module';
-
-
-@NgModule({
-  imports: [
-    CommonModule,
-    AuthRoutingModule,
-    MemberModule
-  ],
-  declarations: [
-    AuthComponent,
-    SigninComponent,
-    SignupComponent,
-    ResetPasswordComponent,
-  ]
-})
-export class AuthModule { }
diff --git a/src/app/pages/auth/reset-password/reset-password-page-routing.module.ts b/src/app/pages/auth/reset-password/reset-password-page-routing.module.ts
new file mode 100644
index 0000000..a4410fa
--- /dev/null
+++ b/src/app/pages/auth/reset-password/reset-password-page-routing.module.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { ResetPasswordPageComponent } from './reset-password-page.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ResetPasswordPageComponent,
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class ResetPasswordPageRoutingModule { }
diff --git a/src/app/pages/auth/reset-password/reset-password.component.html b/src/app/pages/auth/reset-password/reset-password-page.component.html
similarity index 100%
rename from src/app/pages/auth/reset-password/reset-password.component.html
rename to src/app/pages/auth/reset-password/reset-password-page.component.html
diff --git a/src/app/pages/auth/reset-password/reset-password.component.scss b/src/app/pages/auth/reset-password/reset-password-page.component.scss
similarity index 100%
rename from src/app/pages/auth/reset-password/reset-password.component.scss
rename to src/app/pages/auth/reset-password/reset-password-page.component.scss
diff --git a/src/app/pages/auth/reset-password/reset-password.component.spec.ts b/src/app/pages/auth/reset-password/reset-password-page.component.spec.ts
similarity index 50%
rename from src/app/pages/auth/reset-password/reset-password.component.spec.ts
rename to src/app/pages/auth/reset-password/reset-password-page.component.spec.ts
index 3f03471..01b6aeb 100644
--- a/src/app/pages/auth/reset-password/reset-password.component.spec.ts
+++ b/src/app/pages/auth/reset-password/reset-password-page.component.spec.ts
@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { ResetPasswordComponent } from './reset-password.component';
+import { ResetPasswordPageComponent } from './reset-password-page.component';
 
-describe('ResetPasswordComponent', () => {
-  let component: ResetPasswordComponent;
-  let fixture: ComponentFixture<ResetPasswordComponent>;
+describe('ResetPasswordPageComponent', () => {
+  let component: ResetPasswordPageComponent;
+  let fixture: ComponentFixture<ResetPasswordPageComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ ResetPasswordComponent ]
+      declarations: [ ResetPasswordPageComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(ResetPasswordComponent);
+    fixture = TestBed.createComponent(ResetPasswordPageComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/pages/auth/reset-password/reset-password-page.component.ts b/src/app/pages/auth/reset-password/reset-password-page.component.ts
new file mode 100644
index 0000000..6f8f2b9
--- /dev/null
+++ b/src/app/pages/auth/reset-password/reset-password-page.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'of-pages-auth-reset-password',
+  templateUrl: './reset-password-page.component.html',
+  styleUrls: ['./reset-password-page.component.scss']
+})
+export class ResetPasswordPageComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/src/app/pages/auth/reset-password/reset-password-page.module.ts b/src/app/pages/auth/reset-password/reset-password-page.module.ts
new file mode 100644
index 0000000..5a4c0f6
--- /dev/null
+++ b/src/app/pages/auth/reset-password/reset-password-page.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ResetPasswordPageRoutingModule } from './reset-password-page-routing.module';
+import { ResetPasswordPageComponent } from './reset-password-page.component';
+import { ResetPasswordModule } from 'app/packages/member/components/reset-password/reset-password.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    ResetPasswordPageRoutingModule,
+    ResetPasswordModule
+  ],
+  declarations: [
+    ResetPasswordPageComponent,
+  ]
+})
+export class ResetPasswordPageModule { }
diff --git a/src/app/pages/auth/reset-password/reset-password.component.ts b/src/app/pages/auth/reset-password/reset-password.component.ts
deleted file mode 100644
index 2441acb..0000000
--- a/src/app/pages/auth/reset-password/reset-password.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'of-pages-auth-reset-password',
-  templateUrl: './reset-password.component.html',
-  styleUrls: ['./reset-password.component.scss']
-})
-export class ResetPasswordComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}
diff --git a/src/app/pages/auth/signin/signin-page-routing.module.ts b/src/app/pages/auth/signin/signin-page-routing.module.ts
new file mode 100644
index 0000000..12fe211
--- /dev/null
+++ b/src/app/pages/auth/signin/signin-page-routing.module.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { SigninPageComponent } from './signin-page.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: SigninPageComponent,
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class SigninPageRoutingModule { }
diff --git a/src/app/pages/auth/signin/signin.component.html b/src/app/pages/auth/signin/signin-page.component.html
similarity index 100%
rename from src/app/pages/auth/signin/signin.component.html
rename to src/app/pages/auth/signin/signin-page.component.html
diff --git a/src/app/pages/auth/signin/signin.component.scss b/src/app/pages/auth/signin/signin-page.component.scss
similarity index 100%
rename from src/app/pages/auth/signin/signin.component.scss
rename to src/app/pages/auth/signin/signin-page.component.scss
diff --git a/src/app/pages/auth/signin/signin-page.component.spec.ts b/src/app/pages/auth/signin/signin-page.component.spec.ts
new file mode 100644
index 0000000..3848731
--- /dev/null
+++ b/src/app/pages/auth/signin/signin-page.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SigninPageComponent } from './signin-page.component';
+
+describe('SigninPageComponent', () => {
+  let component: SigninPageComponent;
+  let fixture: ComponentFixture<SigninPageComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ SigninPageComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SigninPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/pages/auth/signin/signin.component.ts b/src/app/pages/auth/signin/signin-page.component.ts
similarity index 80%
rename from src/app/pages/auth/signin/signin.component.ts
rename to src/app/pages/auth/signin/signin-page.component.ts
index 8e3591b..4e1f7a8 100644
--- a/src/app/pages/auth/signin/signin.component.ts
+++ b/src/app/pages/auth/signin/signin-page.component.ts
@@ -6,10 +6,10 @@ import { ErrorStateMatcher } from '@angular/material/core';
 
 @Component({
   selector: 'of-pages-auth-signin',
-  templateUrl: './signin.component.html',
-  styleUrls: ['./signin.component.scss'],
+  templateUrl: './signin-page.component.html',
+  styleUrls: ['./signin-page.component.scss'],
 })
-export class SigninComponent implements OnInit {
+export class SigninPageComponent implements OnInit {
 
   signInForm: FormGroup;
   returnURL: string;
diff --git a/src/app/pages/auth/signin/signin-page.module.ts b/src/app/pages/auth/signin/signin-page.module.ts
new file mode 100644
index 0000000..dcccaa6
--- /dev/null
+++ b/src/app/pages/auth/signin/signin-page.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SigninPageRoutingModule } from './signin-page-routing.module';
+import { SigninPageComponent } from './signin-page.component';
+import { SigninModule } from 'app/packages/member/components/signin/signin.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SigninPageRoutingModule,
+    SigninModule
+  ],
+  declarations: [
+    SigninPageComponent,
+  ]
+})
+export class SigninPageModule { }
diff --git a/src/app/pages/auth/signup/signup-page-routing.module.ts b/src/app/pages/auth/signup/signup-page-routing.module.ts
new file mode 100644
index 0000000..1f1f498
--- /dev/null
+++ b/src/app/pages/auth/signup/signup-page-routing.module.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { SignupPageComponent } from './signup-page.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: SignupPageComponent,
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class SignupPageRoutingModule { }
diff --git a/src/app/pages/auth/signup/signup.component.html b/src/app/pages/auth/signup/signup-page.component.html
similarity index 100%
rename from src/app/pages/auth/signup/signup.component.html
rename to src/app/pages/auth/signup/signup-page.component.html
diff --git a/src/app/pages/auth/signup/signup.component.scss b/src/app/pages/auth/signup/signup-page.component.scss
similarity index 100%
rename from src/app/pages/auth/signup/signup.component.scss
rename to src/app/pages/auth/signup/signup-page.component.scss
diff --git a/src/app/pages/auth/signup/signup-page.component.spec.ts b/src/app/pages/auth/signup/signup-page.component.spec.ts
new file mode 100644
index 0000000..963d8d2
--- /dev/null
+++ b/src/app/pages/auth/signup/signup-page.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SignupPageComponent } from './signup-page.component';
+
+describe('SignupPageComponent', () => {
+  let component: SignupPageComponent;
+  let fixture: ComponentFixture<SignupPageComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ SignupPageComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SignupPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/pages/auth/signup/signup.component.ts b/src/app/pages/auth/signup/signup-page.component.ts
similarity index 50%
rename from src/app/pages/auth/signup/signup.component.ts
rename to src/app/pages/auth/signup/signup-page.component.ts
index 77690d7..cec6276 100644
--- a/src/app/pages/auth/signup/signup.component.ts
+++ b/src/app/pages/auth/signup/signup-page.component.ts
@@ -2,10 +2,10 @@ import { Component, OnInit } from '@angular/core';
 
 @Component({
   selector: 'of-pages-auth-signup',
-  templateUrl: './signup.component.html',
-  styleUrls: ['./signup.component.scss']
+  templateUrl: './signup-page.component.html',
+  styleUrls: ['./signup-page.component.scss']
 })
-export class SignupComponent implements OnInit {
+export class SignupPageComponent implements OnInit {
 
   constructor() { }
 
diff --git a/src/app/pages/auth/signup/signup-page.module.ts b/src/app/pages/auth/signup/signup-page.module.ts
new file mode 100644
index 0000000..2cb97a0
--- /dev/null
+++ b/src/app/pages/auth/signup/signup-page.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SignupPageRoutingModule } from './signup-page-routing.module';
+import { SignupPageComponent } from './signup-page.component';
+import { SignupModule } from 'app/packages/member/components/signup/signup.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SignupPageRoutingModule,
+    SignupModule
+  ],
+  declarations: [
+    SignupPageComponent,
+  ]
+})
+export class SignupPageModule { }
diff --git a/src/app/pages/home/home-routing.module.ts b/src/app/pages/errors/e404/e404-page-routing.module.ts
similarity index 64%
rename from src/app/pages/home/home-routing.module.ts
rename to src/app/pages/errors/e404/e404-page-routing.module.ts
index 3287662..3b1ecff 100644
--- a/src/app/pages/home/home-routing.module.ts
+++ b/src/app/pages/errors/e404/e404-page-routing.module.ts
@@ -1,11 +1,11 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
-import { HomeComponent } from './home.component';
+import { E404PageComponent } from './e404-page.component';
 
 const routes: Routes = [
   {
     path: '',
-    component: HomeComponent,
+    component: E404PageComponent,
   }
 ];
 
@@ -13,4 +13,4 @@ const routes: Routes = [
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
 })
-export class HomeRoutingModule { }
+export class E404PageRoutingModule { }
diff --git a/src/app/pages/errors/e404/e404.component.html b/src/app/pages/errors/e404/e404-page.component.html
similarity index 100%
rename from src/app/pages/errors/e404/e404.component.html
rename to src/app/pages/errors/e404/e404-page.component.html
diff --git a/src/app/pages/errors/e404/e404.component.scss b/src/app/pages/errors/e404/e404-page.component.scss
similarity index 100%
rename from src/app/pages/errors/e404/e404.component.scss
rename to src/app/pages/errors/e404/e404-page.component.scss
diff --git a/src/app/pages/errors/e404/e404.component.spec.ts b/src/app/pages/errors/e404/e404-page.component.spec.ts
similarity index 55%
rename from src/app/pages/errors/e404/e404.component.spec.ts
rename to src/app/pages/errors/e404/e404-page.component.spec.ts
index d8b4265..ea6a453 100644
--- a/src/app/pages/errors/e404/e404.component.spec.ts
+++ b/src/app/pages/errors/e404/e404-page.component.spec.ts
@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { E404Component } from './e404.component';
+import { E404PageComponent } from './e404-page.component';
 
-describe('E404Component', () => {
-  let component: E404Component;
-  let fixture: ComponentFixture<E404Component>;
+describe('E404PageComponent', () => {
+  let component: E404PageComponent;
+  let fixture: ComponentFixture<E404PageComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ E404Component ]
+      declarations: [ E404PageComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(E404Component);
+    fixture = TestBed.createComponent(E404PageComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/pages/errors/e404/e404.component.ts b/src/app/pages/errors/e404/e404-page.component.ts
similarity index 51%
rename from src/app/pages/errors/e404/e404.component.ts
rename to src/app/pages/errors/e404/e404-page.component.ts
index 09ac0a8..74e2b3b 100644
--- a/src/app/pages/errors/e404/e404.component.ts
+++ b/src/app/pages/errors/e404/e404-page.component.ts
@@ -2,10 +2,10 @@ import { Component, OnInit } from '@angular/core';
 
 @Component({
   selector: 'of-pages-errors-e404',
-  templateUrl: './e404.component.html',
-  styleUrls: ['./e404.component.scss']
+  templateUrl: './e404-page.component.html',
+  styleUrls: ['./e404-page.component.scss']
 })
-export class E404Component implements OnInit {
+export class E404PageComponent implements OnInit {
 
   constructor() { }
 
diff --git a/src/app/pages/errors/e404/e404-page.module.ts b/src/app/pages/errors/e404/e404-page.module.ts
new file mode 100644
index 0000000..7af3f48
--- /dev/null
+++ b/src/app/pages/errors/e404/e404-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { E404PageComponent } from './e404-page.component';
+import { E404PageRoutingModule } from './e404-page-routing.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    E404PageRoutingModule
+  ],
+  declarations: [E404PageComponent]
+})
+export class E404PageModule { }
diff --git a/src/app/pages/errors/e500/e500-page-routing.module.ts b/src/app/pages/errors/e500/e500-page-routing.module.ts
new file mode 100644
index 0000000..cd10b06
--- /dev/null
+++ b/src/app/pages/errors/e500/e500-page-routing.module.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { E500PageComponent } from './e500-page.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: E500PageComponent,
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class E500PageRoutingModule { }
diff --git a/src/app/pages/errors/e500/e500.component.html b/src/app/pages/errors/e500/e500-page.component.html
similarity index 100%
rename from src/app/pages/errors/e500/e500.component.html
rename to src/app/pages/errors/e500/e500-page.component.html
diff --git a/src/app/pages/errors/e500/e500.component.scss b/src/app/pages/errors/e500/e500-page.component.scss
similarity index 100%
rename from src/app/pages/errors/e500/e500.component.scss
rename to src/app/pages/errors/e500/e500-page.component.scss
diff --git a/src/app/pages/auth/auth.component.spec.ts b/src/app/pages/errors/e500/e500-page.component.spec.ts
similarity index 55%
rename from src/app/pages/auth/auth.component.spec.ts
rename to src/app/pages/errors/e500/e500-page.component.spec.ts
index 884576c..60a42aa 100644
--- a/src/app/pages/auth/auth.component.spec.ts
+++ b/src/app/pages/errors/e500/e500-page.component.spec.ts
@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { AuthComponent } from './auth.component';
+import { E500PageComponent } from './e500-page.component';
 
-describe('AuthComponent', () => {
-  let component: AuthComponent;
-  let fixture: ComponentFixture<AuthComponent>;
+describe('E500PageComponent', () => {
+  let component: E500PageComponent;
+  let fixture: ComponentFixture<E500PageComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ AuthComponent ]
+      declarations: [ E500PageComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(AuthComponent);
+    fixture = TestBed.createComponent(E500PageComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/pages/errors/e500/e500.component.ts b/src/app/pages/errors/e500/e500-page.component.ts
similarity index 51%
rename from src/app/pages/errors/e500/e500.component.ts
rename to src/app/pages/errors/e500/e500-page.component.ts
index 4330cfe..abd7e2e 100644
--- a/src/app/pages/errors/e500/e500.component.ts
+++ b/src/app/pages/errors/e500/e500-page.component.ts
@@ -2,10 +2,10 @@ import { Component, OnInit } from '@angular/core';
 
 @Component({
   selector: 'of-pages-errors-e500',
-  templateUrl: './e500.component.html',
-  styleUrls: ['./e500.component.scss']
+  templateUrl: './e500-page.component.html',
+  styleUrls: ['./e500-page.component.scss']
 })
-export class E500Component implements OnInit {
+export class E500PageComponent implements OnInit {
 
   constructor() { }
 
diff --git a/src/app/pages/errors/e500/e500-page.module.ts b/src/app/pages/errors/e500/e500-page.module.ts
new file mode 100644
index 0000000..f8b4dfd
--- /dev/null
+++ b/src/app/pages/errors/e500/e500-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { E500PageComponent } from './e500-page.component';
+import { E500PageRoutingModule } from './e500-page-routing.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    E500PageRoutingModule
+  ],
+  declarations: [E500PageComponent]
+})
+export class E500PageModule { }
diff --git a/src/app/pages/errors/e500/e500.component.spec.ts b/src/app/pages/errors/e500/e500.component.spec.ts
deleted file mode 100644
index 341a53f..0000000
--- a/src/app/pages/errors/e500/e500.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { E500Component } from './e500.component';
-
-describe('E500Component', () => {
-  let component: E500Component;
-  let fixture: ComponentFixture<E500Component>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ E500Component ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(E500Component);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/pages/errors/errors-page-routing.module.ts b/src/app/pages/errors/errors-page-routing.module.ts
new file mode 100644
index 0000000..073b5aa
--- /dev/null
+++ b/src/app/pages/errors/errors-page-routing.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { ErrorsPageComponent } from './errors-page.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ErrorsPageComponent,
+    children: [
+      { path: '404', loadChildren: './e404/e404-page.module#E404PageModule' },
+      { path: '500', loadChildren: './e500/e500-page.module#E500PageModule' },
+    ]
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class ErrorsPageRoutingModule { }
diff --git a/src/app/pages/errors/errors.component.html b/src/app/pages/errors/errors-page.component.html
similarity index 100%
rename from src/app/pages/errors/errors.component.html
rename to src/app/pages/errors/errors-page.component.html
diff --git a/src/app/pages/errors/errors.component.scss b/src/app/pages/errors/errors-page.component.scss
similarity index 100%
rename from src/app/pages/errors/errors.component.scss
rename to src/app/pages/errors/errors-page.component.scss
diff --git a/src/app/pages/errors/errors-page.component.spec.ts b/src/app/pages/errors/errors-page.component.spec.ts
new file mode 100644
index 0000000..40e8cfc
--- /dev/null
+++ b/src/app/pages/errors/errors-page.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ErrorsPageComponent } from './errors-page.component';
+
+describe('ErrorsPageComponent', () => {
+  let component: ErrorsPageComponent;
+  let fixture: ComponentFixture<ErrorsPageComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ErrorsPageComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ErrorsPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/pages/errors/errors-page.component.ts b/src/app/pages/errors/errors-page.component.ts
new file mode 100644
index 0000000..0b48a55
--- /dev/null
+++ b/src/app/pages/errors/errors-page.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'of-pages-errors',
+  templateUrl: './errors-page.component.html',
+  styleUrls: ['./errors-page.component.scss']
+})
+export class ErrorsPageComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/src/app/pages/errors/errors-page.module.ts b/src/app/pages/errors/errors-page.module.ts
new file mode 100644
index 0000000..de560f2
--- /dev/null
+++ b/src/app/pages/errors/errors-page.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { ErrorsPageComponent } from './errors-page.component';
+import { ErrorsPageRoutingModule } from './errors-page-routing.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    ErrorsPageRoutingModule
+  ],
+  declarations: [ErrorsPageComponent]
+})
+export class ErrorsPageModule { }
diff --git a/src/app/pages/errors/errors-routing.module.ts b/src/app/pages/errors/errors-routing.module.ts
deleted file mode 100644
index 3178dd8..0000000
--- a/src/app/pages/errors/errors-routing.module.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-import { ErrorsComponent } from './errors.component';
-import { E404Component } from './e404/e404.component';
-import { E500Component } from './e500/e500.component';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: ErrorsComponent,
-    children: [
-      { path: '404', component: E404Component },
-      { path: '500', component: E500Component },
-    ]
-  }
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
-})
-export class ErrorsRoutingModule { }
diff --git a/src/app/pages/errors/errors.component.spec.ts b/src/app/pages/errors/errors.component.spec.ts
deleted file mode 100644
index c569cf7..0000000
--- a/src/app/pages/errors/errors.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ErrorsComponent } from './errors.component';
-
-describe('ErrorsComponent', () => {
-  let component: ErrorsComponent;
-  let fixture: ComponentFixture<ErrorsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ErrorsComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ErrorsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/pages/errors/errors.component.ts b/src/app/pages/errors/errors.component.ts
deleted file mode 100644
index 1e0b82c..0000000
--- a/src/app/pages/errors/errors.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'of-pages-errors',
-  templateUrl: './errors.component.html',
-  styleUrls: ['./errors.component.scss']
-})
-export class ErrorsComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}
diff --git a/src/app/pages/errors/errors.module.ts b/src/app/pages/errors/errors.module.ts
deleted file mode 100644
index d776b71..0000000
--- a/src/app/pages/errors/errors.module.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-import { ErrorsComponent } from './errors.component';
-import { ErrorsRoutingModule } from './errors-routing.module';
-import { E500Component } from './e500/e500.component';
-import { E404Component } from './e404/e404.component';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    ErrorsRoutingModule
-  ],
-  declarations: [ErrorsComponent, E500Component, E404Component]
-})
-export class ErrorsModule { }
diff --git a/src/app/pages/home/home-page-routing.module.ts b/src/app/pages/home/home-page-routing.module.ts
new file mode 100644
index 0000000..126218e
--- /dev/null
+++ b/src/app/pages/home/home-page-routing.module.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { HomePageComponent } from './home-page.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: HomePageComponent,
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class HomePageRoutingModule { }
diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home-page.component.html
similarity index 100%
rename from src/app/pages/home/home.component.html
rename to src/app/pages/home/home-page.component.html
diff --git a/src/app/pages/home/home.component.scss b/src/app/pages/home/home-page.component.scss
similarity index 100%
rename from src/app/pages/home/home.component.scss
rename to src/app/pages/home/home-page.component.scss
diff --git a/src/app/pages/auth/signup/signup.component.spec.ts b/src/app/pages/home/home-page.component.spec.ts
similarity index 55%
rename from src/app/pages/auth/signup/signup.component.spec.ts
rename to src/app/pages/home/home-page.component.spec.ts
index 43e46a5..e180332 100644
--- a/src/app/pages/auth/signup/signup.component.spec.ts
+++ b/src/app/pages/home/home-page.component.spec.ts
@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { SignupComponent } from './signup.component';
+import { HomePageComponent } from './home-page.component';
 
-describe('SignupComponent', () => {
-  let component: SignupComponent;
-  let fixture: ComponentFixture<SignupComponent>;
+describe('HomePageComponent', () => {
+  let component: HomePageComponent;
+  let fixture: ComponentFixture<HomePageComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ SignupComponent ]
+      declarations: [ HomePageComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SignupComponent);
+    fixture = TestBed.createComponent(HomePageComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home-page.component.ts
similarity index 50%
rename from src/app/pages/home/home.component.ts
rename to src/app/pages/home/home-page.component.ts
index 7bbd14d..e9f6e3f 100644
--- a/src/app/pages/home/home.component.ts
+++ b/src/app/pages/home/home-page.component.ts
@@ -2,10 +2,10 @@ import { Component, OnInit } from '@angular/core';
 
 @Component({
   selector: 'of-pages-home',
-  templateUrl: './home.component.html',
-  styleUrls: ['./home.component.scss']
+  templateUrl: './home-page.component.html',
+  styleUrls: ['./home-page.component.scss']
 })
-export class HomeComponent implements OnInit {
+export class HomePageComponent implements OnInit {
 
   constructor() { }
 
diff --git a/src/app/pages/home/home-page.module.ts b/src/app/pages/home/home-page.module.ts
new file mode 100644
index 0000000..f6b58be
--- /dev/null
+++ b/src/app/pages/home/home-page.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { HomePageComponent } from './home-page.component';
+import { HomePageRoutingModule } from './home-page-routing.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    HomePageRoutingModule,
+  ],
+  declarations: [HomePageComponent]
+})
+export class HomePageModule { }
diff --git a/src/app/pages/home/home.component.spec.ts b/src/app/pages/home/home.component.spec.ts
deleted file mode 100644
index 490e81b..0000000
--- a/src/app/pages/home/home.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HomeComponent } from './home.component';
-
-describe('HomeComponent', () => {
-  let component: HomeComponent;
-  let fixture: ComponentFixture<HomeComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ HomeComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(HomeComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/pages/home/home.module.ts b/src/app/pages/home/home.module.ts
deleted file mode 100644
index 1c9d217..0000000
--- a/src/app/pages/home/home.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { HomeComponent } from './home.component';
-import { HomeRoutingModule } from './home-routing.module';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    HomeRoutingModule,
-  ],
-  declarations: [HomeComponent]
-})
-export class HomeModule { }
diff --git a/src/app/pages/pages-routing.module.ts b/src/app/pages/pages-routing.module.ts
index 357efa8..6e8eed5 100644
--- a/src/app/pages/pages-routing.module.ts
+++ b/src/app/pages/pages-routing.module.ts
@@ -8,7 +8,7 @@ const routes: Routes = [
     component: PagesComponent,
     children: [
       { path: '', redirectTo: 'home' },
-      { path: 'home', loadChildren: './home/home.module#HomeModule' },
+      { path: 'home', loadChildren: './home/home-page.module#HomePageModule' },
     ]
   }
 ];