diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 4e4a82b..f3dfff8 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -2,11 +2,11 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { CheckStatusComponent } from './widgets/check-status/check-status.component';
 import { CreateCommitteeComponent } from './widgets/create-committee/create-committee.component';
-import { EServicesComponent } from './components/e-services/e-services.component';
-import { LoginComponent } from './components/login/login.component';
+import { EServicesComponent } from './pages/e-services/e-services.component';
+import { LoginComponent } from './pages/login/login.component';
 import { MockComponent } from './widgets/mock/mock.component';
-import { RegisterBusinessComponent } from './components/register-business/register-business.component';
-import { TabsComponent } from './tabs/tabs.component';
+import { RegisterBusinessComponent } from './pages/register-business/register-business.component';
+import { TabsComponent } from './layout/tabs/tabs.component';
 
 const routes: Routes = [
     { path: '', pathMatch: 'full', redirectTo: 'login' },
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 15f33ab..7243e3c 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -3,13 +3,13 @@ import { BrowserModule } from '@angular/platform-browser';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
-import { LoginComponent } from './components/login/login.component';
-import { TabsComponent } from './tabs/tabs.component';
-import { RegisterBusinessComponent } from './components/register-business/register-business.component';
+import { LoginComponent } from './pages/login/login.component';
+import { TabsComponent } from './layout/tabs/tabs.component';
+import { RegisterBusinessComponent } from './pages/register-business/register-business.component';
 import { FormsModule } from '@angular/forms';
 import { MockComponent } from './widgets/mock/mock.component';
-import { EServicesComponent } from './components/e-services/e-services.component';
-import { NotificationsComponent } from './components/notifications/notifications.component';
+import { EServicesComponent } from './pages/e-services/e-services.component';
+import { NotificationsComponent } from './layout/notifications/notifications.component';
 import { CreateCommitteeComponent } from './widgets/create-committee/create-committee.component';
 import { CheckStatusComponent } from './widgets/check-status/check-status.component';
 import { TableComponent } from './widgets/table/table.component';
diff --git a/src/app/components/notifications/notifications.component.html b/src/app/layout/notifications/notifications.component.html
similarity index 100%
rename from src/app/components/notifications/notifications.component.html
rename to src/app/layout/notifications/notifications.component.html
diff --git a/src/app/components/notifications/notifications.component.scss b/src/app/layout/notifications/notifications.component.scss
similarity index 100%
rename from src/app/components/notifications/notifications.component.scss
rename to src/app/layout/notifications/notifications.component.scss
diff --git a/src/app/components/notifications/notifications.component.spec.ts b/src/app/layout/notifications/notifications.component.spec.ts
similarity index 100%
rename from src/app/components/notifications/notifications.component.spec.ts
rename to src/app/layout/notifications/notifications.component.spec.ts
diff --git a/src/app/components/notifications/notifications.component.ts b/src/app/layout/notifications/notifications.component.ts
similarity index 100%
rename from src/app/components/notifications/notifications.component.ts
rename to src/app/layout/notifications/notifications.component.ts
diff --git a/src/app/tabs/tabs.component.html b/src/app/layout/tabs/tabs.component.html
similarity index 100%
rename from src/app/tabs/tabs.component.html
rename to src/app/layout/tabs/tabs.component.html
diff --git a/src/app/tabs/tabs.component.scss b/src/app/layout/tabs/tabs.component.scss
similarity index 100%
rename from src/app/tabs/tabs.component.scss
rename to src/app/layout/tabs/tabs.component.scss
diff --git a/src/app/tabs/tabs.component.spec.ts b/src/app/layout/tabs/tabs.component.spec.ts
similarity index 100%
rename from src/app/tabs/tabs.component.spec.ts
rename to src/app/layout/tabs/tabs.component.spec.ts
diff --git a/src/app/tabs/tabs.component.ts b/src/app/layout/tabs/tabs.component.ts
similarity index 100%
rename from src/app/tabs/tabs.component.ts
rename to src/app/layout/tabs/tabs.component.ts
diff --git a/src/app/components/e-services/e-services.component.html b/src/app/pages/e-services/e-services.component.html
similarity index 100%
rename from src/app/components/e-services/e-services.component.html
rename to src/app/pages/e-services/e-services.component.html
diff --git a/src/app/components/e-services/e-services.component.scss b/src/app/pages/e-services/e-services.component.scss
similarity index 100%
rename from src/app/components/e-services/e-services.component.scss
rename to src/app/pages/e-services/e-services.component.scss
diff --git a/src/app/components/e-services/e-services.component.spec.ts b/src/app/pages/e-services/e-services.component.spec.ts
similarity index 100%
rename from src/app/components/e-services/e-services.component.spec.ts
rename to src/app/pages/e-services/e-services.component.spec.ts
diff --git a/src/app/components/e-services/e-services.component.ts b/src/app/pages/e-services/e-services.component.ts
similarity index 100%
rename from src/app/components/e-services/e-services.component.ts
rename to src/app/pages/e-services/e-services.component.ts
diff --git a/src/app/components/login/login.component.html b/src/app/pages/login/login.component.html
similarity index 100%
rename from src/app/components/login/login.component.html
rename to src/app/pages/login/login.component.html
diff --git a/src/app/components/login/login.component.scss b/src/app/pages/login/login.component.scss
similarity index 100%
rename from src/app/components/login/login.component.scss
rename to src/app/pages/login/login.component.scss
diff --git a/src/app/components/login/login.component.spec.ts b/src/app/pages/login/login.component.spec.ts
similarity index 100%
rename from src/app/components/login/login.component.spec.ts
rename to src/app/pages/login/login.component.spec.ts
diff --git a/src/app/components/login/login.component.ts b/src/app/pages/login/login.component.ts
similarity index 100%
rename from src/app/components/login/login.component.ts
rename to src/app/pages/login/login.component.ts
diff --git a/src/app/components/register-business/register-business.component.html b/src/app/pages/register-business/register-business.component.html
similarity index 100%
rename from src/app/components/register-business/register-business.component.html
rename to src/app/pages/register-business/register-business.component.html
diff --git a/src/app/components/register-business/register-business.component.scss b/src/app/pages/register-business/register-business.component.scss
similarity index 100%
rename from src/app/components/register-business/register-business.component.scss
rename to src/app/pages/register-business/register-business.component.scss
diff --git a/src/app/components/register-business/register-business.component.spec.ts b/src/app/pages/register-business/register-business.component.spec.ts
similarity index 100%
rename from src/app/components/register-business/register-business.component.spec.ts
rename to src/app/pages/register-business/register-business.component.spec.ts
diff --git a/src/app/components/register-business/register-business.component.ts b/src/app/pages/register-business/register-business.component.ts
similarity index 100%
rename from src/app/components/register-business/register-business.component.ts
rename to src/app/pages/register-business/register-business.component.ts