feat: change the structure of the project

Change-Id: I68dc566780aa26f7d4de7488705adcb3fec2f782
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
Issue-ID: DCAEGEN2-1671

131 files changed, 399 insertions, 108 deletions

diff --git a/components/datalake-handler/admin/src/README.md b/components/datalake-handler/admin/src/README.md
index 8b137891..7f3764cf 100644
--- a/components/datalake-handler/admin/src/README.md
+++ b/components/datalake-handler/admin/src/README.md
@@ -1 +1,45 @@
 
+
+
+### Directory Layout
+ The source code layout is as follow:
+ -- app
+    -- shared           -----> container of pubilc parts
+        -- components          -----> container of pubilc components
+            -- alert
+            -- toastr-notification
+            -- ...more components
+        -- modules             -----> container of public business modules
+            -- card
+            -- modal
+            -- search
+            -- table
+        -- layout              -----> container of basic layout of all pages
+            -- header
+            -- sidebar
+        -- utils               -----> container of general functions
+    -- core             -----> container of core functions
+        -- models
+        -- services
+    -- views            -----> container of all business pages
+        -- about
+        -- dashboard-setting
+        -- database
+        -- feeder
+        -- topics
+        -- ...more modules
+    -- app-routing.module.ts     -----> container of all pages routers
+    -- app-component.css
+    -- app-component.html
+    -- app-component.ts
+    -- app-module.ts
+ -- assets
+    -- i18n
+ -- index.html
+ -- main.ts
+ -- styles.css
+ -- ...other config documents
+
+> The layout is used for organizing a new module, **PLEASE** take care of the difference between ```components``` and ``` modules```. Make sure that all parts added in the ``` components``` are ``` dump components``` and all the parts which are related to the **business** should be added in the ``` modules```. Good luck 🙂.
+
+> The service folder is used for created some reused services. **PLEASE** put the specific services into the related folders. For example, put the toastr-notification service into the ```components/toastr-notification``` folder. 
diff --git a/components/datalake-handler/admin/src/src/app/app-routing.module.ts b/components/datalake-handler/admin/src/src/app/app-routing.module.ts
index 37ed0401..e96f5d17 100644
--- a/components/datalake-handler/admin/src/src/app/app-routing.module.ts
+++ b/components/datalake-handler/admin/src/src/app/app-routing.module.ts
@@ -27,22 +27,26 @@
 import { NgModule } from "@angular/core";
 import { Routes, RouterModule } from "@angular/router";
 
-import { FeederComponent } from "./feeder/feeder.component";
-import { TopicsComponent } from "./topics/topics.component";
-import { DatabaseComponent } from "./database/database.component";
-import { AboutComponent } from "./about/about.component";
-import { DashboardSettingComponent } from './dashboard-setting/dashboard-setting.component';
-import { DashboardListComponent } from './dashboard-setting/dashboard-list/dashboard-list.component';
-import { TemplateComponent } from './dashboard-setting/template/template.component';
+//test components for module testing
+import { TestComponent } from './views/test/test.component';
+
+import { FeederComponent } from "./views/feeder/feeder.component";
+import { TopicsComponent } from "./views/topics/topics.component";
+import { DatabaseComponent } from "./views/database/database.component";
+import { AboutComponent } from "./views/about/about.component";
+import { DashboardSettingComponent } from './views/dashboard-setting/dashboard-setting.component';
+import { DashboardListComponent } from './views/dashboard-setting/dashboard-list/dashboard-list.component';
+import { TemplateComponent } from './views/dashboard-setting/template/template.component';
 
 const routes: Routes = [
   { path: "", redirectTo: "/feeder", pathMatch: "full" },
+  { path: "test", component: TestComponent },
   { path: "feeder", component: FeederComponent },
   { path: "topics", component: TopicsComponent },
   { path: "database", component: DatabaseComponent },
   { path: "about", component: AboutComponent },
-  { path: 'dashboard-setting/dashboard-list', component: DashboardListComponent},
-  { path: 'dashboard-setting/template', component: TemplateComponent},
+  { path: 'dashboard-setting/dashboard-list', component: DashboardListComponent },
+  { path: 'dashboard-setting/template', component: TemplateComponent },
 ];
 
 @NgModule({
@@ -53,4 +57,4 @@ const routes: Routes = [
   ],
   exports: [RouterModule]
 })
-export class AppRoutingModule {}
+export class AppRoutingModule { }
diff --git a/components/datalake-handler/admin/src/src/app/app.component.html b/components/datalake-handler/admin/src/src/app/app.component.html
index d4f2c173..f6727cae 100644
--- a/components/datalake-handler/admin/src/src/app/app.component.html
+++ b/components/datalake-handler/admin/src/src/app/app.component.html
@@ -51,4 +51,4 @@ limitations under the License.
 
   <ngx-spinner bdOpacity=0.5 bdColor="rgba(51,51,51,0.85)" size="default" color="#5dbebb" type="ball-clip-rotate"
     [fullScreen]="true">
-  </ngx-spinner>
+  </ngx-spinner>
\ No newline at end of file
diff --git a/components/datalake-handler/admin/src/src/app/app.module.ts b/components/datalake-handler/admin/src/src/app/app.module.ts
index 1c73cfd2..ecab9a7b 100644
--- a/components/datalake-handler/admin/src/src/app/app.module.ts
+++ b/components/datalake-handler/admin/src/src/app/app.module.ts
@@ -32,18 +32,18 @@ import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
 import { AppRoutingModule } from "./app-routing.module";
 import { AppComponent } from "./app.component";
 
-import { HeaderComponent } from "./header/header.component";
-import { SidebarComponent } from "./sidebar/sidebar.component";
+import { HeaderComponent } from "./shared/layout/header/header.component";
+import { SidebarComponent } from "./shared/layout/sidebar/sidebar.component";
 
-import { FeederComponent } from "./feeder/feeder.component";
-import { TopicsComponent } from "./topics/topics.component";
-import { DatabaseComponent } from "./database/database.component";
-import { TopicListComponent } from "./topics/topic-list/topic-list.component";
+import { FeederComponent } from "./views/feeder/feeder.component";
+import { TopicsComponent } from "./views/topics/topics.component";
+import { DatabaseComponent } from "./views/database/database.component";
+import { TopicListComponent } from "./views/topics/topic-list/topic-list.component";
 
 // Service
 import { AdminService } from "./core/services/admin.service";
 import { RestApiService } from "./core/services/rest-api.service";
-import { ToastrNotificationService } from "src/app/core/services/toastr-notification.service";
+import { ToastrNotificationService } from "src/app/shared/components/toastr-notification/toastr-notification.service";
 
 // i18n
 import { TranslateModule, TranslateLoader } from "@ngx-translate/core";
