diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 55ee4a1..4e4a82b 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,11 +1,11 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { CheckStatusComponent } from './check-status/check-status.component';
-import { CreateCommitteeComponent } from './create-committee/create-committee.component';
-import { EServicesComponent } from './e-services/e-services.component';
-import { LoginComponent } from './login/login.component';
-import { MockComponent } from './mock/mock.component';
-import { RegisterBusinessComponent } from './register-business/register-business.component';
+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 { MockComponent } from './widgets/mock/mock.component';
+import { RegisterBusinessComponent } from './components/register-business/register-business.component';
 import { TabsComponent } from './tabs/tabs.component';
 
 const routes: Routes = [
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 176adc0..15f33ab 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -3,18 +3,18 @@ import { BrowserModule } from '@angular/platform-browser';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
-import { LoginComponent } from './login/login.component';
+import { LoginComponent } from './components/login/login.component';
 import { TabsComponent } from './tabs/tabs.component';
-import { RegisterBusinessComponent } from './register-business/register-business.component';
+import { RegisterBusinessComponent } from './components/register-business/register-business.component';
 import { FormsModule } from '@angular/forms';
-import { MockComponent } from './mock/mock.component';
-import { EServicesComponent } from './e-services/e-services.component';
-import { NotificationsComponent } from './notifications/notifications.component';
-import { CreateCommitteeComponent } from './create-committee/create-committee.component';
-import { CheckStatusComponent } from './check-status/check-status.component';
-import { TableComponent } from './table/table.component';
-import { KeyValueHolderComponent } from './key-value-holder/key-value-holder.component';
-import { DownloadButtonComponent } from './download-button/download-button.component';
+import { MockComponent } from './widgets/mock/mock.component';
+import { EServicesComponent } from './components/e-services/e-services.component';
+import { NotificationsComponent } from './components/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';
+import { KeyValueHolderComponent } from './widgets/key-value-holder/key-value-holder.component';
+import { DownloadButtonComponent } from './widgets/download-button/download-button.component';
 
 @NgModule({
   declarations: [
diff --git a/src/app/e-services/e-services.component.html b/src/app/components/e-services/e-services.component.html
similarity index 100%
rename from src/app/e-services/e-services.component.html
rename to src/app/components/e-services/e-services.component.html
diff --git a/src/app/e-services/e-services.component.scss b/src/app/components/e-services/e-services.component.scss
similarity index 100%
rename from src/app/e-services/e-services.component.scss
rename to src/app/components/e-services/e-services.component.scss
diff --git a/src/app/e-services/e-services.component.spec.ts b/src/app/components/e-services/e-services.component.spec.ts
similarity index 100%
rename from src/app/e-services/e-services.component.spec.ts
rename to src/app/components/e-services/e-services.component.spec.ts
diff --git a/src/app/e-services/e-services.component.ts b/src/app/components/e-services/e-services.component.ts
similarity index 100%
rename from src/app/e-services/e-services.component.ts
rename to src/app/components/e-services/e-services.component.ts
diff --git a/src/app/login/login.component.html b/src/app/components/login/login.component.html
similarity index 100%
rename from src/app/login/login.component.html
rename to src/app/components/login/login.component.html
diff --git a/src/app/login/login.component.scss b/src/app/components/login/login.component.scss
similarity index 100%
rename from src/app/login/login.component.scss
rename to src/app/components/login/login.component.scss
diff --git a/src/app/login/login.component.spec.ts b/src/app/components/login/login.component.spec.ts
similarity index 100%
rename from src/app/login/login.component.spec.ts
rename to src/app/components/login/login.component.spec.ts
diff --git a/src/app/login/login.component.ts b/src/app/components/login/login.component.ts
similarity index 100%
rename from src/app/login/login.component.ts
rename to src/app/components/login/login.component.ts
diff --git a/src/app/notifications/notifications.component.html b/src/app/components/notifications/notifications.component.html
similarity index 100%
rename from src/app/notifications/notifications.component.html
rename to src/app/components/notifications/notifications.component.html
diff --git a/src/app/notifications/notifications.component.scss b/src/app/components/notifications/notifications.component.scss
similarity index 100%
rename from src/app/notifications/notifications.component.scss
rename to src/app/components/notifications/notifications.component.scss
diff --git a/src/app/notifications/notifications.component.spec.ts b/src/app/components/notifications/notifications.component.spec.ts
similarity index 100%
rename from src/app/notifications/notifications.component.spec.ts
rename to src/app/components/notifications/notifications.component.spec.ts
diff --git a/src/app/notifications/notifications.component.ts b/src/app/components/notifications/notifications.component.ts
similarity index 100%
rename from src/app/notifications/notifications.component.ts
rename to src/app/components/notifications/notifications.component.ts
diff --git a/src/app/register-business/register-business.component.html b/src/app/components/register-business/register-business.component.html
similarity index 100%
rename from src/app/register-business/register-business.component.html
rename to src/app/components/register-business/register-business.component.html
diff --git a/src/app/register-business/register-business.component.scss b/src/app/components/register-business/register-business.component.scss
similarity index 100%
rename from src/app/register-business/register-business.component.scss
rename to src/app/components/register-business/register-business.component.scss
diff --git a/src/app/register-business/register-business.component.spec.ts b/src/app/components/register-business/register-business.component.spec.ts
similarity index 100%
rename from src/app/register-business/register-business.component.spec.ts
rename to src/app/components/register-business/register-business.component.spec.ts
diff --git a/src/app/register-business/register-business.component.ts b/src/app/components/register-business/register-business.component.ts
similarity index 100%
rename from src/app/register-business/register-business.component.ts
rename to src/app/components/register-business/register-business.component.ts
diff --git a/src/app/tabs/tabs.component.html b/src/app/tabs/tabs.component.html
index b4d3a2c..4a7319b 100644
--- a/src/app/tabs/tabs.component.html
+++ b/src/app/tabs/tabs.component.html
@@ -5,8 +5,8 @@
     
     <nav>
         <a [routerLink]="['/tabs/e-services']"> E-Services </a>
-        <a [routerLink]="['/tabs/create-committee']"> Create Committee </a>
-        <a [routerLink]="['/tabs/check-status']"> Application Status </a>
+        <!-- <a [routerLink]="['/tabs/create-committee']"> Create Committee </a>
+        <a [routerLink]="['/tabs/check-status']"> Application Status </a> -->
     </nav>
 
     <div class="search-input">
diff --git a/src/app/check-status/check-status.component.html b/src/app/widgets/check-status/check-status.component.html
similarity index 100%
rename from src/app/check-status/check-status.component.html
rename to src/app/widgets/check-status/check-status.component.html
diff --git a/src/app/check-status/check-status.component.scss b/src/app/widgets/check-status/check-status.component.scss
similarity index 100%
rename from src/app/check-status/check-status.component.scss
rename to src/app/widgets/check-status/check-status.component.scss
diff --git a/src/app/check-status/check-status.component.spec.ts b/src/app/widgets/check-status/check-status.component.spec.ts
similarity index 100%
rename from src/app/check-status/check-status.component.spec.ts
rename to src/app/widgets/check-status/check-status.component.spec.ts
diff --git a/src/app/check-status/check-status.component.ts b/src/app/widgets/check-status/check-status.component.ts
similarity index 100%
rename from src/app/check-status/check-status.component.ts
rename to src/app/widgets/check-status/check-status.component.ts
diff --git a/src/app/create-committee/create-committee.component.html b/src/app/widgets/create-committee/create-committee.component.html
similarity index 100%
rename from src/app/create-committee/create-committee.component.html
rename to src/app/widgets/create-committee/create-committee.component.html
diff --git a/src/app/create-committee/create-committee.component.scss b/src/app/widgets/create-committee/create-committee.component.scss
similarity index 100%
rename from src/app/create-committee/create-committee.component.scss
rename to src/app/widgets/create-committee/create-committee.component.scss
diff --git a/src/app/create-committee/create-committee.component.spec.ts b/src/app/widgets/create-committee/create-committee.component.spec.ts
similarity index 100%
rename from src/app/create-committee/create-committee.component.spec.ts
rename to src/app/widgets/create-committee/create-committee.component.spec.ts
diff --git a/src/app/create-committee/create-committee.component.ts b/src/app/widgets/create-committee/create-committee.component.ts
similarity index 100%
rename from src/app/create-committee/create-committee.component.ts
rename to src/app/widgets/create-committee/create-committee.component.ts
diff --git a/src/app/download-button/download-button.component.html b/src/app/widgets/download-button/download-button.component.html
similarity index 100%
rename from src/app/download-button/download-button.component.html
rename to src/app/widgets/download-button/download-button.component.html
diff --git a/src/app/download-button/download-button.component.scss b/src/app/widgets/download-button/download-button.component.scss
similarity index 100%
rename from src/app/download-button/download-button.component.scss
rename to src/app/widgets/download-button/download-button.component.scss
diff --git a/src/app/download-button/download-button.component.spec.ts b/src/app/widgets/download-button/download-button.component.spec.ts
similarity index 100%
rename from src/app/download-button/download-button.component.spec.ts
rename to src/app/widgets/download-button/download-button.component.spec.ts
diff --git a/src/app/download-button/download-button.component.ts b/src/app/widgets/download-button/download-button.component.ts
similarity index 100%
rename from src/app/download-button/download-button.component.ts
rename to src/app/widgets/download-button/download-button.component.ts
diff --git a/src/app/key-value-holder/key-value-holder.component.html b/src/app/widgets/key-value-holder/key-value-holder.component.html
similarity index 100%
rename from src/app/key-value-holder/key-value-holder.component.html
rename to src/app/widgets/key-value-holder/key-value-holder.component.html
diff --git a/src/app/key-value-holder/key-value-holder.component.scss b/src/app/widgets/key-value-holder/key-value-holder.component.scss
similarity index 100%
rename from src/app/key-value-holder/key-value-holder.component.scss
rename to src/app/widgets/key-value-holder/key-value-holder.component.scss
diff --git a/src/app/key-value-holder/key-value-holder.component.spec.ts b/src/app/widgets/key-value-holder/key-value-holder.component.spec.ts
similarity index 100%
rename from src/app/key-value-holder/key-value-holder.component.spec.ts
rename to src/app/widgets/key-value-holder/key-value-holder.component.spec.ts
diff --git a/src/app/key-value-holder/key-value-holder.component.ts b/src/app/widgets/key-value-holder/key-value-holder.component.ts
similarity index 100%
rename from src/app/key-value-holder/key-value-holder.component.ts
rename to src/app/widgets/key-value-holder/key-value-holder.component.ts
diff --git a/src/app/mock/mock.component.html b/src/app/widgets/mock/mock.component.html
similarity index 100%
rename from src/app/mock/mock.component.html
rename to src/app/widgets/mock/mock.component.html
diff --git a/src/app/mock/mock.component.scss b/src/app/widgets/mock/mock.component.scss
similarity index 100%
rename from src/app/mock/mock.component.scss
rename to src/app/widgets/mock/mock.component.scss
diff --git a/src/app/mock/mock.component.spec.ts b/src/app/widgets/mock/mock.component.spec.ts
similarity index 100%
rename from src/app/mock/mock.component.spec.ts
rename to src/app/widgets/mock/mock.component.spec.ts
diff --git a/src/app/mock/mock.component.ts b/src/app/widgets/mock/mock.component.ts
similarity index 100%
rename from src/app/mock/mock.component.ts
rename to src/app/widgets/mock/mock.component.ts
diff --git a/src/app/table/table.component.html b/src/app/widgets/table/table.component.html
similarity index 100%
rename from src/app/table/table.component.html
rename to src/app/widgets/table/table.component.html
diff --git a/src/app/table/table.component.scss b/src/app/widgets/table/table.component.scss
similarity index 100%
rename from src/app/table/table.component.scss
rename to src/app/widgets/table/table.component.scss
diff --git a/src/app/table/table.component.spec.ts b/src/app/widgets/table/table.component.spec.ts
similarity index 100%
rename from src/app/table/table.component.spec.ts
rename to src/app/widgets/table/table.component.spec.ts
diff --git a/src/app/table/table.component.ts b/src/app/widgets/table/table.component.ts
similarity index 100%
rename from src/app/table/table.component.ts
rename to src/app/widgets/table/table.component.ts