@@ -57,32 +57,37 @@ export function createLoader(http: HttpClient) {
 import { HttpClientModule } from "@angular/common/http";
 import { HttpClient } from "@angular/common/http";
 
-import { DatabaseListComponent } from "./database/database-list/database-list.component";
+import { DatabaseListComponent } from "./views/database/database-list/database-list.component";
 import { NgxDatatableModule } from "@swimlane/ngx-datatable";
-import { CouchbaseComponent } from "./database/database-list/dbs-modal/couchbase/couchbase.component";
-import { MongodbComponent } from "./database/database-list/dbs-modal/mongodb/mongodb.component";
-import { HdfsComponent } from "./database/database-list/dbs-modal/hdfs/hdfs.component";
-import { DatabaseAddModalComponent } from "./database/database-list/database-add-modal/database-add-modal.component";
-import { ElasticsearchComponent } from "./database/database-list/dbs-modal/elasticsearch/elasticsearch.component";
-import { DruidComponent } from "./database/database-list/dbs-modal/druid/druid.component";
+import { CouchbaseComponent } from "./views/database/database-list/dbs-modal/couchbase/couchbase.component";
+import { MongodbComponent } from "./views/database/database-list/dbs-modal/mongodb/mongodb.component";
+import { HdfsComponent } from "./views/database/database-list/dbs-modal/hdfs/hdfs.component";
+import { DatabaseAddModalComponent } from "./views/database/database-list/database-add-modal/database-add-modal.component";
+import { ElasticsearchComponent } from "./views/database/database-list/dbs-modal/elasticsearch/elasticsearch.component";
+import { DruidComponent } from "./views/database/database-list/dbs-modal/druid/druid.component";
 
 // Modals
-import { TopicDetailModalComponent } from "./topics/topic-list/topic-detail-modal/topic-detail-modal.component";
-import { TopicConfigModalComponent } from "./topics/topic-list/topic-config-modal/topic-config-modal.component";
-import { ToastrNotificationComponent } from "./core/toastr-notification/toastr-notification.component";
-import { AlertComponent } from "./core/alert/alert.component";
-import { AboutComponent } from "./about/about.component";
+import { TopicDetailModalComponent } from "./views/topics/topic-list/topic-detail-modal/topic-detail-modal.component";
+import { TopicConfigModalComponent } from "./views/topics/topic-list/topic-config-modal/topic-config-modal.component";
+import { ToastrNotificationComponent } from "./shared/components/toastr-notification/toastr-notification.component";
+import { AlertComponent } from "./shared/components/alert/alert.component";
+import { AboutComponent } from "./views/about/about.component";
 
 // Loading spinner
 import { NgxSpinnerModule } from "ngx-spinner";
-import { DashboardSettingComponent } from './dashboard-setting/dashboard-setting.component';
-import { DashboardListComponent } from './dashboard-setting/dashboard-list/dashboard-list.component';
-import { TemplateComponent } from './dashboard-setting/template/template.component';
-import { CreateDashboardComponent } from './dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component';
-import { TemplateListComponent } from './dashboard-setting/template/template-list/template-list.component';
-import { NewTemplateModalComponent } from './dashboard-setting/template/template-list/new-template-modal/new-template-modal.component';
-import { EditTemplateModalComponent } from './dashboard-setting/template/template-list/edit-template-modal/edit-template-modal.component';
-import { NewTopicModelComponent } from './topics/topic-list/new-topic-model/new-topic-model.component';
+import { DashboardSettingComponent } from './views/dashboard-setting/dashboard-setting.component';
+import { DashboardListComponent } from './views/dashboard-setting/dashboard-list/dashboard-list.component';
+import { TemplateComponent } from './views/dashboard-setting/template/template.component';
+import { CreateDashboardComponent } from './views/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component';
+import { TemplateListComponent } from './views/dashboard-setting/template/template-list/template-list.component';
+import { NewTemplateModalComponent } from './views/dashboard-setting/template/template-list/new-template-modal/new-template-modal.component';
+import { EditTemplateModalComponent } from './views/dashboard-setting/template/template-list/edit-template-modal/edit-template-modal.component';
+import { NewTopicModelComponent } from './views/topics/topic-list/new-topic-model/new-topic-model.component';
+import { TestComponent } from './views/test/test.component';
+import { ModalComponent } from './shared/modules/modal/modal.component';
+import { TableComponent } from './shared/modules/table/table.component';
+import { SearchComponent } from './shared/modules/search/search.component';
+import { CardComponent } from './shared/modules/card/card.component';
 
 @NgModule({
   declarations: [
@@ -108,11 +113,16 @@ import { NewTopicModelComponent } from './topics/topic-list/new-topic-model/new-
     DashboardSettingComponent,
     DashboardListComponent,
     CreateDashboardComponent,
-    TemplateComponent, 
+    TemplateComponent,
     TemplateListComponent,
     NewTemplateModalComponent,
     EditTemplateModalComponent,
     NewTopicModelComponent,
+    TestComponent,
+    ModalComponent,
+    TableComponent,
+    SearchComponent,
+    CardComponent,
 
   ],
   imports: [
@@ -145,8 +155,8 @@ import { NewTopicModelComponent } from './topics/topic-list/new-topic-model/new-
     TopicConfigModalComponent,
     NewTopicModelComponent,
     CreateDashboardComponent,
- 	NewTemplateModalComponent,
+    NewTemplateModalComponent,
     EditTemplateModalComponent
   ]
 })
-export class AppModule {}
+export class AppModule { }
diff --git a/components/datalake-handler/admin/src/src/app/core/alert/alert.component.css b/components/datalake-handler/admin/src/src/app/shared/components/alert/alert.component.css
index 46d72a44..46d72a44 100644
--- a/components/datalake-handler/admin/src/src/app/core/alert/alert.component.css
+++ b/components/datalake-handler/admin/src/src/app/shared/components/alert/alert.component.css
diff --git a/components/datalake-handler/admin/src/src/app/core/alert/alert.component.html b/components/datalake-handler/admin/src/src/app/shared/components/alert/alert.component.html
index 75c5b9d5..75c5b9d5 100644
--- a/components/datalake-handler/admin/src/src/app/core/alert/alert.component.html
+++ b/components/datalake-handler/admin/src/src/app/shared/components/alert/alert.component.html
diff --git a/components/datalake-handler/admin/src/src/app/core/alert/alert.component.spec.ts b/components/datalake-handler/admin/src/src/app/shared/components/alert/alert.component.spec.ts
index b1f05154..b1f05154 100644
--- a/components/datalake-handler/admin/src/src/app/core/alert/alert.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/shared/components/alert/alert.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/core/alert/alert.component.ts b/components/datalake-handler/admin/src/src/app/shared/components/alert/alert.component.ts
index 3774ec35..3774ec35 100644
--- a/components/datalake-handler/admin/src/src/app/core/alert/alert.component.ts
+++ b/components/datalake-handler/admin/src/src/app/shared/components/alert/alert.component.ts
diff --git a/components/datalake-handler/admin/src/src/app/core/toastr-notification/toastr-notification.component.css b/components/datalake-handler/admin/src/src/app/shared/components/toastr-notification/toastr-notification.component.css
index d28364f4..d28364f4 100644
--- a/components/datalake-handler/admin/src/src/app/core/toastr-notification/toastr-notification.component.css
+++ b/components/datalake-handler/admin/src/src/app/shared/components/toastr-notification/toastr-notification.component.css
diff --git a/components/datalake-handler/admin/src/src/app/core/toastr-notification/toastr-notification.component.html b/components/datalake-handler/admin/src/src/app/shared/components/toastr-notification/toastr-notification.component.html
index 026ce9c3..026ce9c3 100644
--- a/components/datalake-handler/admin/src/src/app/core/toastr-notification/toastr-notification.component.html
+++ b/components/datalake-handler/admin/src/src/app/shared/components/toastr-notification/toastr-notification.component.html
diff --git a/components/datalake-handler/admin/src/src/app/core/toastr-notification/toastr-notification.component.spec.ts b/components/datalake-handler/admin/src/src/app/shared/components/toastr-notification/toastr-notification.component.spec.ts
index 23ca1a46..23ca1a46 100644
--- a/components/datalake-handler/admin/src/src/app/core/toastr-notification/toastr-notification.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/shared/components/toastr-notification/toastr-notification.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/core/toastr-notification/toastr-notification.component.ts b/components/datalake-handler/admin/src/src/app/shared/components/toastr-notification/toastr-notification.component.ts
index 1d4f526a..a704fb9a 100644
--- a/components/datalake-handler/admin/src/src/app/core/toastr-notification/toastr-notification.component.ts
+++ b/components/datalake-handler/admin/src/src/app/shared/components/toastr-notification/toastr-notification.component.ts
@@ -30,7 +30,7 @@ import {
   Notification,
   NotificationType
 } from "src/app/core/models/toastr-notification.model";
-import { ToastrNotificationService } from "src/app/core/services/toastr-notification.service";
+import { ToastrNotificationService } from "src/app/shared/components/toastr-notification/toastr-notification.service";
 
 @Component({
   selector: "app-toastr-notification",
@@ -40,7 +40,7 @@ import { ToastrNotificationService } from "src/app/core/services/toastr-notifica
 export class ToastrNotificationComponent implements OnInit {
   notifications: Notification[] = [];
 
-  constructor(public _notificationService: ToastrNotificationService) {}
+  constructor(public _notificationService: ToastrNotificationService) { }
 
   ngOnInit() {
     this._notificationService.getAlert().subscribe((alert: Notification) => {
diff --git a/components/datalake-handler/admin/src/src/app/core/services/toastr-notification.service.spec.ts b/components/datalake-handler/admin/src/src/app/shared/components/toastr-notification/toastr-notification.service.spec.ts
index 1cda6a51..1cda6a51 100644
--- a/components/datalake-handler/admin/src/src/app/core/services/toastr-notification.service.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/shared/components/toastr-notification/toastr-notification.service.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/core/services/toastr-notification.service.ts b/components/datalake-handler/admin/src/src/app/shared/components/toastr-notification/toastr-notification.service.ts
index 5419d070..5419d070 100644
--- a/components/datalake-handler/admin/src/src/app/core/services/toastr-notification.service.ts
+++ b/components/datalake-handler/admin/src/src/app/shared/components/toastr-notification/toastr-notification.service.ts
diff --git a/components/datalake-handler/admin/src/src/app/header/header.component.css b/components/datalake-handler/admin/src/src/app/shared/layout/header/header.component.css
index d6d32ca4..d6d32ca4 100644
--- a/components/datalake-handler/admin/src/src/app/header/header.component.css
+++ b/components/datalake-handler/admin/src/src/app/shared/layout/header/header.component.css
diff --git a/components/datalake-handler/admin/src/src/app/header/header.component.html b/components/datalake-handler/admin/src/src/app/shared/layout/header/header.component.html
index 304879ee..304879ee 100644
--- a/components/datalake-handler/admin/src/src/app/header/header.component.html
+++ b/components/datalake-handler/admin/src/src/app/shared/layout/header/header.component.html
diff --git a/components/datalake-handler/admin/src/src/app/header/header.component.spec.ts b/components/datalake-handler/admin/src/src/app/shared/layout/header/header.component.spec.ts
index f2e1afbb..f2e1afbb 100644
--- a/components/datalake-handler/admin/src/src/app/header/header.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/shared/layout/header/header.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/header/header.component.ts b/components/datalake-handler/admin/src/src/app/shared/layout/header/header.component.ts
index 629c19e5..8c39ec18 100644
--- a/components/datalake-handler/admin/src/src/app/header/header.component.ts
+++ b/components/datalake-handler/admin/src/src/app/shared/layout/header/header.component.ts
@@ -25,13 +25,13 @@
  */
 
 import { Component, Output } from "@angular/core";
-import { AdminService } from "../core/services/admin.service";
+import { AdminService } from "../../../core/services/admin.service";
 import { TranslateService } from "@ngx-translate/core";
 import { Feeder } from "src/app/core/models/feeder.model";
 import { RestApiService } from "src/app/core/services/rest-api.service";
 
 // notify
-import { ToastrNotificationService } from "src/app/core/services/toastr-notification.service";
+import { ToastrNotificationService } from "src/app/shared/components/toastr-notification/toastr-notification.service";
 
 @Component({
   selector: "app-header",
diff --git a/components/datalake-handler/admin/src/src/app/sidebar/sidebar.component.css b/components/datalake-handler/admin/src/src/app/shared/layout/sidebar/sidebar.component.css
index 21d4bf74..21d4bf74 100644
--- a/components/datalake-handler/admin/src/src/app/sidebar/sidebar.component.css
+++ b/components/datalake-handler/admin/src/src/app/shared/layout/sidebar/sidebar.component.css
diff --git a/components/datalake-handler/admin/src/src/app/sidebar/sidebar.component.html b/components/datalake-handler/admin/src/src/app/shared/layout/sidebar/sidebar.component.html
index cf0a24e6..cf0a24e6 100644
--- a/components/datalake-handler/admin/src/src/app/sidebar/sidebar.component.html
+++ b/components/datalake-handler/admin/src/src/app/shared/layout/sidebar/sidebar.component.html
diff --git a/components/datalake-handler/admin/src/src/app/sidebar/sidebar.component.spec.ts b/components/datalake-handler/admin/src/src/app/shared/layout/sidebar/sidebar.component.spec.ts
index 3ee29d74..3ee29d74 100644
--- a/components/datalake-handler/admin/src/src/app/sidebar/sidebar.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/shared/layout/sidebar/sidebar.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/sidebar/sidebar.component.ts b/components/datalake-handler/admin/src/src/app/shared/layout/sidebar/sidebar.component.ts
index 0973d4d0..0973d4d0 100644
--- a/components/datalake-handler/admin/src/src/app/sidebar/sidebar.component.ts
+++ b/components/datalake-handler/admin/src/src/app/shared/layout/sidebar/sidebar.component.ts
diff --git a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-config-modal/topic-config-modal.component.css b/components/datalake-handler/admin/src/src/app/shared/modules/card/card.component.css
index e69de29b..e69de29b 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-config-modal/topic-config-modal.component.css
+++ b/components/datalake-handler/admin/src/src/app/shared/modules/card/card.component.css
diff --git a/components/datalake-handler/admin/src/src/app/shared/modules/card/card.component.html b/components/datalake-handler/admin/src/src/app/shared/modules/card/card.component.html
new file mode 100644
index 00000000..0f9abc54
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/shared/modules/card/card.component.html
@@ -0,0 +1,3 @@
+<p>
+  card works!
+</p>
diff --git a/components/datalake-handler/admin/src/src/app/shared/modules/card/card.component.spec.ts b/components/datalake-handler/admin/src/src/app/shared/modules/card/card.component.spec.ts
new file mode 100644
index 00000000..e141708a
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/shared/modules/card/card.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CardComponent } from './card.component';
+
+describe('CardComponent', () => {
+  let component: CardComponent;
+  let fixture: ComponentFixture<CardComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CardComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/components/datalake-handler/admin/src/src/app/shared/modules/card/card.component.ts b/components/datalake-handler/admin/src/src/app/shared/modules/card/card.component.ts
new file mode 100644
index 00000000..4e934bc8
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/shared/modules/card/card.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-card',
+  templateUrl: './card.component.html',
+  styleUrls: ['./card.component.css']
+})
+export class CardComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-detail-modal/topic-detail-modal.component.css b/components/datalake-handler/admin/src/src/app/shared/modules/modal/modal.component.css
index e69de29b..e69de29b 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-detail-modal/topic-detail-modal.component.css
+++ b/components/datalake-handler/admin/src/src/app/shared/modules/modal/modal.component.css
diff --git a/components/datalake-handler/admin/src/src/app/shared/modules/modal/modal.component.html b/components/datalake-handler/admin/src/src/app/shared/modules/modal/modal.component.html
new file mode 100644
index 00000000..0b81c38f
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/shared/modules/modal/modal.component.html
@@ -0,0 +1,3 @@
+<p>
+  modal works!
+</p>
diff --git a/components/datalake-handler/admin/src/src/app/shared/modules/modal/modal.component.spec.ts b/components/datalake-handler/admin/src/src/app/shared/modules/modal/modal.component.spec.ts
new file mode 100644
index 00000000..fc32a90f
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/shared/modules/modal/modal.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ModalComponent } from './modal.component';
+
+describe('ModalComponent', () => {
+  let component: ModalComponent;
+  let fixture: ComponentFixture<ModalComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ModalComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ModalComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/components/datalake-handler/admin/src/src/app/shared/modules/modal/modal.component.ts b/components/datalake-handler/admin/src/src/app/shared/modules/modal/modal.component.ts
new file mode 100644
index 00000000..15c22508
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/shared/modules/modal/modal.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-modal',
+  templateUrl: './modal.component.html',
+  styleUrls: ['./modal.component.css']
+})
+export class ModalComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/components/datalake-handler/admin/src/src/app/topics/topics.component.css b/components/datalake-handler/admin/src/src/app/shared/modules/search/search.component.css
index e69de29b..e69de29b 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topics.component.css
+++ b/components/datalake-handler/admin/src/src/app/shared/modules/search/search.component.css
diff --git a/components/datalake-handler/admin/src/src/app/shared/modules/search/search.component.html b/components/datalake-handler/admin/src/src/app/shared/modules/search/search.component.html
new file mode 100644
index 00000000..25363490
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/shared/modules/search/search.component.html
@@ -0,0 +1,3 @@
+<p>
+  search works!
+</p>
diff --git a/components/datalake-handler/admin/src/src/app/shared/modules/search/search.component.spec.ts b/components/datalake-handler/admin/src/src/app/shared/modules/search/search.component.spec.ts
new file mode 100644
index 00000000..43729199
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/shared/modules/search/search.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SearchComponent } from './search.component';
+
+describe('SearchComponent', () => {
+  let component: SearchComponent;
+  let fixture: ComponentFixture<SearchComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ SearchComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SearchComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/components/datalake-handler/admin/src/src/app/shared/modules/search/search.component.ts b/components/datalake-handler/admin/src/src/app/shared/modules/search/search.component.ts
new file mode 100644
index 00000000..c708abe6
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/shared/modules/search/search.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-search',
+  templateUrl: './search.component.html',
+  styleUrls: ['./search.component.css']
+})
+export class SearchComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/components/datalake-handler/admin/src/src/app/shared/modules/table/table.component.css b/components/datalake-handler/admin/src/src/app/shared/modules/table/table.component.css
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/shared/modules/table/table.component.css
diff --git a/components/datalake-handler/admin/src/src/app/shared/modules/table/table.component.html b/components/datalake-handler/admin/src/src/app/shared/modules/table/table.component.html
new file mode 100644
index 00000000..38e41676
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/shared/modules/table/table.component.html
@@ -0,0 +1,3 @@
+<p>
+  table works!
+</p>
diff --git a/components/datalake-handler/admin/src/src/app/shared/modules/table/table.component.spec.ts b/components/datalake-handler/admin/src/src/app/shared/modules/table/table.component.spec.ts
new file mode 100644
index 00000000..cdbacbc6
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/shared/modules/table/table.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TableComponent } from './table.component';
+
+describe('TableComponent', () => {
+  let component: TableComponent;
+  let fixture: ComponentFixture<TableComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ TableComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TableComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/components/datalake-handler/admin/src/src/app/shared/modules/table/table.component.ts b/components/datalake-handler/admin/src/src/app/shared/modules/table/table.component.ts
new file mode 100644
index 00000000..7e97f375
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/shared/modules/table/table.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-table',
+  templateUrl: './table.component.html',
+  styleUrls: ['./table.component.css']
+})
+export class TableComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/components/datalake-handler/admin/src/src/app/shared/utils/utils.js b/components/datalake-handler/admin/src/src/app/shared/utils/utils.js
new file mode 100644
index 00000000..c996d6bf
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/shared/utils/utils.js
@@ -0,0 +1 @@
+//put some general functions here. Enjoy
\ No newline at end of file
diff --git a/components/datalake-handler/admin/src/src/app/about/about.component.css b/components/datalake-handler/admin/src/src/app/views/about/about.component.css
index c8173515..c8173515 100644
--- a/components/datalake-handler/admin/src/src/app/about/about.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/about/about.component.css
diff --git a/components/datalake-handler/admin/src/src/app/about/about.component.html b/components/datalake-handler/admin/src/src/app/views/about/about.component.html
index accab817..accab817 100644
--- a/components/datalake-handler/admin/src/src/app/about/about.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/about/about.component.html
diff --git a/components/datalake-handler/admin/src/src/app/about/about.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/about/about.component.spec.ts
index b2be756c..b2be756c 100644
--- a/components/datalake-handler/admin/src/src/app/about/about.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/about/about.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/about/about.component.ts b/components/datalake-handler/admin/src/src/app/views/about/about.component.ts
index adf65a2a..adf65a2a 100644
--- a/components/datalake-handler/admin/src/src/app/about/about.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/about/about.component.ts
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.css b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.css
index 7af4051a..7af4051a 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.css
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.html b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.html
index 5fdc45a1..5fdc45a1 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.html
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.spec.ts
index 6fa809d5..6fa809d5 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.ts b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.ts
index 991826cc..158068ae 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.ts
@@ -13,7 +13,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 */
-import {Component, OnInit, Input, Output, ViewChild, EventEmitter, ElementRef} from '@angular/core';
+import { Component, OnInit, Input, Output, ViewChild, EventEmitter, ElementRef } from '@angular/core';
 import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
 import { Dashboard } from "src/app/core/models/dashboard.model";
 import { AdminService } from "src/app/core/services/admin.service";
@@ -29,7 +29,7 @@ export class CreateDashboardComponent implements OnInit {
     public activeModal: NgbActiveModal,
     public adminService: AdminService,
     public restApiService: RestApiService,
-  ) {}
+  ) { }
 
   @Output() passEntry: EventEmitter<any> = new EventEmitter();
   @Input() dashboard: Dashboard;
@@ -46,7 +46,7 @@ export class CreateDashboardComponent implements OnInit {
 
     console.log(this.dashboard);
     this.tempDb = new Dashboard();
-    if(this.dashboard.enabled==undefined){
+    if (this.dashboard.enabled == undefined) {
       this.dashboard.enabled = true;
     }
     const feeds = {
@@ -65,12 +65,12 @@ export class CreateDashboardComponent implements OnInit {
 
 
   passBack() {
-    if(this.tempDb.host == null && this.tempDb.port == null && this.tempDb.login == null && this.tempDb.pass == null){
+    if (this.tempDb.host == null && this.tempDb.port == null && this.tempDb.login == null && this.tempDb.pass == null) {
       return false;
     }
     this.dashboard = this.tempDb;
     this.dashboard.name = this.t_dataDashboardName.nativeElement.value;
-    console.log(this.dashboard,"this.dashboard output");
+    console.log(this.dashboard, "this.dashboard output");
     this.passEntry.emit(this.dashboard);
   }
 
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/dashboard-list.component.css b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-list/dashboard-list.component.css
index 69d9710a..69d9710a 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/dashboard-list.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-list/dashboard-list.component.css
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/dashboard-list.component.html b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-list/dashboard-list.component.html
index 316dee54..316dee54 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/dashboard-list.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-list/dashboard-list.component.html
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/dashboard-list.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-list/dashboard-list.component.spec.ts
index d0e59ce4..d0e59ce4 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/dashboard-list.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-list/dashboard-list.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/dashboard-list.component.ts b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-list/dashboard-list.component.ts
index 17a6b2ea..225f819d 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/dashboard-list.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-list/dashboard-list.component.ts
@@ -14,17 +14,17 @@
     limitations under the License.
 */
 import { Component, EventEmitter, OnInit, Output } from '@angular/core';
-import { Dashboard } from "../../core/models/dashboard.model";
+import { Dashboard } from "../../../core/models/dashboard.model";
 import { NgbModal } from "@ng-bootstrap/ng-bootstrap";
 import { CreateDashboardComponent } from "./create-dashboard/create-dashboard.component";
 
-import { AdminService } from "../../core/services/admin.service";
+import { AdminService } from "../../../core/services/admin.service";
 
 // DB modal components
 import { RestApiService } from "src/app/core/services/rest-api.service";
 
 // Notify
-import { ToastrNotificationService } from "src/app/core/services/toastr-notification.service";
+import { ToastrNotificationService } from "src/app/shared/components/toastr-notification/toastr-notification.service";
 // Loading spinner
 import { NgxSpinnerService } from "ngx-spinner";
 
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-setting.component.css b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-setting.component.css
index 424c839b..424c839b 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-setting.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-setting.component.css
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-setting.component.html b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-setting.component.html
index 134e2fc1..134e2fc1 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-setting.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-setting.component.html
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-setting.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-setting.component.spec.ts
index 10886c12..10886c12 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-setting.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-setting.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-setting.component.ts b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-setting.component.ts
index 26efe645..c423ab42 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-setting.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/dashboard-setting.component.ts
@@ -21,7 +21,7 @@ import { Component, OnInit } from '@angular/core';
 })
 export class DashboardSettingComponent implements OnInit {
 
-  constructor() {}
+  constructor() { }
 
   ngOnInit() {
   }
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/edit-template-modal/edit-template-modal.component.css b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/edit-template-modal/edit-template-modal.component.css
index 7bd79547..7bd79547 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/edit-template-modal/edit-template-modal.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/edit-template-modal/edit-template-modal.component.css
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/edit-template-modal/edit-template-modal.component.html b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/edit-template-modal/edit-template-modal.component.html
index 4165de8d..4165de8d 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/edit-template-modal/edit-template-modal.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/edit-template-modal/edit-template-modal.component.html
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/edit-template-modal/edit-template-modal.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/edit-template-modal/edit-template-modal.component.spec.ts
index de3dc540..de3dc540 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/edit-template-modal/edit-template-modal.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/edit-template-modal/edit-template-modal.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/edit-template-modal/edit-template-modal.component.ts b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/edit-template-modal/edit-template-modal.component.ts
index a6b7be9f..a6b7be9f 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/edit-template-modal/edit-template-modal.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/edit-template-modal/edit-template-modal.component.ts
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/new-template-modal/new-template-modal.component.css b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/new-template-modal/new-template-modal.component.css
index 7bd79547..7bd79547 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/new-template-modal/new-template-modal.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/new-template-modal/new-template-modal.component.css
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/new-template-modal/new-template-modal.component.html b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/new-template-modal/new-template-modal.component.html
index 40d0755e..40d0755e 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/new-template-modal/new-template-modal.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/new-template-modal/new-template-modal.component.html
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/new-template-modal/new-template-modal.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/new-template-modal/new-template-modal.component.spec.ts
index 29df2b1a..29df2b1a 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/new-template-modal/new-template-modal.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/new-template-modal/new-template-modal.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/new-template-modal/new-template-modal.component.ts b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/new-template-modal/new-template-modal.component.ts
index 496d08a1..496d08a1 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/new-template-modal/new-template-modal.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/new-template-modal/new-template-modal.component.ts
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/template-list.component.css b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/template-list.component.css
index 47ab70e5..47ab70e5 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/template-list.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/template-list.component.css
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/template-list.component.html b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/template-list.component.html
index 4a93ec65..4a93ec65 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/template-list.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/template-list.component.html
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/template-list.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/template-list.component.spec.ts
index 10a43a46..10a43a46 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/template-list.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/template-list.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/template-list.component.ts b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/template-list.component.ts
index 8da33f00..156e3ed7 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template-list/template-list.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template-list/template-list.component.ts
@@ -23,9 +23,9 @@ import { NgxSpinnerService } from "ngx-spinner";
 // modal
 import { NewTemplateModalComponent } from "./new-template-modal/new-template-modal.component";
 import { EditTemplateModalComponent } from "./edit-template-modal/edit-template-modal.component";
-import { AlertComponent } from "src/app/core/alert/alert.component";
+import { AlertComponent } from "src/app/shared/components/alert/alert.component";
 // notify
-import { ToastrNotificationService } from "src/app/core/services/toastr-notification.service";
+import { ToastrNotificationService } from "src/app/shared/components/toastr-notification/toastr-notification.service";
 
 @Component({
   selector: 'app-template-list',
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template.component.css b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template.component.css
index 424c839b..424c839b 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template.component.css
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template.component.html b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template.component.html
index 2aede51d..2aede51d 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template.component.html
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template.component.spec.ts
index 21428a84..21428a84 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template.component.ts b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template.component.ts
index cb761deb..3a605f78 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/template/template.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/dashboard-setting/template/template.component.ts
@@ -14,7 +14,7 @@
     limitations under the License.
 */
 import { Component, OnInit } from '@angular/core';
-import {AdminService} from "../../core/services/admin.service";
+import { AdminService } from "../../../core/services/admin.service";
 
 @Component({
   selector: 'app-template',
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/database-add-modal/database-add-modal.component.css b/components/datalake-handler/admin/src/src/app/views/database/database-list/database-add-modal/database-add-modal.component.css
index ac205fe8..ac205fe8 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/database-add-modal/database-add-modal.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/database-add-modal/database-add-modal.component.css
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/database-add-modal/database-add-modal.component.html b/components/datalake-handler/admin/src/src/app/views/database/database-list/database-add-modal/database-add-modal.component.html
index 490bf49e..490bf49e 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/database-add-modal/database-add-modal.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/database-add-modal/database-add-modal.component.html
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/database-add-modal/database-add-modal.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/database/database-list/database-add-modal/database-add-modal.component.spec.ts
index bde10b2c..bde10b2c 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/database-add-modal/database-add-modal.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/database-add-modal/database-add-modal.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/database-add-modal/database-add-modal.component.ts b/components/datalake-handler/admin/src/src/app/views/database/database-list/database-add-modal/database-add-modal.component.ts
index 3f47bdd1..3f47bdd1 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/database-add-modal/database-add-modal.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/database-add-modal/database-add-modal.component.ts
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/database-list.component.css b/components/datalake-handler/admin/src/src/app/views/database/database-list/database-list.component.css
index 15261b48..15261b48 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/database-list.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/database-list.component.css
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/database-list.component.html b/components/datalake-handler/admin/src/src/app/views/database/database-list/database-list.component.html
index 829d6c62..829d6c62 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/database-list.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/database-list.component.html
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/database-list.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/database/database-list/database-list.component.spec.ts
index 8c104fd4..8c104fd4 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/database-list.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/database-list.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/database-list.component.ts b/components/datalake-handler/admin/src/src/app/views/database/database-list/database-list.component.ts
index 556e9f97..5b937301 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/database-list.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/database-list.component.ts
@@ -25,7 +25,7 @@
  */
 
 import { Component, OnInit, ViewChild, ElementRef } from "@angular/core";
-import { Db } from "../../core/models/db.model";
+import { Db } from "../../../core/models/db.model";
 import { NgbModal } from "@ng-bootstrap/ng-bootstrap";
 import { DatabaseAddModalComponent } from "./database-add-modal/database-add-modal.component";
 
@@ -38,10 +38,10 @@ import { DruidComponent } from "./dbs-modal/druid/druid.component";
 import { ElasticsearchComponent } from "./dbs-modal/elasticsearch/elasticsearch.component";
 import { MongodbComponent } from "./dbs-modal/mongodb/mongodb.component";
 import { HdfsComponent } from "./dbs-modal/hdfs/hdfs.component";
-import { AlertComponent } from "src/app/core/alert/alert.component";
+import { AlertComponent } from "src/app/shared/components/alert/alert.component";
 
 // Notify
-import { ToastrNotificationService } from "src/app/core/services/toastr-notification.service";
+import { ToastrNotificationService } from "src/app/shared/components/toastr-notification/toastr-notification.service";
 
 // Loading spinner
 import { NgxSpinnerService } from "ngx-spinner";
@@ -188,15 +188,15 @@ export class DatabaseListComponent implements OnInit {
     modalRef.componentInstance.passEntry.subscribe(receiveEntry => {
       this.tempDbDetail = receiveEntry;
       let enabled = receiveEntry.enabled;
-      console.log(this.tempDbDetail,"this.tempDbDetail");
-      if(enabled == true){
+      console.log(this.tempDbDetail, "this.tempDbDetail");
+      if (enabled == true) {
         this.restApiService.upadteDb(this.tempDbDetail).subscribe(
           res => {
             console.log(res);
             if (res.statusCode == 200) {
               this.dbs[index] = this.tempDbDetail;
               this.notificationService.success("SUCCESSFULLY_UPDATED");
-            }else {
+            } else {
               this.notificationService.error("FAILED_UPDATED");
             }
             modalRef.close();
@@ -206,14 +206,14 @@ export class DatabaseListComponent implements OnInit {
             modalRef.close();
           }
         );
-      }else {
+      } else {
         this.restApiService.upadteDb(this.dbs[index]).subscribe(
           res => {
             console.log(res);
             if (res.statusCode == 200) {
               this.dbs[index] = this.tempDbDetail;
               this.notificationService.success("SUCCESSFULLY_DELETED");
-            }else {
+            } else {
               this.dbs[index].encrypt = true;
             }
             modalRef.close();
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/couchbase/couchbase.component.css b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/couchbase/couchbase.component.css
index d6d32ca4..d6d32ca4 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/couchbase/couchbase.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/couchbase/couchbase.component.css
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/couchbase/couchbase.component.html b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/couchbase/couchbase.component.html
index c67ab85c..c67ab85c 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/couchbase/couchbase.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/couchbase/couchbase.component.html
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/couchbase/couchbase.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/couchbase/couchbase.component.spec.ts
index e3de0b45..e3de0b45 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/couchbase/couchbase.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/couchbase/couchbase.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/couchbase/couchbase.component.ts b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/couchbase/couchbase.component.ts
index 5e11900b..4ce7f2ab 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/couchbase/couchbase.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/couchbase/couchbase.component.ts
@@ -42,7 +42,7 @@ export class CouchbaseComponent {
   constructor(
     public activeModal: NgbActiveModal,
     public adminService: AdminService
-  ) {}
+  ) { }
 
   ngOnInit() {
     // cache for display
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/druid/druid.component.css b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/druid/druid.component.css
index d6d32ca4..d6d32ca4 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/druid/druid.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/druid/druid.component.css
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/druid/druid.component.html b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/druid/druid.component.html
index 5d5a38cf..5d5a38cf 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/druid/druid.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/druid/druid.component.html
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/druid/druid.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/druid/druid.component.spec.ts
index 833fa410..833fa410 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/druid/druid.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/druid/druid.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/druid/druid.component.ts b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/druid/druid.component.ts
index 43bd0ed4..4de2fdd8 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/druid/druid.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/druid/druid.component.ts
@@ -42,7 +42,7 @@ export class DruidComponent {
   constructor(
     public activeModal: NgbActiveModal,
     public adminService: AdminService
-  ) {}
+  ) { }
 
   ngOnInit() {
     // cache for display
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/elasticsearch/elasticsearch.component.css b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/elasticsearch/elasticsearch.component.css
index d6d32ca4..d6d32ca4 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/elasticsearch/elasticsearch.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/elasticsearch/elasticsearch.component.css
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/elasticsearch/elasticsearch.component.html b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/elasticsearch/elasticsearch.component.html
index 1a7e7e80..1a7e7e80 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/elasticsearch/elasticsearch.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/elasticsearch/elasticsearch.component.html
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/elasticsearch/elasticsearch.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/elasticsearch/elasticsearch.component.spec.ts
index 57798da3..57798da3 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/elasticsearch/elasticsearch.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/elasticsearch/elasticsearch.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/elasticsearch/elasticsearch.component.ts b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/elasticsearch/elasticsearch.component.ts
index bbecea56..29e2125e 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/elasticsearch/elasticsearch.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/elasticsearch/elasticsearch.component.ts
@@ -42,7 +42,7 @@ export class ElasticsearchComponent {
   constructor(
     public activeModal: NgbActiveModal,
     public adminService: AdminService
-  ) {}
+  ) { }
 
   ngOnInit() {
     // cache for display
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/hdfs/hdfs.component.css b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/hdfs/hdfs.component.css
index d6d32ca4..d6d32ca4 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/hdfs/hdfs.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/hdfs/hdfs.component.css
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/hdfs/hdfs.component.html b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/hdfs/hdfs.component.html
index 39b905b3..39b905b3 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/hdfs/hdfs.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/hdfs/hdfs.component.html
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/hdfs/hdfs.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/hdfs/hdfs.component.spec.ts
index dafbdadc..dafbdadc 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/hdfs/hdfs.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/hdfs/hdfs.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/hdfs/hdfs.component.ts b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/hdfs/hdfs.component.ts
index 034e2902..42ac7748 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/hdfs/hdfs.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/hdfs/hdfs.component.ts
@@ -42,7 +42,7 @@ export class HdfsComponent {
   constructor(
     public activeModal: NgbActiveModal,
     public adminService: AdminService
-  ) {}
+  ) { }
 
   ngOnInit() {
     // cache for display
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/mongodb/mongodb.component.css b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/mongodb/mongodb.component.css
index d6d32ca4..d6d32ca4 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/mongodb/mongodb.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/mongodb/mongodb.component.css
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/mongodb/mongodb.component.html b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/mongodb/mongodb.component.html
index 48dc0516..48dc0516 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/mongodb/mongodb.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/mongodb/mongodb.component.html
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/mongodb/mongodb.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/mongodb/mongodb.component.spec.ts
index a9ff1b8d..a9ff1b8d 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/mongodb/mongodb.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/mongodb/mongodb.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/mongodb/mongodb.component.ts b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/mongodb/mongodb.component.ts
index 05a1526a..606a132d 100644
--- a/components/datalake-handler/admin/src/src/app/database/database-list/dbs-modal/mongodb/mongodb.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/database/database-list/dbs-modal/mongodb/mongodb.component.ts
@@ -42,7 +42,7 @@ export class MongodbComponent {
   constructor(
     public activeModal: NgbActiveModal,
     public adminService: AdminService
-  ) {}
+  ) { }
 
   ngOnInit() {
     // cache for display
diff --git a/components/datalake-handler/admin/src/src/app/database/database.component.css b/components/datalake-handler/admin/src/src/app/views/database/database.component.css
index d6d32ca4..d6d32ca4 100644
--- a/components/datalake-handler/admin/src/src/app/database/database.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/database/database.component.css
diff --git a/components/datalake-handler/admin/src/src/app/database/database.component.html b/components/datalake-handler/admin/src/src/app/views/database/database.component.html
index 5ba0e314..5ba0e314 100644
--- a/components/datalake-handler/admin/src/src/app/database/database.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/database/database.component.html
diff --git a/components/datalake-handler/admin/src/src/app/database/database.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/database/database.component.spec.ts
index a2a7e8db..a2a7e8db 100644
--- a/components/datalake-handler/admin/src/src/app/database/database.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/database/database.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/database/database.component.ts b/components/datalake-handler/admin/src/src/app/views/database/database.component.ts
index 67f35f9a..6b192111 100644
--- a/components/datalake-handler/admin/src/src/app/database/database.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/database/database.component.ts
@@ -25,7 +25,7 @@
  */
 
 import { Component, OnInit } from "@angular/core";
-import { AdminService } from "../core/services/admin.service";
+import { AdminService } from "../../core/services/admin.service";
 
 @Component({
   selector: "app-database",
@@ -37,5 +37,5 @@ export class DatabaseComponent implements OnInit {
     this.adminService.setTitle("SIDEBAR.DATABASE");
   }
 
-  ngOnInit() {}
+  ngOnInit() { }
 }
diff --git a/components/datalake-handler/admin/src/src/app/feeder/feeder.component.css b/components/datalake-handler/admin/src/src/app/views/feeder/feeder.component.css
index 9f2bcedc..9f2bcedc 100644
--- a/components/datalake-handler/admin/src/src/app/feeder/feeder.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/feeder/feeder.component.css
diff --git a/components/datalake-handler/admin/src/src/app/feeder/feeder.component.html b/components/datalake-handler/admin/src/src/app/views/feeder/feeder.component.html
index 64ba834c..64ba834c 100644
--- a/components/datalake-handler/admin/src/src/app/feeder/feeder.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/feeder/feeder.component.html
diff --git a/components/datalake-handler/admin/src/src/app/feeder/feeder.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/feeder/feeder.component.spec.ts
index b5ee7ecd..b5ee7ecd 100644
--- a/components/datalake-handler/admin/src/src/app/feeder/feeder.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/feeder/feeder.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/feeder/feeder.component.ts b/components/datalake-handler/admin/src/src/app/views/feeder/feeder.component.ts
index f5d05bb7..921910b8 100644
--- a/components/datalake-handler/admin/src/src/app/feeder/feeder.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/feeder/feeder.component.ts
@@ -27,10 +27,10 @@
 import { Component, OnInit } from "@angular/core";
 import { AdminService } from "src/app/core/services/admin.service";
 import { RestApiService } from "src/app/core/services/rest-api.service";
-import { HeaderComponent } from "src/app/header/header.component";
+import { HeaderComponent } from "src/app/shared/layout/header/header.component";
 
 // notify
-import { ToastrNotificationService } from "src/app/core/services/toastr-notification.service";
+import { ToastrNotificationService } from "src/app/shared/components/toastr-notification/toastr-notification.service";
 
 // Loading spinner
 import { NgxSpinnerService } from "ngx-spinner";
diff --git a/components/datalake-handler/admin/src/src/app/views/test/test.component.css b/components/datalake-handler/admin/src/src/app/views/test/test.component.css
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/views/test/test.component.css
diff --git a/components/datalake-handler/admin/src/src/app/views/test/test.component.html b/components/datalake-handler/admin/src/src/app/views/test/test.component.html
new file mode 100644
index 00000000..f4d08c15
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/views/test/test.component.html
@@ -0,0 +1,20 @@
+<div>
+  <h3>Test module is used for some publice business modules sample</h3>
+  <div>
+    <p>Module 1 -----> card</p>
+    <app-card></app-card>
+
+  </div>
+  <div>
+    <p>Module 2 -----> modal</p>
+    <app-modal></app-modal>
+  </div>
+  <div>
+    <p>Module 3 -----> search</p>
+    <app-search></app-search>
+  </div>
+  <div>
+    <p>Module 4 -----> table</p>
+    <app-table></app-table>
+  </div>
+</div>
\ No newline at end of file
diff --git a/components/datalake-handler/admin/src/src/app/views/test/test.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/test/test.component.spec.ts
new file mode 100644
index 00000000..ef4e38cb
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/views/test/test.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TestComponent } from './test.component';
+
+describe('TestComponent', () => {
+  let component: TestComponent;
+  let fixture: ComponentFixture<TestComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ TestComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TestComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/components/datalake-handler/admin/src/src/app/views/test/test.component.ts b/components/datalake-handler/admin/src/src/app/views/test/test.component.ts
new file mode 100644
index 00000000..ff623a7f
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/views/test/test.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-test',
+  templateUrl: './test.component.html',
+  styleUrls: ['./test.component.css']
+})
+export class TestComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/components/datalake-handler/admin/src/src/app/topics/topic-list/new-topic-model/new-topic-model.component.css b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/new-topic-model/new-topic-model.component.css
index 424c839b..424c839b 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topic-list/new-topic-model/new-topic-model.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/new-topic-model/new-topic-model.component.css
diff --git a/components/datalake-handler/admin/src/src/app/topics/topic-list/new-topic-model/new-topic-model.component.html b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/new-topic-model/new-topic-model.component.html
index c45b8fdb..c45b8fdb 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topic-list/new-topic-model/new-topic-model.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/new-topic-model/new-topic-model.component.html
diff --git a/components/datalake-handler/admin/src/src/app/topics/topic-list/new-topic-model/new-topic-model.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/new-topic-model/new-topic-model.component.spec.ts
index 536f3a9e..536f3a9e 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topic-list/new-topic-model/new-topic-model.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/new-topic-model/new-topic-model.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/topics/topic-list/new-topic-model/new-topic-model.component.ts b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/new-topic-model/new-topic-model.component.ts
index 91be8d0a..82bbcb69 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topic-list/new-topic-model/new-topic-model.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/new-topic-model/new-topic-model.component.ts
@@ -22,10 +22,10 @@ import {
   ViewChild,
   ElementRef
 } from "@angular/core";
-import {NgbActiveModal} from "@ng-bootstrap/ng-bootstrap";
-import {RestApiService} from "src/app/core/services/rest-api.service";
-import {AdminService} from "src/app/core/services/admin.service";
-import {Topic} from "src/app/core/models/topic.model";
+import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
+import { RestApiService } from "src/app/core/services/rest-api.service";
+import { AdminService } from "src/app/core/services/admin.service";
+import { Topic } from "src/app/core/models/topic.model";
 
 @Component({
   selector: 'app-new-topic-model',
@@ -60,7 +60,7 @@ export class NewTopicModelComponent implements OnInit {
     this.newTopic = {
       name: "",
       login: "",
-      password:"",
+      password: "",
       sinkdbs: [],
       enabled: false,
       saveRaw: false,
@@ -68,24 +68,24 @@ export class NewTopicModelComponent implements OnInit {
       ttl: null,
       correlateClearedMessage: false,
       messageIdPath: null,
-      type:null
+      type: null
     };
     this.TopicInput = new Topic();
     const feeds = {
-        name: this.newTopic.name,
-        login: this.newTopic.login,
-        password:this.newTopic.password,
-        sinkdbs: this.newTopic.sinkdbs,
-        enabled: this.newTopic.enabled,
-        saveRaw: this.newTopic.saveRaw,
-        dataFormat: this.newTopic.dataFormat,
-        ttl: this.newTopic.ttl,
-        correlateClearedMessage: this.newTopic.correlateClearedMessage,
-        messageIdPath: this.newTopic.messageIdPath,
-        type:null
-      };
+      name: this.newTopic.name,
+      login: this.newTopic.login,
+      password: this.newTopic.password,
+      sinkdbs: this.newTopic.sinkdbs,
+      enabled: this.newTopic.enabled,
+      saveRaw: this.newTopic.saveRaw,
+      dataFormat: this.newTopic.dataFormat,
+      ttl: this.newTopic.ttl,
+      correlateClearedMessage: this.newTopic.correlateClearedMessage,
+      messageIdPath: this.newTopic.messageIdPath,
+      type: null
+    };
     this.TopicInput = feeds;
-    this. idExFields = [];
+    this.idExFields = [];
     if (this.TopicInput.messageIdPath != null) {
       var feed = this.TopicInput.messageIdPath.split(",");
       for (var i = 0; i < feed.length; i++) {
@@ -138,7 +138,7 @@ export class NewTopicModelComponent implements OnInit {
     this.newTopic.ttl = this.t_ttl.nativeElement.value;
     this.newTopic.messageIdPath = "";
     for (var i = 0; i < this.idExFields.length; i++) {
-      let item = "/"+this.idExFields[i].item;
+      let item = "/" + this.idExFields[i].item;
       if (i == 0) {
         this.newTopic.messageIdPath = item;
       } else {
diff --git a/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-config-modal/topic-config-modal.component.css b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-config-modal/topic-config-modal.component.css
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-config-modal/topic-config-modal.component.css
diff --git a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-config-modal/topic-config-modal.component.html b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-config-modal/topic-config-modal.component.html
index bfa3f572..bfa3f572 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-config-modal/topic-config-modal.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-config-modal/topic-config-modal.component.html
diff --git a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-config-modal/topic-config-modal.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-config-modal/topic-config-modal.component.spec.ts
index 9c3ec518..9c3ec518 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-config-modal/topic-config-modal.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-config-modal/topic-config-modal.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-config-modal/topic-config-modal.component.ts b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-config-modal/topic-config-modal.component.ts
index b67dff19..b67dff19 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-config-modal/topic-config-modal.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-config-modal/topic-config-modal.component.ts
diff --git a/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-detail-modal/topic-detail-modal.component.css b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-detail-modal/topic-detail-modal.component.css
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-detail-modal/topic-detail-modal.component.css
diff --git a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-detail-modal/topic-detail-modal.component.html b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-detail-modal/topic-detail-modal.component.html
index fa07903b..fa07903b 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-detail-modal/topic-detail-modal.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-detail-modal/topic-detail-modal.component.html
diff --git a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-detail-modal/topic-detail-modal.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-detail-modal/topic-detail-modal.component.spec.ts
index ee6fcad3..ee6fcad3 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-detail-modal/topic-detail-modal.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-detail-modal/topic-detail-modal.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-detail-modal/topic-detail-modal.component.ts b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-detail-modal/topic-detail-modal.component.ts
index e2dd1825..e2dd1825 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-detail-modal/topic-detail-modal.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-detail-modal/topic-detail-modal.component.ts
diff --git a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-list.component.css b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-list.component.css
index bb3e0e80..bb3e0e80 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-list.component.css
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-list.component.css
diff --git a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-list.component.html b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-list.component.html
index 519cc9da..519cc9da 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-list.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-list.component.html
diff --git a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-list.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-list.component.spec.ts
index 531afbb7..531afbb7 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-list.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-list.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-list.component.ts b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-list.component.ts
index 8f22307d..7f2b6f04 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topic-list/topic-list.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topic-list/topic-list.component.ts
@@ -35,11 +35,11 @@ import { TopicConfigModalComponent } from "./topic-config-modal/topic-config-mod
 import { NewTopicModelComponent } from "./new-topic-model/new-topic-model.component";
 
 // notify
-import { ToastrNotificationService } from "src/app/core/services/toastr-notification.service";
+import { ToastrNotificationService } from "src/app/shared/components/toastr-notification/toastr-notification.service";
 
 // Loading spinner
 import { NgxSpinnerService } from "ngx-spinner";
-import {AlertComponent} from "../../core/alert/alert.component";
+import { AlertComponent } from "../../../shared/components/alert/alert.component";
 
 @Component({
   selector: "app-topic-list",
@@ -87,7 +87,7 @@ export class TopicListComponent {
     this.spinner.show();
   }
 
-  init(){
+  init() {
     this.initData().then(data => {
       this.initTopicList(this.topicListDmaap, this.topicListFeeder).then(
         data => {
@@ -140,7 +140,7 @@ export class TopicListComponent {
 
     // dmaap has topics
     if (dmaapList.length > 0) {
-      let listLength = dmaapList.length>feederList.length ? dmaapList.length:feederList.length;
+      let listLength = dmaapList.length > feederList.length ? dmaapList.length : feederList.length;
       for (var i = 0; i < listLength; i++) {
         if (feederList.includes(dmaapList[i])) {
           let data = await this.getTopicDetail(dmaapList[i]);
@@ -158,7 +158,7 @@ export class TopicListComponent {
             type: true
           };
           t.push(feed);
-        } else if(!feederList.includes(dmaapList[i]) && dmaapList[i]!=undefined){
+        } else if (!feederList.includes(dmaapList[i]) && dmaapList[i] != undefined) {
           let feed = {
             name: dmaapList[i],
             login: this.topicDefaultConfig.login,
@@ -175,7 +175,7 @@ export class TopicListComponent {
           };
           t.push(feed);
         }
-        if(!dmaapList.includes(feederList[i]) && feederList[i]!=undefined){
+        if (!dmaapList.includes(feederList[i]) && feederList[i] != undefined) {
           let data = await this.getTopicDetail(feederList[i]);
           let feed = {
             name: feederList[i],
@@ -189,7 +189,7 @@ export class TopicListComponent {
             correlateClearedMessage: data.correlateClearedMessage,
             messageIdPath: data.messageIdPath,
             type: true,
-            topicDb:true
+            topicDb: true
           };
           t.push(feed);
         }
@@ -220,7 +220,7 @@ export class TopicListComponent {
 
   onActivate(event) {
     const emitType = event.type;
-    if(emitType == "dblclick"){
+    if (emitType == "dblclick") {
       console.log('Activate Event', event);
       let name = event.row.name;
       this.openTopicModal(name);
@@ -228,14 +228,14 @@ export class TopicListComponent {
 
   }
 
-  openNewTopicModal(){
+  openNewTopicModal() {
     const modalRef = this.modalService.open(NewTopicModelComponent, {
       size: "lg",
       centered: true
     });
     modalRef.componentInstance.newTopic = this.tempNewTopic;
     modalRef.componentInstance.passEntry.subscribe(receivedEntry => {
-      console.log(receivedEntry,"newtopic receivedEntry");
+      console.log(receivedEntry, "newtopic receivedEntry");
       this.tempNewTopic = receivedEntry;
       this.restApiService.addNewTopic(this.tempNewTopic).subscribe(
         res => {
@@ -363,7 +363,7 @@ export class TopicListComponent {
     }
   }
 
-  deleteTopicModal(name: string){
+  deleteTopicModal(name: string) {
     const index = this.temp.findIndex(t => t.name === name);
     const modalRef = this.modalService.open(AlertComponent, {
       size: "sm",
@@ -397,7 +397,7 @@ export class TopicListComponent {
     const val = searchValue.toLowerCase();
 
     // filter our data
-    const temp = this.temp.filter(function(d) {
+    const temp = this.temp.filter(function (d) {
       return d.name.toLowerCase().indexOf(val) !== -1 || !val;
     });
 
diff --git a/components/datalake-handler/admin/src/src/app/views/topics/topics.component.css b/components/datalake-handler/admin/src/src/app/views/topics/topics.component.css
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topics.component.css
diff --git a/components/datalake-handler/admin/src/src/app/topics/topics.component.html b/components/datalake-handler/admin/src/src/app/views/topics/topics.component.html
index 25274404..25274404 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topics.component.html
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topics.component.html
diff --git a/components/datalake-handler/admin/src/src/app/topics/topics.component.spec.ts b/components/datalake-handler/admin/src/src/app/views/topics/topics.component.spec.ts
index f38f85e6..f38f85e6 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topics.component.spec.ts
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topics.component.spec.ts
diff --git a/components/datalake-handler/admin/src/src/app/topics/topics.component.ts b/components/datalake-handler/admin/src/src/app/views/topics/topics.component.ts
index 539d1249..d8647fec 100644
--- a/components/datalake-handler/admin/src/src/app/topics/topics.component.ts
+++ b/components/datalake-handler/admin/src/src/app/views/topics/topics.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from "@angular/core";
-import { AdminService } from "../core/services/admin.service";
+import { AdminService } from "../../core/services/admin.service";
 
 @Component({
   selector: "app-topics",
@@ -12,5 +12,5 @@ export class TopicsComponent implements OnInit {
     this.adminService.setTitle("SIDEBAR.TOPICS");
   }
 
-  ngOnInit() {}
+  ngOnInit() { }
 }