diff --git a/src/README.md b/src/README.md
deleted file mode 100644
index 83d47bf..0000000
--- a/src/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# Folder Structure
-
-### Angular 2 Framework
-Contains **Angular 2** based components
-
-
-### React Framework
-Contains **React.js** based components
diff --git a/src/angular/accordion/accordion.component.html.ts b/src/angular/accordion/accordion.component.html.ts
index ac5f81f..2679906 100644
--- a/src/angular/accordion/accordion.component.html.ts
+++ b/src/angular/accordion/accordion.component.html.ts
@@ -1,4 +1,4 @@
-export default `
+export const template = `
 <div class="sdc-accordion" [ngClass]="customCSSClass">
     <div class="sdc-accordion-header" (click)="toggleAccordion()" [ngClass]="{'arrow-right': arrowDirection === accordionArrowDirection.right}">
         <div class="svg-icon-wrapper bottom" [ngClass]="{'down': open}">
diff --git a/src/angular/accordion/accordion.component.ts b/src/angular/accordion/accordion.component.ts
index b16df89..e81597e 100644
--- a/src/angular/accordion/accordion.component.ts
+++ b/src/angular/accordion/accordion.component.ts
@@ -1,10 +1,6 @@
-/**
- * Created by M.S.BIT on 26/04/2018.
- */
-
-import {Component, Input, Output, EventEmitter} from "@angular/core";
-import {Placement} from "../common/enums";
-import template from './accordion.component.html';
+import { Component, Input, Output, EventEmitter } from "@angular/core";
+import { Placement } from "../common/enums";
+import { template } from './accordion.component.html';
 
 @Component({
     selector: 'sdc-accordion',
diff --git a/src/angular/accordion/accordion.module.ts b/src/angular/accordion/accordion.module.ts
index 6cda646..7b3bb95 100644
--- a/src/angular/accordion/accordion.module.ts
+++ b/src/angular/accordion/accordion.module.ts
@@ -1,10 +1,7 @@
-/**
- * Created by M.S.BIT on 26/04/2018.
- */
 import { NgModule } from "@angular/core";
 import { CommonModule } from "@angular/common";
-import {AccordionComponent} from "./accordion.component";
-import {SvgIconModule} from "../svg-icon/svg-icon.module";
+import { AccordionComponent } from "./accordion.component";
+import { SvgIconModule } from "../svg-icon/svg-icon.module";
 
 @NgModule({
     declarations: [
diff --git a/src/angular/autocomplete/autocomplete.component.html.ts b/src/angular/autocomplete/autocomplete.component.html.ts
index 5df7352..8e57f9e 100644
--- a/src/angular/autocomplete/autocomplete.component.html.ts
+++ b/src/angular/autocomplete/autocomplete.component.html.ts
@@ -1,4 +1,4 @@
-export default `
+export const template = `
 <div class="sdc-autocomplete-container" [ngClass]="{'results-shown': autoCompleteResults.length}">
     <sdc-filter-bar
         [placeholder]="placeholder"
diff --git a/src/angular/autocomplete/autocomplete.component.ts b/src/angular/autocomplete/autocomplete.component.ts
index 5570eff..45718b2 100644
--- a/src/angular/autocomplete/autocomplete.component.ts
+++ b/src/angular/autocomplete/autocomplete.component.ts
@@ -1,15 +1,10 @@
-import { OnInit, animate, Component, EventEmitter, Input, Output, state, style, transition, trigger } from '@angular/core';
-import { FilterBarComponent } from "../filterbar/filter-bar.component";
-import { URLSearchParams, Http } from "@angular/http";
+import { OnInit, Component, EventEmitter, Input, Output } from '@angular/core';
+import { animate, state, style, transition, trigger } from '@angular/animations';
 import { AutocompletePipe } from "./autocomplete.pipe";
-import template from "./autocomplete.component.html";
+import { template } from "./autocomplete.component.html";
+import { HttpClient, HttpParams } from '@angular/common/http';
 import 'rxjs/add/operator/map';
 
-export interface IDataSchema {
-    key: string;
-    value: string;
-}
-
 @Component({
     selector: 'sdc-autocomplete',
     template: template,
@@ -25,10 +20,9 @@
             })),
             transition('* => *', animate('200ms'))
         ]),
-    ],
-    providers: [AutocompletePipe]
+    ]
 })
-export class SearchWithAutoCompleteComponent implements OnInit {
+export class AutoCompleteComponent implements OnInit {
     @Input() public data: any[] = [];
     @Input() public dataSchema: IDataSchema;
     @Input() public dataUrl: string;
@@ -36,12 +30,12 @@
     @Input() public placeholder: string;
     @Output() public itemSelected: EventEmitter<any> = new EventEmitter<any>();
 
-    private searchQuery: string;
+    public searchQuery: string;
     private complexData: any[] = [];
-    private autoCompleteResults: any[] = [];
+    public autoCompleteResults: any[] = [];
     private isItemSelected: boolean = false;
 
-    public constructor(private http: Http, private autocompletePipe: AutocompletePipe) {
+    public constructor(private http: HttpClient, private autocompletePipe: AutocompletePipe) {
     }
 
     public ngOnInit(): void {
@@ -82,18 +76,18 @@
         this.itemSelected.emit(selectedItem.key);
     }
 
-    private onSearchQueryChanged = (searchText: string): void => {
+    public onSearchQueryChanged = (searchText: string): void => {
         if (searchText !== this.searchQuery) {
             this.searchQuery = searchText;
             if (!this.searchQuery) {
                 this.onClearSearch();
             } else {
                 if (this.dataUrl) {
-                    const params: URLSearchParams = new URLSearchParams();
-                    params.set('searchQuery', this.searchQuery);
-                    this.http.get(this.dataUrl, {search: params})
+                    const params = new HttpParams();
+                    params.append('searchQuery', this.searchQuery);
+                    this.http.get(this.dataUrl, {params})
                         .map((response) => {
-                            this.data = response.json();
+                            this.data = JSON.parse(JSON.stringify(response));
                             this.handleLocalData();
                             this.autoCompleteResults = this.complexData;
                         }).subscribe();
@@ -112,3 +106,8 @@
         }
     }
 }
+
+export interface IDataSchema {
+    key: string;
+    value: string;
+}
diff --git a/src/angular/autocomplete/autocomplete.module.ts b/src/angular/autocomplete/autocomplete.module.ts
index 1bead47..f105669 100644
--- a/src/angular/autocomplete/autocomplete.module.ts
+++ b/src/angular/autocomplete/autocomplete.module.ts
@@ -1,23 +1,26 @@
 import { NgModule } from "@angular/core";
-import { SearchWithAutoCompleteComponent } from "./autocomplete.component";
+import { AutoCompleteComponent } from "./autocomplete.component";
 import { CommonModule } from "@angular/common";
 import { FilterBarModule } from "../filterbar/filter-bar.module";
 import { AutocompletePipe } from "./autocomplete.pipe";
-import { HttpModule } from '@angular/http';
+import { BrowserModule } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
 @NgModule({
     declarations: [
-        SearchWithAutoCompleteComponent,
+        AutoCompleteComponent,
         AutocompletePipe
     ],
     imports: [
+        BrowserModule,
+        BrowserAnimationsModule,
         FilterBarModule,
-        CommonModule,
-        HttpModule
+        CommonModule
     ],
     exports: [
-        SearchWithAutoCompleteComponent
-    ],
+        AutoCompleteComponent,
+        AutocompletePipe
+    ]
 })
 export class AutoCompleteModule {
 }
diff --git a/src/angular/buttons/button-file-opener.component.html.ts b/src/angular/buttons/button-file-opener.component.html.ts
new file mode 100644
index 0000000..dd24be3
--- /dev/null
+++ b/src/angular/buttons/button-file-opener.component.html.ts
@@ -0,0 +1,18 @@
+export const template = `
+<div (click)="fileOpener.click()" 
+     class="sdc-button sdc-button__{{ type }} btn-{{ size }} {{ iconPositionClass }}"
+     [attr.data-tests-id]="testId"
+     >
+    {{ text }}
+    <input
+        #fileOpener
+        type="file"
+        [accept]="allowedExtensions" 
+        [disabled] = "disabled"
+        (change)="onFileSelect($event)"
+        base-sixty-four-input
+    />
+</div>
+`;
+
+// base-sixty-four-input
diff --git a/src/angular/buttons/button-file-opener.component.ts b/src/angular/buttons/button-file-opener.component.ts
new file mode 100644
index 0000000..399eb9a
--- /dev/null
+++ b/src/angular/buttons/button-file-opener.component.ts
@@ -0,0 +1,61 @@
+import { Component, Input, Output, EventEmitter, HostBinding, ViewChild, AfterViewInit } from '@angular/core';
+import { ButtonComponent } from './button.component';
+import { template } from "./button-file-opener.component.html";
+
+export class FileObject {
+    filesize: string;
+    filetype: string;
+    filename: string;
+    base64: string;
+}
+
+@Component({
+    selector: "sdc-button-file-opener",
+    template: template,
+    styles: [`
+        input[type=file] {
+            display: none;
+        }
+    `]
+})
+export class ButtonFileOpenerComponent extends ButtonComponent implements AfterViewInit {
+
+    @Input() public extensions: string;
+    @Output() public fileUpload: EventEmitter<any>;
+    @HostBinding('class.sdc-button__wrapper') true;
+
+    public allowedExtensions: string;
+    private fileObject: FileObject;
+
+    constructor() {
+        super();
+        this.fileUpload = new EventEmitter<any>();
+        this.fileObject = new FileObject();
+    }
+
+    ngAfterViewInit() : void {
+        this.allowedExtensions = this.extensions && this.extensions.split(',').map(x => '.' + x).join(',');
+    }
+
+    public onFileSelectaa(event): void {
+        let file = event.srcElement.files[0];
+        debugger
+        this.fileUpload.emit({file: file});
+    }
+
+    public onFileSelect(e): void {
+        var file = e.dataTransfer ? e.dataTransfer.files[0] : e.target.files[0];
+        var reader = new FileReader();
+        this.fileObject.filesize = file.size;
+        this.fileObject.filetype = file.type;
+        this.fileObject.filename = file.name;
+        reader.onload = this._handleReaderLoaded.bind(this);
+        reader.readAsDataURL(file);
+    }
+    private _handleReaderLoaded(e) {
+        let base64 = e.target.result;
+        this.fileObject.base64 = base64.split('base64,')[1];
+        this.fileUpload.emit(this.fileObject);
+    }
+
+}
diff --git a/src/angular/buttons/button.component.html.ts b/src/angular/buttons/button.component.html.ts
index f903fd1..33a630a 100644
--- a/src/angular/buttons/button.component.html.ts
+++ b/src/angular/buttons/button.component.html.ts
@@ -1,11 +1,11 @@
-export default `
+export const template = `
 <button class="sdc-button sdc-button__{{ type }} btn-{{ size }} {{ iconPositionClass }}"
         [disabled] = "disabled || show_spinner"
         [attr.data-tests-id]="testId">
         <svg-icon
                 *ngIf="icon_name"
                 [name]="icon_name"
-                [mode]="iconMode"
+                [mode]="type"
                 [size]="'medium'"
                 >
         </svg-icon>
diff --git a/src/angular/buttons/button.component.ts b/src/angular/buttons/button.component.ts
index 1f049dc..d57c5f1 100644
--- a/src/angular/buttons/button.component.ts
+++ b/src/angular/buttons/button.component.ts
@@ -1,16 +1,17 @@
 import { Component, HostBinding, Input, OnInit } from "@angular/core";
-import { Placement } from "../common/enums";
-import template from "./button.component.html";
+import { Placement, ButtonType } from "../common/enums";
+import { IButtonComponent } from './ibutton.interface';
+import { template } from "./button.component.html";
 
 @Component({
     selector: "sdc-button",
     template: template
 })
 
-export class ButtonComponent implements OnInit {
+export class ButtonComponent implements OnInit, IButtonComponent {
     @Input() public text: string;
     @Input() public disabled: boolean;
-    @Input() public type: string;
+    @Input() public type: ButtonType;
     @Input() public size: string;
     @Input() public preventDoubleClick: boolean;
     @Input() public icon_name: string;
@@ -21,21 +22,18 @@
 
     public placement = Placement;
     private lastClick: Date;
-    private iconPositionClass: string;
-    private iconMode: string;
+    public iconPositionClass: string;
 
     @HostBinding('class.sdc-button__wrapper') true;
 
     constructor() {
-        this.type = "primary";
+        this.type = ButtonType.primary;
         this.size = "default";
         this.disabled = false;
-        this.iconMode = 'primary';
     }
 
     public ngOnInit(): void {
         this.iconPositionClass = this.icon_position ? 'sdc-icon-' + this.icon_position : '';
-        this.iconMode = (this.type === "primary") ? 'info' : 'primary';
     }
 
     public onClick = (e): void => {
diff --git a/src/angular/buttons/buttons.module.ts b/src/angular/buttons/buttons.module.ts
index c804758..5c6bdc8 100644
--- a/src/angular/buttons/buttons.module.ts
+++ b/src/angular/buttons/buttons.module.ts
@@ -2,18 +2,20 @@
 import { ButtonComponent } from "./button.component";
 import { CommonModule } from "@angular/common";
 import { SvgIconModule } from './../svg-icon/svg-icon.module';
+import { ButtonFileOpenerComponent } from './button-file-opener.component';
 
 @NgModule({
     declarations: [
-        ButtonComponent
+        ButtonComponent,
+        ButtonFileOpenerComponent
     ],
     imports: [
         CommonModule,
         SvgIconModule
     ],
     exports: [
-        ButtonComponent
-
+        ButtonComponent,
+        ButtonFileOpenerComponent
     ],
 })
 export class ButtonsModule {
diff --git a/src/angular/buttons/ibutton.interface.ts b/src/angular/buttons/ibutton.interface.ts
new file mode 100644
index 0000000..289935b
--- /dev/null
+++ b/src/angular/buttons/ibutton.interface.ts
@@ -0,0 +1,14 @@
+import { Placement, ButtonType } from "../common/enums";
+
+export interface IButtonComponent {
+    text: string;
+    disabled?: boolean;
+    type?: ButtonType;
+    testId?: string;
+    preventDoubleClick?: boolean;
+    icon_name?: string;
+    icon_position?: string;
+    show_spinner?: boolean;
+    spinner_position?: Placement;
+    size?: string;
+}
diff --git a/src/angular/checklist/checklist.component.html.ts b/src/angular/checklist/checklist.component.html.ts
index cb6f540..c48d8eb 100644
--- a/src/angular/checklist/checklist.component.html.ts
+++ b/src/angular/checklist/checklist.component.html.ts
@@ -1,4 +1,4 @@
-export default `
+export const template = `
 <div *ngFor="let checkbox of checklistModel.checkboxes" #currentCheckbox>
     <div class="checkbox-item">
         <sdc-checkbox [label]="checkbox.label"
diff --git a/src/angular/checklist/checklist.component.ts b/src/angular/checklist/checklist.component.ts
index 386cd3e..b512378 100644
--- a/src/angular/checklist/checklist.component.ts
+++ b/src/angular/checklist/checklist.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
 import { ChecklistModel } from "./models/Checklist";
 import { ChecklistItemModel } from "./models/ChecklistItem";
-import template from "./checklist.component.html";
+import { template } from "./checklist.component.html";
 
 @Component({
     selector: 'sdc-checklist',
@@ -15,7 +15,7 @@
         // push/pop the checkbox value
         if (checkbox.isChecked) {
             currentChecklistModel.selectedValues.push(checkbox.value);
-        }else {
+        } else {
             const index: number = currentChecklistModel.selectedValues.indexOf(checkbox.value);
             currentChecklistModel.selectedValues.splice(index, 1);
         }
diff --git a/src/angular/checklist/models/ChecklistItem.ts b/src/angular/checklist/models/ChecklistItem.ts
index e2d812a..7b1b321 100644
--- a/src/angular/checklist/models/ChecklistItem.ts
+++ b/src/angular/checklist/models/ChecklistItem.ts
@@ -6,11 +6,13 @@
     public value: any;
     public disabled: boolean;
     public isChecked: boolean;
+    public testId: string;
     public subLevelChecklist: ChecklistModel;
-    constructor(label: string, disabled?: boolean, isChecked?: boolean, subLevelChecklist?: ChecklistModel, value?: any) {
+    constructor(label: string, disabled?: boolean, isChecked?: boolean, subLevelChecklist?: ChecklistModel, testId?: string, value?: any) {
         this.label = label;
         this.disabled = disabled;
         this.isChecked = isChecked;
+        this.testId = testId;
         this.value = isUndefined(value) ? label : value;
         this.subLevelChecklist = subLevelChecklist;
     }
diff --git a/src/angular/common/enums.ts b/src/angular/common/enums.ts
index 0825d2f..07c1a2b 100644
--- a/src/angular/common/enums.ts
+++ b/src/angular/common/enums.ts
@@ -12,12 +12,37 @@
     x_small = 'x_small'
 }
 
+export enum BackgroundShape {
+    circle = 'circle',
+    rectangle = 'rectangle'
+}
+
+export enum BackgroundColor {
+    primary = 'primary',
+    secondary = 'secondary',
+    success = 'success',
+    error = 'error',
+    warning = 'warning',
+    info = 'info'
+}
+
+// TODO: Replace this with type
 export enum Mode {
     primary = 'primary',
     secondary = 'secondary',
     success = 'success',
     error = 'error',
     warning = 'warning',
+    info = 'info',
+    white = 'white'
+}
+
+export enum ButtonType {
+    primary = 'primary',
+    secondary = 'secondary',
+    success = 'success',
+    error = 'error',
+    warning = 'warning',
     info = 'info'
 }
 
diff --git a/src/angular/common/index.ts b/src/angular/common/index.ts
index 839eba9..81d39b1 100644
--- a/src/angular/common/index.ts
+++ b/src/angular/common/index.ts
@@ -1,3 +1,4 @@
-import * as SdcUiCommon from './enums';
-
-export { SdcUiCommon };
+export * from './enums';
+export * from '../modals/models/modal-config';
+export * from '../checklist/models/Checklist';
+export * from '../checklist/models/ChecklistItem';
diff --git a/src/angular/components.ts b/src/angular/components.ts
index 8e06197..006bdf7 100644
--- a/src/angular/components.ts
+++ b/src/angular/components.ts
@@ -1,25 +1,25 @@
 /*
- Exports all the components and services of sdc-ui.
+ Exports all the components of onap-ui-angular.
  */
 
 // Form Elements
-export { InputComponent } from "./form-elements/input/input.component";
+export { InputComponent } from "./form-elements/text-elements/input/input.component";
 export { DropDownComponent } from "./form-elements/dropdown/dropdown.component";
 export { CheckboxComponent } from "./form-elements/checkbox/checkbox.component";
 export { RadioGroupComponent } from "./form-elements/radios/radio-buttons-group.component";
+export { TextareaComponent } from "./form-elements/text-elements/textarea/textarea.component";
 
 // Buttons
 export { ButtonComponent } from "./buttons/button.component";
+export { ButtonFileOpenerComponent } from "./buttons/button-file-opener.component";
 
 // Modals
 export { ModalComponent } from "./modals/modal.component";
-export { ModalService } from "./modals/modal.service";
 export { ModalButtonComponent } from "./modals/modal-button.component";
 
 // Notifications
 export { NotificationComponent } from "./notifications/notification/notification.component";
 export { NotificationContainerComponent } from "./notifications/container/notifcontainer.component";
-export { NotificationsService } from "./notifications/services/notifications.service";
 
 // Popup Menu
 export { PopupMenuListComponent } from "./popup-menu/popup-menu-list.component";
@@ -48,3 +48,25 @@
 
 // Accordion
 export { AccordionComponent } from './accordion/accordion.component';
+
+// Multiline Ellipsis
+export { MultilineEllipsisComponent } from './multiline-ellipsis/multiline-ellipsis.component';
+
+// AutoComplete
+export { AutoCompleteComponent } from './autocomplete/autocomplete.component';
+export { AutocompletePipe } from './autocomplete/autocomplete.pipe';
+
+// Filter
+export { FilterBarComponent } from './filterbar/filter-bar.component';
+
+// Infinite Scroll
+export { InfiniteScrollDirective } from './infinite-scroll/infinite-scroll.directive';
+
+// Loader
+export { LoaderComponent } from './loader/loader.component';
+
+// Searchbar
+export { SearchBarComponent } from './searchbar/search-bar.component';
+
+// Tooltip
+export { TooltipDirective } from "./tooltip/tooltip.directive";
diff --git a/src/angular/favicon.ico b/src/angular/favicon.ico
new file mode 100644
index 0000000..8081c7c
--- /dev/null
+++ b/src/angular/favicon.ico
Binary files differ
diff --git a/src/angular/filterbar/filter-bar.component.html.ts b/src/angular/filterbar/filter-bar.component.html.ts
index a7d55e2..ca1c837 100644
--- a/src/angular/filterbar/filter-bar.component.html.ts
+++ b/src/angular/filterbar/filter-bar.component.html.ts
@@ -1,4 +1,4 @@
-export default `
+export const template = `
 <div class="search-bar-container">
     <sdc-input class="search-bar-input"
                [label]="label"
diff --git a/src/angular/filterbar/filter-bar.component.ts b/src/angular/filterbar/filter-bar.component.ts
index 49cc154..fa3eac4 100644
--- a/src/angular/filterbar/filter-bar.component.ts
+++ b/src/angular/filterbar/filter-bar.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, Output, EventEmitter, HostBinding } from '@angular/core';
-import template from "./filter-bar.component.html";
+import { template } from "./filter-bar.component.html";
 
 @Component({
     selector: 'sdc-filter-bar',
@@ -12,7 +12,6 @@
     @Input() public placeholder: string;
     @Input() public label: string;
     @Input() public debounceTime: number;
-
     @Input() public searchQuery: string;
     @Output() public searchQueryChange: EventEmitter<any> = new EventEmitter<any>();
 
@@ -20,7 +19,7 @@
         this.debounceTime = 200;
     }
 
-    private searchTextChange = ($event): void => {
+    public searchTextChange = ($event): void => {
         this.searchQueryChange.emit($event);
     }
 
diff --git a/src/angular/filterbar/filter-bar.module.ts b/src/angular/filterbar/filter-bar.module.ts
index c3604ed..f03caed 100644
--- a/src/angular/filterbar/filter-bar.module.ts
+++ b/src/angular/filterbar/filter-bar.module.ts
@@ -7,8 +7,10 @@
     declarations: [
         FilterBarComponent
     ],
-    imports: [CommonModule,
-        FormElementsModule],
+    imports: [
+        CommonModule,
+        FormElementsModule
+    ],
     exports: [
         FilterBarComponent
     ],
diff --git a/src/angular/form-elements/checkbox/checkbox.component.html.ts b/src/angular/form-elements/checkbox/checkbox.component.html.ts
index f4031db..3fdd53f 100644
--- a/src/angular/form-elements/checkbox/checkbox.component.html.ts
+++ b/src/angular/form-elements/checkbox/checkbox.component.html.ts
@@ -1,7 +1,7 @@
-export default `
+export const template = `
 <div class="sdc-checkbox">
     <label SdcRippleClickAnimation [rippleClickDisabled]="disabled">
-        <input type="checkbox" class="sdc-checkbox__input" [ngModel]="checked" (ngModelChange)="toggleState($event)" [disabled]="disabled">
+        <input type="checkbox" class="sdc-checkbox__input" [ngModel]="checked" (ngModelChange)="toggleState($event)" [disabled]="disabled" [attr.data-tests-id]="testId">
         <span class="sdc-checkbox__label">{{ label }}</span>
     </label>
 </div>
diff --git a/src/angular/form-elements/checkbox/checkbox.component.spec.ts b/src/angular/form-elements/checkbox/checkbox.component.spec.ts
index 36f478e..8fc63e2 100644
--- a/src/angular/form-elements/checkbox/checkbox.component.spec.ts
+++ b/src/angular/form-elements/checkbox/checkbox.component.spec.ts
@@ -3,7 +3,6 @@
 import { AnimationDirectivesModule } from "../../animations/animation-directives.module";
 import { FormsModule } from "@angular/forms";
 
-
 describe("Checbox Tests", ()=>{
     let component: CheckboxComponent;
     beforeEach(async(() => {
diff --git a/src/angular/form-elements/checkbox/checkbox.component.ts b/src/angular/form-elements/checkbox/checkbox.component.ts
index ec05eac..2b50e6d 100644
--- a/src/angular/form-elements/checkbox/checkbox.component.ts
+++ b/src/angular/form-elements/checkbox/checkbox.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, Output, EventEmitter, ViewEncapsulation } from '@angular/core';
-import template from "./checkbox.component.html";
+import { template } from "./checkbox.component.html";
 
 @Component({
     selector: 'sdc-checkbox',
@@ -10,6 +10,7 @@
     @Input() label:string;
     @Input() checked:boolean;
     @Input() disabled:boolean;
+    @Input() testId: string;
     @Output() checkedChange:EventEmitter<any> = new EventEmitter<any>();
 
     public toggleState(newState:boolean) {
diff --git a/src/angular/form-elements/dropdown/dropdown-models.ts b/src/angular/form-elements/dropdown/dropdown-models.ts
index fa8dc23..a718c07 100644
--- a/src/angular/form-elements/dropdown/dropdown-models.ts
+++ b/src/angular/form-elements/dropdown/dropdown-models.ts
@@ -1,14 +1,14 @@
 export enum DropDownTypes {
-    Regular,
-    Headless,
-    Auto
+    Regular = "Regular",
+    Headless = "Headless",
+    Auto = "Auto"
 }
 
 export enum DropDownOptionType {
-    Simple, // default
-    Header,
-    Disable,
-    HorizontalLine
+    Simple = "Simple", // default
+    Header = "Header",
+    Disable = "Disable",
+    HorizontalLine = "HorizontalLine"
 }
 
 export interface IDropDownOption {
diff --git a/src/angular/form-elements/dropdown/dropdown.component.html.ts b/src/angular/form-elements/dropdown/dropdown.component.html.ts
index a4247a4..36ce17c 100644
--- a/src/angular/form-elements/dropdown/dropdown.component.html.ts
+++ b/src/angular/form-elements/dropdown/dropdown.component.html.ts
@@ -1,4 +1,4 @@
-export default `
+export const template = `
 <div class="sdc-dropdown" #dropDownWrapper
     [ngClass]="{
     'headless': type === cIDropDownTypes.Headless,
diff --git a/src/angular/form-elements/dropdown/dropdown.component.ts b/src/angular/form-elements/dropdown/dropdown.component.ts
index a23072f..33f54ac 100644
--- a/src/angular/form-elements/dropdown/dropdown.component.ts
+++ b/src/angular/form-elements/dropdown/dropdown.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, Output, forwardRef, OnChanges, SimpleChanges, OnInit, ElementRef, ViewChild, AfterViewInit, HostListener, Renderer } from '@angular/core';
 import { IDropDownOption, DropDownOptionType, DropDownTypes } from "./dropdown-models";
 import { ValidatableComponent } from './../validation/validatable.component';
-import template from './dropdown.component.html';
+import { template } from './dropdown.component.html';
 
 @Component({
     selector: 'sdc-dropdown',
@@ -24,7 +24,7 @@
         this.onClickDocument(e);
     }
 
-    private bottomVisible = true;
+    public bottomVisible = true;
     private myRenderer: Renderer;
 
     // Drop-down show/hide flag. default is false (closed)
@@ -57,7 +57,9 @@
     ngOnInit(): void {
         if (this.options) {
             this.allOptions = this.options;
-            if (this.options.find(option => option.type === DropDownOptionType.Header)) {
+            // To support ES5
+            if (this.options.filter(option => option.type === DropDownOptionType.Header).length>0) {
+            // if (this.options.find(option => option.type === DropDownOptionType.Header)) {
                 this.isGroupDesign = true;
             }
         }
@@ -114,14 +116,20 @@
     }
 
     private isSelectable = (value: string): boolean => {
-        const option: IDropDownOption = this.options.find(o => o.value === value);
+        // Support ES5
+        // const option: IDropDownOption = this.options.find(o => o.value === value);
+        const option: IDropDownOption = this.options.filter(o => o.value === value)[0];
         if (!option) { return false; }
         if (!option.type) { return true; }
-        return !this.unselectableOptions.find(optionType => optionType === option.type);
+        // Support ES5
+        // return !this.unselectableOptions.find(optionType => optionType === option.type);
+        return !this.unselectableOptions.filter(optionType => optionType === option.type)[0];
     }
 
     private setSelected = (value: string): void => {
-        this.selectedOption = this.options.find(o => o.value === value);
+        // Support ES5
+        // this.selectedOption = this.options.find(o => o.value === value);
+        this.selectedOption = this.options.filter(o => o.value === value)[0];
         if (this.type === DropDownTypes.Auto) { this.filterValue = value; }
         this.show = false;
         this.changeEmitter.next(this.selectedOption);
diff --git a/src/angular/form-elements/form-elements.module.ts b/src/angular/form-elements/form-elements.module.ts
index 744f8b8..d290eda 100644
--- a/src/angular/form-elements/form-elements.module.ts
+++ b/src/angular/form-elements/form-elements.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 import { FormsModule, ReactiveFormsModule } from "@angular/forms";
-import { InputComponent } from "./input/input.component";
+import { InputComponent } from "./text-elements/input/input.component";
 import { DropDownComponent } from "./dropdown/dropdown.component";
 import { CommonModule } from "@angular/common";
 import { CheckboxComponent } from "./checkbox/checkbox.component";
@@ -9,6 +9,7 @@
 import { DropDownTriggerDirective } from "./dropdown/dropdown-trigger.directive";
 import {SvgIconModule} from "../svg-icon/svg-icon.module";
 import { ValidationModule } from './validation/validation.module';
+import {TextareaComponent} from "./text-elements/textarea/textarea.component";
 
 @NgModule({
     imports: [
@@ -24,6 +25,7 @@
         CheckboxComponent,
         RadioGroupComponent,
         DropDownTriggerDirective,
+        TextareaComponent
     ],
     exports: [
         DropDownComponent,
@@ -31,7 +33,8 @@
         InputComponent,
         CheckboxComponent,
         RadioGroupComponent,
-        ValidationModule
+        ValidationModule,
+        TextareaComponent
     ]
 })
 export class FormElementsModule {
diff --git a/src/angular/form-elements/radios/radio-buttons-group.component.html.ts b/src/angular/form-elements/radios/radio-buttons-group.component.html.ts
index 28a27af..a0026f2 100644
--- a/src/angular/form-elements/radios/radio-buttons-group.component.html.ts
+++ b/src/angular/form-elements/radios/radio-buttons-group.component.html.ts
@@ -1,7 +1,7 @@
-export default `
+export const template = `
 <label class='sdc-radio-group__legend'>{{legend}}</label>
 <div class='sdc-radio-group__radios {{direction}}'>
-    <template *ngFor="let item of options.items">
+    <div *ngFor="let item of options.items">
         <div class="sdc-radio">
             <label class="sdc-radio__animation-wrapper" SdcRippleClickAnimation [rippleClickDisabled]="disabled">
                 <input class="sdc-radio__input"
@@ -15,6 +15,6 @@
                 <span class="sdc-radio__label">{{ item.label }}</span>
             </label>
         </div>
-    </template>
+    </div>
 </div>
 `;
diff --git a/src/angular/form-elements/radios/radio-buttons-group.component.ts b/src/angular/form-elements/radios/radio-buttons-group.component.ts
index 800d8b0..9fa6b7d 100644
--- a/src/angular/form-elements/radios/radio-buttons-group.component.ts
+++ b/src/angular/form-elements/radios/radio-buttons-group.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, Output, ViewEncapsulation, EventEmitter, HostBinding } from "@angular/core";
 import { Direction, IOptionGroup, IRadioButtonModel } from "./radio-button.model";
-import template from './radio-buttons-group.component.html';
+import { template } from './radio-buttons-group.component.html';
 
 @Component({
     selector: 'sdc-radio-group',
@@ -43,9 +43,11 @@
     }
 
     private isOptionExists(value) {
-        const exist = this.options.items.find((item: IRadioButtonModel) => {
+        // Support ES5
+        // const exist = this.options.items.find((item: IRadioButtonModel) => {
+        const exist = this.options.items.filter((item: IRadioButtonModel) => {
             return item.value === value;
-        });
+        })[0];
         return exist !== undefined;
     }
 
diff --git a/src/angular/form-elements/input/input.component.ts b/src/angular/form-elements/text-elements/base-text-element.component.ts
similarity index 70%
rename from src/angular/form-elements/input/input.component.ts
rename to src/angular/form-elements/text-elements/base-text-element.component.ts
index af0e9f4..a87238f 100644
--- a/src/angular/form-elements/input/input.component.ts
+++ b/src/angular/form-elements/text-elements/base-text-element.component.ts
@@ -1,15 +1,9 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { FormControl } from "@angular/forms";
-import { ValidationComponent } from '../validation/validation.component';
-import { ValidatableComponent } from './../validation/validatable.component';
+import { ValidatableComponent } from "../validation/validatable.component";
 import 'rxjs/add/operator/debounceTime';
-import template from "./input.component.html";
 
-@Component({
-    selector: 'sdc-input',
-    template: template,
-})
-export class InputComponent extends ValidatableComponent implements OnInit {
+export class BaseTextElementComponent extends ValidatableComponent implements OnInit {
 
     @Output('valueChange') public baseEmitter: EventEmitter<any> = new EventEmitter<any>();
     @Input() public label: string;
@@ -17,7 +11,6 @@
     @Input() public name: string;
     @Input() public classNames: string;
     @Input() public disabled: boolean;
-    @Input() public type: string;
     @Input() public placeHolder: string;
     @Input() public required: boolean;
     @Input() public minLength: number;
@@ -25,19 +18,18 @@
     @Input() public debounceTime: number;
     @Input() public testId: string;
 
-    protected control: FormControl;
+    public control: FormControl;
 
     constructor() {
         super();
         this.control = new FormControl('', []);
         this.debounceTime = 0;
         this.placeHolder = '';
-        this.type = 'text';
     }
 
     ngOnInit() {
         this.control.valueChanges.
-        debounceTime(this.debounceTime)
+            debounceTime(this.debounceTime)
             .subscribe((newValue: any) => {
                 this.baseEmitter.emit(this.value);
             });
diff --git a/src/angular/form-elements/input/input.component.html.ts b/src/angular/form-elements/text-elements/input/input.component.html.ts
similarity index 85%
rename from src/angular/form-elements/input/input.component.html.ts
rename to src/angular/form-elements/text-elements/input/input.component.html.ts
index f8a4609..bb5d788 100644
--- a/src/angular/form-elements/input/input.component.html.ts
+++ b/src/angular/form-elements/text-elements/input/input.component.html.ts
@@ -1,9 +1,9 @@
-export default `
+export const template = `
 <div class="sdc-input ">
     <label class="sdc-input__label" *ngIf="label" [ngClass]="{'required':required}">{{label}}</label>
     <input
         class="sdc-input__input {{classNames}}"
-        [ngClass]="{'error': !valid, 'disabled':disabled}"
+        [ngClass]="{'error': (!valid && dirty), 'disabled':disabled}"
         [attr.name]="name ? name : null"
         [placeholder]="placeHolder"
         [(ngModel)]="value"
diff --git a/src/angular/form-elements/text-elements/input/input.component.ts b/src/angular/form-elements/text-elements/input/input.component.ts
new file mode 100644
index 0000000..48b177b
--- /dev/null
+++ b/src/angular/form-elements/text-elements/input/input.component.ts
@@ -0,0 +1,18 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { template } from "./input.component.html";
+import { BaseTextElementComponent } from "../base-text-element.component";
+import 'rxjs/add/operator/debounceTime';
+
+@Component({
+    selector: 'sdc-input',
+    template: template,
+})
+export class InputComponent extends BaseTextElementComponent {
+    @Input() public type: string;
+
+    constructor() {
+        super();
+        this.type = 'text';
+    }
+
+}
diff --git a/src/angular/form-elements/text-elements/textarea/textarea.component.html.ts b/src/angular/form-elements/text-elements/textarea/textarea.component.html.ts
new file mode 100644
index 0000000..7e976b2
--- /dev/null
+++ b/src/angular/form-elements/text-elements/textarea/textarea.component.html.ts
@@ -0,0 +1,18 @@
+export const template = `
+<div class="sdc-textarea">
+    <label class="sdc-textarea__label" *ngIf="label" [ngClass]="{'required':required}">{{label}}</label>
+    <textarea
+        class="sdc-textarea__textarea {{classNames}}"
+        [ngClass]="{'error': (!valid && dirty), 'disabled':disabled}"
+        [attr.name]="name ? name : null"
+        [placeholder]="placeHolder"
+        [(ngModel)]="value"
+        [maxlength]="maxLength"
+        [minlength]="minLength"
+        [formControl]="control"
+        [attr.disabled]="disabled ? 'disabled' : null"
+        (input)="onKeyPress($event.target.value)"
+        [attr.data-tests-id]="testId">
+    </textarea>
+</div>
+`;
diff --git a/src/angular/form-elements/text-elements/textarea/textarea.component.ts b/src/angular/form-elements/text-elements/textarea/textarea.component.ts
new file mode 100644
index 0000000..e8f0700
--- /dev/null
+++ b/src/angular/form-elements/text-elements/textarea/textarea.component.ts
@@ -0,0 +1,14 @@
+import { Component } from "@angular/core";
+import { template } from './textarea.component.html';
+import { BaseTextElementComponent } from "../base-text-element.component";
+
+@Component({
+    selector: 'sdc-textarea',
+    template: template,
+})
+
+export class TextareaComponent extends BaseTextElementComponent {
+    constructor() {
+        super();
+    }
+}
diff --git a/src/angular/form-elements/validation/validatable.component.ts b/src/angular/form-elements/validation/validatable.component.ts
index 4817dea..3201e0b 100644
--- a/src/angular/form-elements/validation/validatable.component.ts
+++ b/src/angular/form-elements/validation/validatable.component.ts
@@ -1,24 +1,24 @@
-import { Input, Component } from "@angular/core";
-import { ValidationComponent } from './validation.component';
 import { Subject } from 'rxjs/Subject';
 import { IValidatableComponent } from './validatable.interface';
 
 export abstract class ValidatableComponent implements IValidatableComponent {
 
     // Each ValidatableComponent should handle the style in case of error, according to this boolean
-    public valid = true;
-
+    public valid: boolean;
+    public dirty: boolean;
     // Each ValidatableComponent will notify when the value is changed.
     public notifier: Subject<string>;
 
     constructor() {
         this.notifier = new Subject();
+        this.dirty = false;
     }
 
     public abstract getValue(): any;
 
     // Each ValidatableComponent should call the valueChanged on value changed function.
     protected valueChanged = (value: any): void => {
+        this.dirty = true;
         this.notifier.next(value);
     }
 
diff --git a/src/angular/form-elements/validation/validation-group.component.html.ts b/src/angular/form-elements/validation/validation-group.component.html.ts
index dff591e..4e5e362 100644
--- a/src/angular/form-elements/validation/validation-group.component.html.ts
+++ b/src/angular/form-elements/validation/validation-group.component.html.ts
@@ -1,3 +1,3 @@
-export default `
+export const template = `
 <ng-content></ng-content>
 `;
diff --git a/src/angular/form-elements/validation/validation-group.component.ts b/src/angular/form-elements/validation/validation-group.component.ts
index 59ecf4c..4231bbf 100644
--- a/src/angular/form-elements/validation/validation-group.component.ts
+++ b/src/angular/form-elements/validation/validation-group.component.ts
@@ -1,15 +1,7 @@
 import { Input, Component, ContentChildren, EventEmitter, Output, QueryList, SimpleChanges, HostBinding, AfterContentInit } from "@angular/core";
-import { AbstractControl, FormControl } from "@angular/forms";
-import { Subscribable } from "rxjs/Observable";
-import { AnonymousSubscription } from "rxjs/Subscription";
-import { IValidator } from './validators/validator.interface';
 import { ValidatorComponent } from './validators/base.validator.component';
-import { RegexValidatorComponent } from './validators/regex.validator.component';
-import { RequiredValidatorComponent } from './validators/required.validator.component';
-import { ValidatableComponent } from './validatable.component';
 import { ValidationComponent } from './validation.component';
-import { CustomValidatorComponent } from './validators/custom.validator.component';
-import template from "./validation.component.html";
+import { template } from "./validation-group.component.html";
 
 @Component({
     selector: 'sdc-validation-group',
@@ -37,7 +29,7 @@
         let validationResult = true;
         // Iterate over all validationComponent inside the group and return boolean result true in case all validations passed.
         this.validationsComponents.forEach((validationComponent) => {
-            if (validationComponent.validate()) {
+            if (!validationComponent.validate()) {
                 validationResult = false;
             }
         });
diff --git a/src/angular/form-elements/validation/validation.component.html.ts b/src/angular/form-elements/validation/validation.component.html.ts
index 0f11a23..438cec1 100644
--- a/src/angular/form-elements/validation/validation.component.html.ts
+++ b/src/angular/form-elements/validation/validation.component.html.ts
@@ -1,3 +1,3 @@
-export default `
-<ng-content *ngIf="!disabled"></ng-content>
+export const template = `
+<ng-content *ngIf="!disabled && (validateElement && validateElement.dirty)"></ng-content>
 `;
diff --git a/src/angular/form-elements/validation/validation.component.ts b/src/angular/form-elements/validation/validation.component.ts
index 4abdd12..289aeda 100644
--- a/src/angular/form-elements/validation/validation.component.ts
+++ b/src/angular/form-elements/validation/validation.component.ts
@@ -1,14 +1,10 @@
 import { Input, Component, ContentChildren, EventEmitter, Output, QueryList, SimpleChanges, HostBinding, AfterContentInit } from "@angular/core";
-import { AbstractControl, FormControl } from "@angular/forms";
-import { Subscribable } from "rxjs/Observable";
-import { AnonymousSubscription } from "rxjs/Subscription";
-import { IValidator } from './validators/validator.interface';
 import { ValidatorComponent } from './validators/base.validator.component';
 import { RegexValidatorComponent } from './validators/regex.validator.component';
 import { RequiredValidatorComponent } from './validators/required.validator.component';
 import { ValidatableComponent } from './validatable.component';
 import { CustomValidatorComponent } from './validators/custom.validator.component';
-import template from "./validation.component.html";
+import { template } from "./validation.component.html";
 
 @Component({
     selector: 'sdc-validation',
@@ -47,6 +43,9 @@
             },
             (error) => console.log('Validation subscribe error')
         );
+        // init validateElement.valid.
+        const value = this.validateElement.getValue();
+        this.validateElement.notifier.next(value);
     }
 
     public validate = (): boolean => {
diff --git a/src/angular/form-elements/validation/validation.module.ts b/src/angular/form-elements/validation/validation.module.ts
index 4213f76..a6aa41e 100644
--- a/src/angular/form-elements/validation/validation.module.ts
+++ b/src/angular/form-elements/validation/validation.module.ts
@@ -3,7 +3,6 @@
 import { CommonModule } from "@angular/common";
 import { SvgIconModule } from './../../svg-icon/svg-icon.module';
 import { ValidationComponent } from './validation.component';
-import { ValidatorComponent } from './validators/base.validator.component';
 import { RequiredValidatorComponent } from './validators/required.validator.component';
 import { RegexValidatorComponent } from './validators/regex.validator.component';
 import { CustomValidatorComponent } from './validators/custom.validator.component';
diff --git a/src/angular/form-elements/validation/validators/base.validator.component.html.ts b/src/angular/form-elements/validation/validators/base.validator.component.html.ts
index aba8eed..d96ee3b 100644
--- a/src/angular/form-elements/validation/validators/base.validator.component.html.ts
+++ b/src/angular/form-elements/validation/validators/base.validator.component.html.ts
@@ -1,6 +1,6 @@
-export default `
+export const template = `
 <svg-icon-label
-    *ngIf="!isValid"
+    *ngIf="!isValid && !disabled"
     name="alert-triangle"
     mode="error"
     size="small"
diff --git a/src/angular/form-elements/validation/validators/base.validator.component.ts b/src/angular/form-elements/validation/validators/base.validator.component.ts
index 3d751af..8fd0361 100644
--- a/src/angular/form-elements/validation/validators/base.validator.component.ts
+++ b/src/angular/form-elements/validation/validators/base.validator.component.ts
@@ -1,18 +1,12 @@
 import { Input, Component, ContentChildren, EventEmitter, Output, QueryList, SimpleChanges, HostBinding } from "@angular/core";
-import { IValidator } from './validator.interface';
-import template from "./base.validator.component.html";
 
-@Component({
-    selector: 'sdc-validator',
-    template: template
-})
 export abstract class ValidatorComponent {
 
     @Input() public message: any;
     @Input() public disabled: boolean;
     @HostBinding('class') classes;
 
-    protected isValid: boolean;
+    public isValid: boolean;
 
     constructor() {
         this.disabled = false;
diff --git a/src/angular/form-elements/validation/validators/custom.validator.component.ts b/src/angular/form-elements/validation/validators/custom.validator.component.ts
index eb09636..0ec0e68 100644
--- a/src/angular/form-elements/validation/validators/custom.validator.component.ts
+++ b/src/angular/form-elements/validation/validators/custom.validator.component.ts
@@ -1,7 +1,7 @@
 import { Input, Component } from "@angular/core";
 import { ValidatorComponent } from "./base.validator.component";
 import { IValidator } from './validator.interface';
-import template from "./base.validator.component.html";
+import { template } from "./base.validator.component.html";
 
 @Component({
     selector: 'sdc-custom-validator',
diff --git a/src/angular/form-elements/validation/validators/regex.validator.component.ts b/src/angular/form-elements/validation/validators/regex.validator.component.ts
index 5929016..5a213a9 100644
--- a/src/angular/form-elements/validation/validators/regex.validator.component.ts
+++ b/src/angular/form-elements/validation/validators/regex.validator.component.ts
@@ -1,7 +1,7 @@
 import { Input, Component } from "@angular/core";
 import { ValidatorComponent } from "./base.validator.component";
 import { IValidator } from './validator.interface';
-import template from "./base.validator.component.html";
+import { template } from "./base.validator.component.html";
 
 @Component({
     selector: 'sdc-regex-validator',
diff --git a/src/angular/form-elements/validation/validators/required.validator.component.ts b/src/angular/form-elements/validation/validators/required.validator.component.ts
index 7eee932..fc550ca 100644
--- a/src/angular/form-elements/validation/validators/required.validator.component.ts
+++ b/src/angular/form-elements/validation/validators/required.validator.component.ts
@@ -1,7 +1,7 @@
 import { Input, Component } from "@angular/core";
 import { ValidatorComponent } from "./base.validator.component";
 import { IValidator } from './validator.interface';
-import template from "./base.validator.component.html";
+import { template } from "./base.validator.component.html";
 
 @Component({
     selector: 'sdc-required-validator',
diff --git a/src/angular/index.html b/src/angular/index.html
new file mode 100644
index 0000000..4d9441d
--- /dev/null
+++ b/src/angular/index.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Ng5test</title>
+  <base href="/">
+
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+</head>
+<body>
+  <storybook-app-root></storybook-app-root>
+</body>
+</html>
diff --git a/src/angular/index.ts b/src/angular/index.ts
index e8a54bd..8002604 100644
--- a/src/angular/index.ts
+++ b/src/angular/index.ts
@@ -15,7 +15,9 @@
 import { TooltipModule } from "./tooltip/tooltip.module";
 import { TagCloudModule } from './tag-cloud/tag-cloud.module';
 import { TabsModule } from "./tabs/tabs.module";
+import { LoaderModule } from "./loader/loader.module";
 import { AccordionModule } from "./accordion/accordion.module";
+import { MultilineEllipsisModule } from "./multiline-ellipsis/multiline-ellipsis.module";
 
 @NgModule({
     imports: [
@@ -35,7 +37,9 @@
         SvgIconModule,
         TagCloudModule,
         TabsModule,
-        AccordionModule
+        LoaderModule,
+        AccordionModule,
+        MultilineEllipsisModule
     ],
     exports: [
         AnimationDirectivesModule,
@@ -54,15 +58,32 @@
         SvgIconModule,
         TagCloudModule,
         TabsModule,
-        AccordionModule
+        LoaderModule,
+        AccordionModule,
+        MultilineEllipsisModule
     ]
 })
-export class SdcUiComponentsModule {
-}
-
-import * as SdcUiComponents from './components';
-import * as SdcUiCommon from './common/index';
+export class SdcUiComponentsModule {}
 
 export { SdcUiComponentsNg1Module } from './ng1.module';
+
+import * as SdcUiComponents from './components';
+import * as SdcUiServices from './services';
+import * as SdcUiCommon from './common/index';
+
 export { SdcUiComponents };
+export { SdcUiServices };
 export { SdcUiCommon };
+
+
+
+
+// let components = SdcUiComponents;
+// let services = SdcUiServices;
+// let common = SdcUiCommon
+
+// export const SdcUi = {
+//     components,
+//     services,
+//     common
+// };
diff --git a/src/angular/loader/loader.component.html.ts b/src/angular/loader/loader.component.html.ts
new file mode 100644
index 0000000..074854a
--- /dev/null
+++ b/src/angular/loader/loader.component.html.ts
@@ -0,0 +1,13 @@
+export const template = `
+<div class = "sdc-loader-wrapper" *ngIf="!global">
+    <div class="sdc-loader-background" *ngIf="active">
+        <div class="sdc-loader {{ size }}" *ngIf="active"></div>
+    </div>
+    <ng-content></ng-content>
+</div>
+<div  *ngIf="global&&active">
+    <div class="sdc-loader-global-wrapper sdc-loader-background" >
+        <div class="sdc-loader {{ size }}"></div>
+    </div>
+</div>
+`;
diff --git a/src/angular/loader/loader.component.ts b/src/angular/loader/loader.component.ts
new file mode 100644
index 0000000..353a98c
--- /dev/null
+++ b/src/angular/loader/loader.component.ts
@@ -0,0 +1,53 @@
+import { Component, Input, ViewContainerRef, Inject, OnInit, OnDestroy, Output, EventEmitter } from "@angular/core";
+import { template } from "./loader.component.html";
+import { LoaderService } from "./loader.service";
+
+export enum LoaderSize {
+    large = 'large',
+    medium = 'medium',
+    small = 'small',
+}
+
+@Component({
+    selector: "sdc-loader",
+    template: template
+})
+
+export class LoaderComponent implements OnInit, OnDestroy {
+    @Input() active: number;
+    @Input() size?: LoaderSize; // small || medium || large
+    @Input() global?: boolean; // If is relative is set to true, loader will appear over parent element. Otherwise, will be fixed over the entire page.
+    @Input() name?: string;
+    @Output() activeChange: EventEmitter<number> = new EventEmitter<number>();
+
+    constructor(private loaderService: LoaderService) {
+        this.active = 0;
+        this.size = LoaderSize.large;
+        this.global = false;
+    }
+
+    public ngOnInit(): void {
+        if (this.name !== undefined) {
+            this.loaderService.register(this.name, this);
+        }
+    }
+
+    public ngOnDestroy(): void {
+        if (this.name !== undefined) {
+            this.loaderService.unregister(this.name);
+        }
+    }
+
+    public activate() {
+        this.active++;
+        this.activeChange.emit(this.active);
+    }
+
+    public deactivate() {
+        if (this.active > 0) {
+            this.active--;
+            this.activeChange.emit(this.active);
+        }
+    }
+
+}
diff --git a/src/angular/loader/loader.module.ts b/src/angular/loader/loader.module.ts
new file mode 100644
index 0000000..8914173
--- /dev/null
+++ b/src/angular/loader/loader.module.ts
@@ -0,0 +1,21 @@
+import { NgModule } from "@angular/core";
+import { LoaderComponent } from "./loader.component";
+import { CommonModule } from "@angular/common";
+import { LoaderService } from "./loader.service";
+
+@NgModule({
+    declarations: [
+        LoaderComponent
+    ],
+    imports: [
+        CommonModule,
+    ],
+    exports: [
+        LoaderComponent
+    ],
+    providers: [
+        LoaderService
+    ]
+})
+
+export class LoaderModule {}
diff --git a/src/angular/loader/loader.service.ts b/src/angular/loader/loader.service.ts
new file mode 100644
index 0000000..288f9bd
--- /dev/null
+++ b/src/angular/loader/loader.service.ts
@@ -0,0 +1,37 @@
+import { Injectable, Type, ComponentRef } from '@angular/core';
+import { LoaderComponent } from './loader.component';
+
+@Injectable()
+export class LoaderService {
+
+    constructor() {}
+
+    private mainLoaderName = 'general';
+
+    public registeredLoaders = {};
+
+    public register(name: string, loader: LoaderComponent) {
+        if (!this.registeredLoaders[name]) {
+            this.registeredLoaders[name] = loader;
+        }
+    }
+
+    public unregister(name: string) {
+        if (this.registeredLoaders[name]) {
+            delete this.registeredLoaders[name];
+        }
+    }
+
+    public activate(name: string = this.mainLoaderName) {
+        if (this.registeredLoaders[name]) {
+            this.registeredLoaders[name].activate();
+        }
+    }
+
+    public deactivate(name: string = this.mainLoaderName) {
+        if (this.registeredLoaders[name]) {
+            this.registeredLoaders[name].deactivate();
+        }
+    }
+
+}
diff --git a/src/angular/modals/modal-button.component.ts b/src/angular/modals/modal-button.component.ts
index 4fa5b7c..07f81dd 100644
--- a/src/angular/modals/modal-button.component.ts
+++ b/src/angular/modals/modal-button.component.ts
@@ -1,7 +1,6 @@
-import { Component, Input, HostListener } from "@angular/core";
+import { Component, Input, HostListener, EventEmitter, Output } from "@angular/core";
 import { ButtonComponent } from "../buttons/button.component";
-import { ModalService } from "./modal.service";
-import template from "./../buttons/button.component.html";
+import { template } from "./../buttons/button.component.html";
 
 @Component({
     selector: "sdc-modal-button",
@@ -12,16 +11,17 @@
     @Input() public id?: string;
     @Input() public callback: Function;
     @Input() public closeModal: boolean;
+    @Output() closeModalEvent: EventEmitter<any> = new EventEmitter<any>();
     @HostListener('click') invokeCallback = (): void => {
         if (this.callback) {
             this.callback();
         }
         if (this.closeModal) {
-            this.modalService.closeModal();
+            this.closeModalEvent.emit();
         }
     }
 
-    constructor(private modalService: ModalService) {
+    constructor() {
         super();
         this.closeModal = false;
     }
diff --git a/src/angular/modals/modal-close-button.component.ts b/src/angular/modals/modal-close-button.component.ts
index e761019..357ff72 100644
--- a/src/angular/modals/modal-close-button.component.ts
+++ b/src/angular/modals/modal-close-button.component.ts
@@ -1,7 +1,8 @@
-import { Component, Input } from "@angular/core";
-import { ButtonComponent } from "../buttons/button.component";
+import { Component, ComponentRef, Input } from "@angular/core";
 import { ModalService } from "./modal.service";
 import { RippleAnimationAction } from "../animations/ripple-click.animation.directive";
+import { ModalComponent } from "./modal.component";
+import { ButtonComponent } from "../buttons/button.component";
 
 @Component({
     selector: "sdc-modal-close-button",
@@ -17,18 +18,20 @@
     </div>
     `
 })
-export class ModalCloseButtonComponent {
+export class ModalCloseButtonComponent extends ButtonComponent {
 
     @Input() testId: string;
     @Input() disabled: boolean;
+    @Input() modalInstanceRef: ComponentRef<ModalComponent>;
 
     public rippleAnimationAction: RippleAnimationAction = RippleAnimationAction.MOUSE_ENTER;
 
     constructor(private modalService: ModalService) {
+        super();
     }
 
     public closeModal = (): void => {
-        this.modalService.closeModal();
+        this.modalInstanceRef.instance.closeModal();
     }
 
 }
diff --git a/src/angular/modals/modal.component.html.ts b/src/angular/modals/modal.component.html.ts
index 90119ac..058c02e 100644
--- a/src/angular/modals/modal.component.html.ts
+++ b/src/angular/modals/modal.component.html.ts
@@ -1,23 +1,20 @@
-export default `
+export const template = `
+<div class="modal-background" [@toggleBackground]="modalVisible" ></div>
 <div class="sdc-modal {{size}}">
     <div class="sdc-modal__wrapper sdc-modal-type-{{type}}" [@toggleModal]="modalVisible" (@toggleModal.done)="modalToggled($event)">
 
         <div class="sdc-modal__header sdc-{{type}}__header">
-            <div class="sdc-modal__icon" *ngIf="type != 'custom'">
-                <div *ngIf="type == 'alert'"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="30" height="30" viewBox="0 0 24 24"><defs><path fill="#000" id="alert-a" d="M20.5815,18.7997 C20.3815,18.9997 20.0815,19.0997 19.8815,19.0997 L2.8815,19.0997 C2.6815,19.0997 2.5815,19.0997 2.3815,18.9997 C1.8815,18.6997 1.7815,18.0997 1.9815,17.5997 L10.4815,3.4997 C10.5815,3.4007 10.6815,3.1997 10.7815,3.1997 C11.2815,2.9007 11.8815,3.0997 12.1815,3.4997 L20.6825,17.5997 C20.7815,17.6997 20.7815,17.9007 20.7815,18.0997 C20.8815,18.4007 20.6825,18.5997 20.5815,18.7997 M22.3815,16.5997 L13.9815,2.4007 C13.5815,1.6997 12.8815,1.1997 12.0815,0.9997 C11.2815,0.7997 10.4815,0.9007 9.7815,1.2997 C9.3815,1.4997 8.9815,1.9007 8.7815,2.2997 L0.3815,16.5997 C-0.4185,17.9997 0.0815,19.9007 1.4815,20.6997 C1.8815,20.9997 2.3815,21.0997 2.8815,21.0997 L19.8815,21.0997 C20.6825,21.0997 21.4815,20.7997 21.9815,20.1997 C22.5815,19.5997 22.8815,18.9007 22.8815,18.0997 C22.7815,17.5997 22.6825,16.9997 22.3815,16.5997 M11,7 C10.4,7 10,7.4 10,8 L10,12 C10,12.601 10.4,13 11,13 C11.6,13 12,12.601 12,12 L12,8 C12,7.4 11.6,7 11,7 M10.3,15.3 C10.1,15.499 10,15.699 10,15.999 C10,16.3 10.1,16.499 10.3,16.699 C10.5,16.9 10.7,16.999 11,16.999 C11.3,16.999 11.5,16.9 11.7,16.699 C11.9,16.499 12,16.199 12,15.999 C12,15.8 11.9,15.499 11.7,15.3 C11.3,14.9 10.7,14.9 10.3,15.3"/></defs>
-                    <g fill="none" fill-rule="evenodd" transform="translate(1 1)"><use class="sdc-modal__svg-use" xlink:href="#alert-a"/></g></svg></div>
-                <div *ngIf="type == 'info'"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="30" height="30" viewBox="0 0 24 24"><defs><path fill="#000" id="info-a" d="M11,20 C6,20 2,16 2,11 C2,6 6,2 11,2 C16,2 20,6 20,11 C20,16 16,20 11,20 M11,0 C4.9,0 0,4.9 0,11 C0,17.101 4.9,22 11,22 C17.1,22 22,17.101 22,11 C22,4.9 17.1,0 11,0 M11,10 C10.4,10 10,10.4 10,11 L10,15 C10,15.601 10.4,16 11,16 C11.6,16 12,15.601 12,15 L12,11 C12,10.4 11.6,10 11,10 M10.2998,6.2998 C10.0998,6.4998 9.9998,6.6998 9.9998,6.9998 C9.9998,7.2998 10.0998,7.4998 10.2998,7.6998 C10.4998,7.9008 10.6998,7.9998 10.9998,7.9998 C11.2998,7.9998 11.4998,7.9008 11.6998,7.6998 C11.9008,7.4998 11.9998,7.2998 11.9998,6.9998 C11.9998,6.6998 11.9008,6.4998 11.6998,6.2998 C11.2998,5.9008 10.6998,5.9008 10.2998,6.2998"/></defs>
-                    <g fill="none" fill-rule="evenodd" transform="translate(1 1)"><use class="sdc-modal__svg-use" xlink:href="#info-a"/></g></svg></div>
-                <div *ngIf="type == 'error'"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="30" height="30" viewBox="0 0 24 24"><defs><path fill="#000" id="x-a" d="M11,20 C6,20 2,16 2,11 C2,6 6,2 11,2 C16,2 20,6 20,11 C20,16 16,20 11,20 M11,0 C4.9,0 0,4.9 0,11 C0,17.1 4.9,22 11,22 C17.1,22 22,17.1 22,11 C22,4.9 17.1,0 11,0 M14.2591,7.29935 C13.8591,6.90035 13.2591,6.90035 12.8591,7.29935 L10.5591,9.59935 L8.2591,7.29935 C7.8591,6.90035 7.2591,6.90035 6.8591,7.29935 C6.4591,7.69935 6.4591,8.29935 6.8591,8.69935 L9.1581,10.99935 L6.8591,13.29935 C6.4591,13.69935 6.4591,14.29935 6.8591,14.69935 C7.0591,14.90035 7.2591,14.99935 7.5591,14.99935 C7.8591,14.99935 8.0591,14.90035 8.2591,14.69935 L10.5591,12.40035 L12.8591,14.69935 C13.0591,14.90035 13.3591,14.99935 13.5591,14.99935 C13.7591,14.99935 14.0591,14.90035 14.2591,14.69935 C14.6581,14.29935 14.6581,13.69935 14.2591,13.29935 L11.9591,10.99935 L14.2591,8.69935 C14.6581,8.29935 14.6581,7.69935 14.2591,7.29935"/></defs>
-                    <g fill="none" fill-rule="evenodd" transform="translate(1 1)"><use class="sdc-modal__svg-use" xlink:href="#x-a"/></g></svg></div>
-            </div>
+            <div class="sdc-modal__icon" *ngIf="type!='custom'" [innerHtml]="svgIconContentSafeHtml"></div>
             <div *ngIf="title" class="title" >{{ title }}</div>
-            <sdc-modal-close-button #modalCloseButton [testId]="getCalculatedTestId('close')"></sdc-modal-close-button>
+            <sdc-modal-close-button #modalCloseButton [testId]="getCalculatedTestId('close')" [modalInstanceRef]="instanceRef"></sdc-modal-close-button>
         </div>
-        <div class="sdc-modal__content" >
-                <div *ngIf="message">{{message}}</div>
+
+        <div class="sdc-modal__content">
+                <div *ngIf="message" [innerHtml]="message"></div>
                 <div #dynamicContentContainer></div>
+                <div class="disabled-modal" *ngIf="isDisabled"></div>
         </div>
+
         <div class="sdc-modal__footer">
             <sdc-modal-button *ngFor="let button of buttons"
                 [text]="button.text"
@@ -29,10 +26,11 @@
                 [show_spinner]="button.show_spinner"
                 [callback]="button.callback"
                 [testId]="getCalculatedTestId('button-' + button.text)"
+                (closeModalEvent)="closeModal()"
                 >
             </sdc-modal-button>
         </div>
+
     </div>
 </div>
-<div class="modal-background" [@toggleBackground]="modalVisible" ></div>
 `;
diff --git a/src/angular/modals/modal.component.spec.ts b/src/angular/modals/modal.component.spec.ts
index 372d59d..d1f6b78 100644
--- a/src/angular/modals/modal.component.spec.ts
+++ b/src/angular/modals/modal.component.spec.ts
@@ -4,102 +4,91 @@
 import { ModalService } from './modal.service';
 import { CreateDynamicComponentService } from "../utils/create-dynamic-component.service";
 import { IModalConfig, ModalType, ModalSize } from "../../../src/angular/modals/models/modal-config";
-import { ModalInnerContent } from "../../../stories/ng2-component-lab/components/modal-inner-content-example.component";
-
 
 describe("Modal unit-tests", () => {
     let testService: ModalService;
     const testInputModal = {
-        size: 'xl', //'xl|l|md|sm|xsm'
+        size: 'xl', // 'xl|l|md|sm|xsm'
         title: 'Test_Title',
         message: 'Test_Message',
         modalVisible: true
     };
 
     beforeEach(async(() => {
-        TestBed.configureTestingModule({
-           providers:[
-                ModalService,
-                { provide : CreateDynamicComponentService, useClass: CreateDynamicComponentServiceTest}
-            ],
-            declarations: [],
-            schemas:[NO_ERRORS_SCHEMA]
-        })
-        testService = TestBed.get(ModalService);
+        // TestBed.configureTestingModule({
+        //    providers: [
+        //         ModalService,
+        //         { provide : CreateDynamicComponentService, useClass: CreateDynamicComponentServiceTest}
+        //     ],
+        //     declarations: [],
+        //     schemas: [NO_ERRORS_SCHEMA]
+        // });
+        // testService = TestBed.get(ModalService);
     }));
 
     it('Modal should be open test', () => {
-        let modalInstance = testService.openModal(testInputModal);
+        const modalInstance = testService.openModal(testInputModal);
         expect(modalInstance).toBeTruthy();
-    })
+    });
 
-    it('Modal alert window test', () => {
-        let modalInstance = testService.openAlertModal('testAlert', 'testMessage');
+    it('Modal warning window test', () => {
+        const modalInstance = testService.openWarningModal('Worning title', 'testAlert', 'testMessage');
         expect(modalInstance).toBeTruthy();
-    })
+    });
 
     it('Modal info window test', () => {
-        let modalInstance = testService.openErrorModal('testMessage', 'sampleTestId');
+        const modalInstance = testService.openErrorModal('Error title', 'testMessage', 'sampleTestId');
         expect(modalInstance).toBeTruthy();
-    })
+    });
 
+    // it('Custom Modal should be open', () => {
+    //     const modalConfig: IModalConfig = {
+    //         size: ModalSize.medium,
+    //         title: 'Title',
+    //         type: ModalType.custom,
+    //         buttons: [{text: "Save & Close", closeModal: true},
+    //                   {text: "Save", callback: this.customModalOnSave, closeModal: false},
+    //                   {text: "Cancel", type: 'secondary', closeModal: true}]
+    //     } as IModalConfig;
+    //     const modalInstance = testService.openCustomModal(modalConfig, ModalInnerContent, {name: "Sample Content"});
+    //     expect(modalInstance).toBeTruthy();
+    // });
 
-    it('Custom Modal should be open', () => {
-        let modalConfig:IModalConfig = <IModalConfig> {
-            size: ModalSize.medium,
-            title: 'Title',
-            type: ModalType.custom,
-            buttons: [{text:"Save & Close", closeModal:true},
-                      {text:"Save", callback:this.customModalOnSave, closeModal:false},
-                      {text:"Cancel", type: 'secondary', closeModal:true}]
-        };
-        let modalInstance = testService.openCustomModal(modalConfig, ModalInnerContent, {name: "Sample Content"});
-        expect(modalInstance).toBeTruthy();
-    })
-
-    it('Shoul close window', () => {
-        let modalInstance = testService.openModal(testInputModal);
-        testService.closeModal();
-        expect(modalInstance.instance.modalVisible).toBeFalsy();
-    })
-})
-
+    // it('Should close window', () => {
+    //     const modalInstance = testService.openModal(testInputModal);
+    //     modalInstance.instance.closeModal();
+    //     expect(modalInstance.instance.modalVisible).toBeFalsy();
+    // });
+});
 
 const testModalInstance = {
-    instance:{
-        closeAnimationComplete:{
-            subscribe:() => {
+    instance: {
+        closeAnimationComplete: {
+            subscribe: () => {
                 return true;
             },
         },
-        _createDynamicComponentService:{
-            insertComponentDynamically:() => {
+        _createDynamicComponentService: {
+            insertComponentDynamically: () => {
                 return true;
             }
         },
-        modalVisible:true
-    },
-
+        modalVisible: true
+    }
 };
 
-@Component({
-    selector: 'modal-test',
-    template: `<div></div>`
-})
+// @Component({
+//     selector: 'modal-test',
+//     template: `<div></div>`
+// })
 
+// export class CreateDynamicComponentServiceTest {
+//     modalVisble: true;
+//     public createComponentDynamically = (modalInstance, customData) => {
+//         return testModalInstance;
+//     }
+//     public insertComponentDynamically = () => {
+//         return testModalInstance;
+//     }
 
-
-export class CreateDynamicComponentServiceTest {
-    modalVisble: true;
-    public createComponentDynamically = (modalInstance, customData) => {
-        return testModalInstance;
-    }
-    public insertComponentDynamically = () =>{
-        return testModalInstance;
-    }
-
-}
-
-
-
-
+// }
diff --git a/src/angular/modals/modal.component.ts b/src/angular/modals/modal.component.ts
index 4f4d81f..c6f346c 100644
--- a/src/angular/modals/modal.component.ts
+++ b/src/angular/modals/modal.component.ts
@@ -1,33 +1,36 @@
-import { Component, Input, Output, ViewContainerRef, ViewChild, ComponentRef, trigger, state, animate, transition, style, EventEmitter, Renderer, ElementRef } from '@angular/core';
+import { Component, Input, ViewContainerRef, ViewChild, ComponentRef, Renderer, OnInit } from '@angular/core';
+import { animate, style, transition, trigger } from '@angular/animations';
 import { ModalButtonComponent } from './modal-button.component';
 import { LowerCasePipe } from '@angular/common';
 import { ModalCloseButtonComponent } from './modal-close-button.component';
-import template from './modal.component.html';
+import { ModalType } from './models/modal-config';
+import { template } from './modal.component.html';
+import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 
 @Component({
     selector: 'sdc-modal',
     template: template,
     animations: [
         trigger('toggleBackground', [
-            transition('* => 1', [style({opacity: 0}), animate('.45s cubic-bezier(0.23, 1, 0.32, 1)')]),
-            transition('1 => *', [animate('.35s cubic-bezier(0.23, 1, 0.32, 1)', style({opacity: 0}))])
+            transition('* => 1', [style({ opacity: 0 }), animate('.45s cubic-bezier(0.23, 1, 0.32, 1)')]),
+            transition('1 => *', [animate('.35s cubic-bezier(0.23, 1, 0.32, 1)', style({ opacity: 0 }))])
         ]),
         trigger('toggleModal', [
-            transition('* => 1', [style({opacity: 0, transform: 'translateY(-80px)'}),  animate('.45s cubic-bezier(0.23, 1, 0.32, 1)')]),
-            transition('1 => *', [style({opacity: 1, transform: 'translateY(0px)'}), animate('.35s ease-in-out', style({opacity:0, transform: 'translateY(-80px)'}))])
+            transition('* => 1', [style({ opacity: 0, transform: 'translateY(-80px)' }), animate('.45s cubic-bezier(0.23, 1, 0.32, 1)')]),
+            transition('1 => *', [style({ opacity: 1, transform: 'translateY(0px)' }), animate('.35s ease-in-out', style({ opacity: 0, transform: 'translateY(-80px)' }))])
         ])
     ]
 })
 
-export class ModalComponent {
+export class ModalComponent implements OnInit {
 
     @Input() size: string; 'xl|l|md|sm|xsm';
     @Input() title: string;
     @Input() message: string;
     @Input() buttons: ModalButtonComponent[];
-    @Input() type: string; 'info|error|alert|custom';
+    @Input() type: ModalType;
     @Input() testId: string;
-    @Output() closeAnimationComplete: EventEmitter<any> = new EventEmitter<any>();
+    @Input() instanceRef: ComponentRef<ModalComponent>; // the component ref is injected to the component in order to destroy the componet from itself
 
     @ViewChild('modalCloseButton')
     set refCloseButton(_modalCloseButton: ModalCloseButtonComponent) {
@@ -36,19 +39,68 @@
 
     modalVisible: boolean;
     // Allows for custom component as body instead of simple message.
-    // See ModalService.createActionModal for implementation details, and HttpService's catchError() for example.
-    @ViewChild('dynamicContentContainer', {read: ViewContainerRef}) dynamicContentContainer: ViewContainerRef;
-    innerModalContent: ComponentRef<ModalComponent>;
+    @ViewChild('dynamicContentContainer', { read: ViewContainerRef }) dynamicContentContainer: ViewContainerRef;
+    innerModalContent: ComponentRef<any>;
 
     public calculatedTestId: string;
     public modalCloseButton: ModalCloseButtonComponent;
+    public svgIconContentSafeHtml: SafeHtml;
+    public isDisabled: boolean;
+
+    private infoSvg = `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="30" height="30" viewBox="0 0 24 24">
+    <defs><path fill="#000" id="info-a" d="M11,20 C6,20 2,16 2,11 C2,6 6,2 11,2 C16,2 20,6 20,11 C20,16 16,20 11,20 M11,0 C4.9,0 0,4.9 0,11 C0,17.101 4.9,22 11,22 C17.1,22 22,17.101 22,11 C22,4.9 17.1,0 11,0 M11,10 C10.4,
+    10 10,10.4 10,11 L10,15 C10,15.601 10.4,16 11,16 C11.6,16 12,15.601 12,15 L12,11 C12,10.4 11.6,10 11,10 M10.2998,6.2998 C10.0998,6.4998 9.9998,6.6998 9.9998,6.9998 C9.9998,7.2998 10.0998,7.4998 10.2998,7.6998 C10.4998,
+    7.9008 10.6998,7.9998 10.9998,7.9998 C11.2998,7.9998 11.4998,7.9008 11.6998,7.6998 C11.9008,7.4998 11.9998,7.2998 11.9998,6.9998 C11.9998,6.6998 11.9008,6.4998 11.6998,6.2998 C11.2998,5.9008 10.6998,5.9008 10.2998,6.2998"/>
+    </defs><g fill="none" fill-rule="evenodd" transform="translate(1 1)"><use class="sdc-modal__svg-use" xlink:href="#info-a"/></g></svg>`;
+    private warningSvg = `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="30" height="30" viewBox="0 0 24 24"><defs><path fill="#000" id="alert-a" d="M20.5815,18.7997 C20.3815,
+    18.9997 20.0815,19.0997 19.8815,19.0997 L2.8815,19.0997 C2.6815,19.0997 2.5815,19.0997 2.3815,18.9997 C1.8815,18.6997 1.7815,18.0997 1.9815,17.5997 L10.4815,3.4997 C10.5815,3.4007 10.6815,3.1997 10.7815,3.1997 C11.2815,
+    2.9007 11.8815,3.0997 12.1815,3.4997 L20.6825,17.5997 C20.7815,17.6997 20.7815,17.9007 20.7815,18.0997 C20.8815,18.4007 20.6825,18.5997 20.5815,18.7997 M22.3815,16.5997 L13.9815,2.4007 C13.5815,1.6997 12.8815,1.1997 12.0815,
+    0.9997 C11.2815,0.7997 10.4815,0.9007 9.7815,1.2997 C9.3815,1.4997 8.9815,1.9007 8.7815,2.2997 L0.3815,16.5997 C-0.4185,17.9997 0.0815,19.9007 1.4815,20.6997 C1.8815,20.9997 2.3815,21.0997 2.8815,21.0997 L19.8815,
+    21.0997 C20.6825,21.0997 21.4815,20.7997 21.9815,20.1997 C22.5815,19.5997 22.8815,18.9007 22.8815,18.0997 C22.7815,17.5997 22.6825,16.9997 22.3815,16.5997 M11,7 C10.4,7 10,7.4 10,8 L10,12 C10,12.601 10.4,13 11,13 C11.6,13 12,
+    12.601 12,12 L12,8 C12,7.4 11.6,7 11,7 M10.3,15.3 C10.1,15.499 10,15.699 10,15.999 C10,16.3 10.1,16.499 10.3,16.699 C10.5,16.9 10.7,16.999 11,16.999 C11.3,16.999 11.5,16.9 11.7,16.699 C11.9,16.499 12,16.199 12,15.999 C12,
+    15.8 11.9,15.499 11.7,15.3 C11.3,14.9 10.7,14.9 10.3,15.3"/></defs><g fill="#ffb81c" fill-rule="evenodd" transform="translate(1 1)"><use class="sdc-modal__svg-use" xlink:href="#alert-a"/></g></svg>`;
+    private errorSvg = `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="30" height="30" viewBox="0 0 24 24"><defs><path fill="#000" id="x-a" d="M11,20 C6,20 2,16 2,11 C2,6 6,2 11,
+    2 C16,2 20,6 20,11 C20,16 16,20 11,20 M11,0 C4.9,0 0,4.9 0,11 C0,17.1 4.9,22 11,22 C17.1,22 22,17.1 22,11 C22,4.9 17.1,0 11,0 M14.2591,7.29935 C13.8591,6.90035 13.2591,6.90035 12.8591,7.29935 L10.5591,9.59935 L8.2591,
+    7.29935 C7.8591,6.90035 7.2591,6.90035 6.8591,7.29935 C6.4591,7.69935 6.4591,8.29935 6.8591,8.69935 L9.1581,10.99935 L6.8591,13.29935 C6.4591,13.69935 6.4591,14.29935 6.8591,14.69935 C7.0591,14.90035 7.2591,14.99935 7.5591,
+    14.99935 C7.8591,14.99935 8.0591,14.90035 8.2591,14.69935 L10.5591,12.40035 L12.8591,14.69935 C13.0591,14.90035 13.3591,14.99935 13.5591,14.99935 C13.7591,14.99935 14.0591,14.90035 14.2591,14.69935 C14.6581,14.29935 14.6581,
+    13.69935 14.2591,13.29935 L11.9591,10.99935 L14.2591,8.69935 C14.6581,8.29935 14.6581,7.69935 14.2591,7.29935"/></defs><g fill="none" fill-rule="evenodd" transform="translate(1 1)">
+    <use class="sdc-modal__svg-use" xlink:href="#x-a"/></g></svg>`;
+    private successSvg = `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="30" height="30" viewBox="0 0 24 24" fill="#4ca90c"><path id="success+20-a" d="M20.1825992,10.445793 C20.6735306,
+    10.445793 21.0008182,10.7730806 21.0008182,11.264012 L21.0008182,12.0004091 C21.0008182,16.9915451 16.9915451,21 12.0004091,21 C7.00927315,21 3,16.9915451 3,12.0004091 C3,7.00927315 7.00927315,3 12.0004091,3 C13.3095595,3 14.536888,
+    3.3272876 15.6823947,3.81821901 C16.0915042,3.98186281 16.255148,4.47279422 16.0915042,4.88190372 C15.9278604,5.29101323 15.436929,5.45465703 15.0278194,5.29101323 C14.0459566,4.88190372 13.0640938,4.63643802 12.0004091,
+    4.63643802 C7.90931406,4.63643802 4.63643802,7.90931406 4.63643802,12.0004091 C4.63643802,16.0906859 7.90931406,19.363562 12.0004091,19.363562 C16.0915042,19.363562 19.3643802,16.0906859 19.3643802,12.0004091 L19.3643802,
+    11.264012 C19.3643802,10.7730806 19.6916678,10.445793 20.1825992,10.445793 Z M21.5737352,4.06343925 C21.9002046,4.39072685 21.9002046,4.88165826 21.5737352,5.20894586 L12.5733261,14.209355 C12.4096823,14.3729988 12.1642166,
+    14.4548207 12.0005728,14.4548207 C11.836929,14.4548207 11.5914632,14.3729988 11.4278194,14.209355 L8.97316242,11.7546979 C8.64587481,11.4274103 8.64587481,10.9364789 8.97316242,10.6091913 C9.30045002,10.2819037 9.79138143,
+    10.2819037 10.118669,10.6091913 L12.0005728,12.491095 L20.4282286,4.06343925 C20.7555162,3.73615164 21.2464476,3.73615164 21.5737352,4.06343925 Z"></path></svg>`;
+    private noSvg = ``;
 
     constructor(private renderer: Renderer,
-                private lowerCasePipe: LowerCasePipe
-            ) {
+        private domSanitizer: DomSanitizer,
+        private lowerCasePipe: LowerCasePipe
+    ) {
         this.modalVisible = true;
     }
 
+    ngOnInit() {
+
+        switch (this.type) {
+            case ModalType.info:
+                this.svgIconContentSafeHtml = this.domSanitizer.bypassSecurityTrustHtml(this.infoSvg);
+                break;
+            case ModalType.warning:
+                this.svgIconContentSafeHtml = this.domSanitizer.bypassSecurityTrustHtml(this.warningSvg);
+                break;
+            case ModalType.error:
+                this.svgIconContentSafeHtml = this.domSanitizer.bypassSecurityTrustHtml(this.errorSvg);
+                break;
+            case ModalType.success:
+                this.svgIconContentSafeHtml = this.domSanitizer.bypassSecurityTrustHtml(this.successSvg);
+                break;
+            default:
+                this.svgIconContentSafeHtml = this.domSanitizer.bypassSecurityTrustHtml(this.noSvg);
+        }
+    }
+
     getCalculatedTestId = (buttonText: string): string => {
         // TODO: Replace this
         if (this.testId) {
@@ -59,7 +111,7 @@
 
     public modalToggled = (toggleEvent: any) => {
         if (!toggleEvent.toState) {
-            this.closeAnimationComplete.emit();
+            this.instanceRef.destroy();
         }
     }
 
@@ -68,9 +120,11 @@
     }
 
     public getButtonById = (id: string): ModalButtonComponent => {
-        return this.buttons.find((button) => {
+        // Support ES5
+        // return this.buttons.find((button) => {
+        return this.buttons.filter((button) => {
             return button.id && button.id === id;
-        });
+        })[0];
     }
 
     public getButtons = (): ModalButtonComponent[] => {
@@ -93,4 +147,16 @@
         this.renderer.setElementClass(evn.target as HTMLElement, 'sdc-ripple-click__animated', true);
         // evn.taregt.classList.add('sdc-ripple-click__animated');
     }
+
+    public closeModal = (): void => {
+        this.modalVisible = false;
+    }
+
+    public disabledModal = (isDisabled: boolean): void => {
+        this.isDisabled = isDisabled;
+        this.buttons.forEach((button: ModalButtonComponent) => {
+            button.disabled = isDisabled;
+        });
+        this.modalCloseButton.disabled = isDisabled;
+    }
 }
diff --git a/src/angular/modals/modal.service.ts b/src/angular/modals/modal.service.ts
index d80ad1f..231b062 100644
--- a/src/angular/modals/modal.service.ts
+++ b/src/angular/modals/modal.service.ts
@@ -2,99 +2,59 @@
 import { ModalComponent } from "./modal.component";
 import { CreateDynamicComponentService } from "../utils/create-dynamic-component.service";
 import { IModalConfig, ModalType, ModalSize, IModalButtonComponent } from "./models/modal-config";
+import { ButtonType } from '../common/enums';
+import { ModalButtonComponent } from './modal-button.component';
 
 @Injectable()
 export class ModalService {
 
-    private currentModal: ComponentRef<any>;
-
     constructor(private createDynamicComponentService: CreateDynamicComponentService) {
     }
 
-    /* Shortcut method to open an alert modal with title, message, and close button that simply closes the modal. */
-    public openAlertModal(title: string, message: string, actionButtonText?: string, actionButtonCallback?: Function, testId?: string) {
+    private getBaseModal = (type: ModalType | ButtonType, title: string, message: string, testId: string, buttons?: ModalButtonComponent[]): ModalComponent => {
         const modalConfig = {
             size: ModalSize.small,
             title: title,
             message: message,
             testId: testId,
-            buttons: this.createButtons('secondary', actionButtonText, actionButtonCallback),
-            type: ModalType.alert
+            buttons: buttons ? buttons : [{ text: 'OK', type: type, closeModal: true }],
+            type: type
         } as IModalConfig;
         const modalInstance: ComponentRef<ModalComponent> = this.openModal(modalConfig);
-        this.currentModal = modalInstance;
-        return modalInstance;
+        return modalInstance.instance;
     }
 
-    public openActionModal = (title: string, message: string, actionButtonText?: string, actionButtonCallback?: Function, testId?: string): ComponentRef<ModalComponent> => {
-        const modalConfig = {
-            size: ModalSize.small,
-            title: title,
-            message: message,
-            testId: testId,
-            type: ModalType.standard,
-            buttons: this.createButtons('primary', actionButtonText, actionButtonCallback)
-        } as IModalConfig;
-        const modalInstance: ComponentRef<ModalComponent> = this.openModal(modalConfig);
-        this.currentModal = modalInstance;
-        return modalInstance;
+    /* Shortcut method to open basic modals with title, message, and OK button that simply closes the modal. */
+    public openInfoModal = (title: string, message: string, testId: string, buttons?: ModalButtonComponent[]): ModalComponent => {
+        return this.getBaseModal(ModalType.info, title, message, testId, buttons);
     }
 
-    public openErrorModal = (errorMessage?: string, testId?: string): ComponentRef<ModalComponent> => {
-        const modalConfig = {
-            size: ModalSize.small,
-            title: 'Error',
-            message: errorMessage,
-            testId: testId,
-            buttons: [{text: "OK", type: "alert", closeModal: true}],
-            type: ModalType.error
-        } as IModalConfig;
-        const modalInstance: ComponentRef<ModalComponent> = this.openModal(modalConfig);
-        this.currentModal = modalInstance;
-        return modalInstance;
+    public openWarningModal = (title: string, message: string, testId: string, buttons?: ModalButtonComponent[]): ModalComponent => {
+        return this.getBaseModal(ModalType.warning, title, message, testId, buttons);
+    }
+
+    public openErrorModal = (title: string, message: string, testId: string, buttons?: ModalButtonComponent[]): ModalComponent => {
+        return this.getBaseModal(ModalType.error, title, message, testId, buttons);
+    }
+
+    public openSuccessModal = (title: string, message: string, testId: string, buttons?: ModalButtonComponent[]): ModalComponent => {
+        return this.getBaseModal(ModalType.success, title, message, testId, buttons);
     }
 
     public openCustomModal = (modalConfig: IModalConfig, dynamicComponentType: Type<any>, dynamicComponentInput?: any) => {
         const modalInstance: ComponentRef<ModalComponent> = this.openModal(modalConfig);
-        this.createInnnerComponent(dynamicComponentType, dynamicComponentInput);
-        return modalInstance;
+        this.createInnnerComponent(modalInstance, dynamicComponentType, dynamicComponentInput);
+        return modalInstance.instance;
     }
 
-    public createInnnerComponent = (dynamicComponentType: Type<any>, dynamicComponentInput?: any): void => {
-        this.currentModal.instance.innerModalContent = this.createDynamicComponentService.insertComponentDynamically(dynamicComponentType, dynamicComponentInput, this.currentModal.instance.dynamicContentContainer);
+    public createInnnerComponent = (modalInstance: ComponentRef<ModalComponent>, dynamicComponentType: Type<any>, dynamicComponentInput?: any): void => {
+        modalInstance.instance.innerModalContent = this.createDynamicComponentService.insertComponentDynamically(dynamicComponentType, dynamicComponentInput, modalInstance.instance.dynamicContentContainer);
     }
 
     public openModal = (customModalData: IModalConfig): ComponentRef<ModalComponent> => {
-        const modalInstance: ComponentRef<ModalComponent> = this.createDynamicComponentService.createComponentDynamically(ModalComponent, customModalData);
-        modalInstance.instance.closeAnimationComplete.subscribe(() => {
-            this.destroyModal();
-        });
-        this.currentModal = modalInstance;
+        let modalInstance: ComponentRef<ModalComponent> = this.createDynamicComponentService.createComponentDynamically(ModalComponent, customModalData);
+        modalInstance.instance.instanceRef = modalInstance;
         return modalInstance;
     }
 
-    public getCurrentInstance = () => {
-        return this.currentModal.instance;
-    }
-
-    public closeModal = (): void => { // triggers closeModal animation, which then triggers toggleModal.done and the subscription to destroyModal
-        this.currentModal.instance.modalVisible = false;
-    }
-
-    private createButtons = (type: string, actionButtonText?: string, actionButtonCallback?: Function): Array<IModalButtonComponent> => {
-        const buttons: Array<IModalButtonComponent> = [];
-        if (actionButtonText && actionButtonCallback) {
-            buttons.push({text: actionButtonText, type: type, callback: actionButtonCallback, closeModal: true});
-            buttons.push({text: 'Cancel', type: 'secondary', closeModal: true});
-        } else {
-            buttons.push({text: 'Cancel', type: type, closeModal: true});
-        }
-
-        return buttons;
-    }
-
-    private destroyModal = (): void => {
-        this.currentModal.destroy();
-    }
-
 }
diff --git a/src/angular/modals/models/modal-config.ts b/src/angular/modals/models/modal-config.ts
index 635942b..8cf955e 100644
--- a/src/angular/modals/models/modal-config.ts
+++ b/src/angular/modals/models/modal-config.ts
@@ -1,4 +1,4 @@
-import { Placement } from "../../common/enums";
+import { IButtonComponent } from "../../buttons/ibutton.interface";
 
 export interface IModalConfig {
     size?: string; // xl|l|md|sm|xsm
@@ -6,33 +6,22 @@
     message?: string;
     buttons?: IModalButtonComponent[];
     testId?: string;
-    type?: string; // 'info|error|alert';
+    type?: ModalType;
 }
 
-export interface IButtonComponent {
-    text: string;
-    disabled?: boolean;
-    type?: string;
-    testId?: string;
-    preventDoubleClick?: boolean;
-    icon_name?: string;
-    icon_position?: string;
-    show_spinner?: boolean;
-    spinner_position?: Placement;
-    size?: string;
-}
-
-export interface IModalButtonComponent extends IButtonComponent{
+export interface IModalButtonComponent extends IButtonComponent {
     id?: string;
-    callback?: Function;
+    callback?: () => void;
     closeModal?: boolean;
 }
 
 export enum ModalType {
-    alert = "alert",
-    error = "error",
-    standard = "info",
-    custom = "custom"
+    info = 'info',
+    warning = 'warning',
+    error = 'error',
+    success = 'success',
+    action = 'action',
+    custom = 'custom'
 }
 
 export enum ModalSize {
diff --git a/src/angular/multiline-ellipsis/multiline-ellipsis.component.html.ts b/src/angular/multiline-ellipsis/multiline-ellipsis.component.html.ts
new file mode 100644
index 0000000..ecaeb42
--- /dev/null
+++ b/src/angular/multiline-ellipsis/multiline-ellipsis.component.html.ts
@@ -0,0 +1,8 @@
+export const template = `
+<div class="multiline-ellipsis-container" [ngClass]="className" [ngStyle]="stylesContainer" #multilineEllipsisContainer>
+	<div class="multiline-ellipsis-content" [ngStyle]="stylesContent" #multilineEllipsisContent>
+		<ng-content></ng-content>
+		<div class="multiline-ellipsis-dots" [ngStyle]="stylesDots"></div>
+	</div>
+</div>
+`;
diff --git a/src/angular/multiline-ellipsis/multiline-ellipsis.component.ts b/src/angular/multiline-ellipsis/multiline-ellipsis.component.ts
new file mode 100644
index 0000000..bc7f805
--- /dev/null
+++ b/src/angular/multiline-ellipsis/multiline-ellipsis.component.ts
@@ -0,0 +1,70 @@
+import { Component, OnChanges, AfterViewChecked, ViewChild, ElementRef, Input, Output, SimpleChanges, EventEmitter } from "@angular/core";
+import { template } from './multiline-ellipsis.component.html';
+
+declare const window: any;
+
+@Component({
+	selector: 'multiline-ellipsis',
+	template: template
+})
+
+export class MultilineEllipsisComponent implements OnChanges, AfterViewChecked {
+
+	@Input() public lines: number;
+	@Input() public lineHeight: string;
+	@Input() public className: string;
+	@Output() public hasEllipsisChanged: EventEmitter<boolean>;
+
+	@ViewChild('multilineEllipsisContainer') public elmContainer: ElementRef;
+	@ViewChild('multilineEllipsisContent') public elmContent: ElementRef;
+
+	public stylesContainer: { [key: string]: string };
+	public stylesContent: { [key: string]: string };
+	public stylesDots: { [key: string]: string };
+
+	private hasEllipsis: boolean;
+
+	public constructor() {
+		this.hasEllipsisChanged = new EventEmitter<boolean>();
+	}
+
+	public ngOnChanges(changes: SimpleChanges) {
+		this.prepareStyles()
+	}
+
+	public ngAfterViewChecked() {
+		const hasEllipsis = (this.elmContainer.nativeElement.offsetHeight < this.elmContent.nativeElement.offsetHeight);
+		if (hasEllipsis !== this.hasEllipsis) {
+			this.hasEllipsis = hasEllipsis;
+			setTimeout(() => {
+				this.hasEllipsisChanged.emit(this.hasEllipsis);
+			});
+		}
+	}
+
+	private prepareStyles() {
+		const lineHeight = this.lineHeight || this.getLineHeight();
+		this.stylesContainer = {
+			'max-height': `calc(${this.lines} * ${lineHeight})`
+		};
+		this.stylesContent = {
+			'max-height': `calc(${this.lines + 1} * ${lineHeight})`
+		};
+		this.stylesDots = {
+			'top': `calc(${2 * this.lines} * ${lineHeight} - 100%)`
+		};
+	}
+
+	private getLineHeight() {
+		let lineHeight: number = parseFloat(window.getComputedStyle(this.elmContainer.nativeElement)['line-height']);
+		if (!lineHeight) {
+			const oneLetterElm = window.document.createElement('div');
+			oneLetterElm.innerText = '.';
+			this.elmContainer.nativeElement.append(oneLetterElm);
+			lineHeight = oneLetterElm.clientHeight;
+			this.elmContainer.nativeElement.removeChild(oneLetterElm);
+		}
+		return `${lineHeight}px`;
+	}
+
+}
diff --git a/src/angular/multiline-ellipsis/multiline-ellipsis.module.ts b/src/angular/multiline-ellipsis/multiline-ellipsis.module.ts
new file mode 100644
index 0000000..24ed7b3
--- /dev/null
+++ b/src/angular/multiline-ellipsis/multiline-ellipsis.module.ts
@@ -0,0 +1,11 @@
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {MultilineEllipsisComponent} from './multiline-ellipsis.component';
+
+@NgModule({
+	declarations: [MultilineEllipsisComponent],
+    imports: [CommonModule],
+	exports: [MultilineEllipsisComponent],
+	entryComponents: [MultilineEllipsisComponent]
+})
+export class MultilineEllipsisModule {}
diff --git a/src/angular/ng1.module.ts b/src/angular/ng1.module.ts
index 6f636f4..4aba999 100644
--- a/src/angular/ng1.module.ts
+++ b/src/angular/ng1.module.ts
@@ -1,6 +1,6 @@
-import { SdcUiComponentsModule } from './index';
 import { downgradeComponent, downgradeInjectable } from "@angular/upgrade/static";
 import * as Components from './components';
+import * as Services from './services';
 declare const angular: any;
 
 let SdcUiComponentsNg1Module = null;
@@ -38,7 +38,7 @@
     }));
 
     // Modals
-    SdcUiComponentsNg1Module.service('SdcModalService', downgradeInjectable(Components.ModalService));
+    SdcUiComponentsNg1Module.service('SdcModalService', downgradeInjectable(Services.ModalService));
     SdcUiComponentsNg1Module.directive('sdcModal', downgradeComponent({
         component: Components.ModalComponent,
         inputs: ['size', 'title', 'message', 'buttons', 'type'],
@@ -50,7 +50,7 @@
     }));
 
     // Notifications
-    SdcUiComponentsNg1Module.service('SdcNotificationService', downgradeInjectable(Components.NotificationsService));
+    SdcUiComponentsNg1Module.service('SdcNotificationService', downgradeInjectable(Services.NotificationsService));
     SdcUiComponentsNg1Module.directive('sdcNotificationContainer', downgradeComponent({
         component: Components.NotificationContainerComponent
     }));
@@ -130,6 +130,13 @@
         inputs: ['arrow-direction', 'css-class', 'title', 'open'],
         outputs: ['accordionChanged']
     }));
+
+    // Multiline Ellipsis
+    SdcUiComponentsNg1Module.directive('multilineEllipsis', downgradeComponent({
+        component: Components.MultilineEllipsisComponent,
+        inputs: ['lines', 'line-height', 'className'],
+        outputs: ['hasEllipsisChanged']
+    }));
 }
 
-export {SdcUiComponentsNg1Module};
+export { SdcUiComponentsNg1Module };
diff --git a/src/angular/notifications/container/notifcontainer.component.html.ts b/src/angular/notifications/container/notifcontainer.component.html.ts
index df08bb4..4073f47 100644
--- a/src/angular/notifications/container/notifcontainer.component.html.ts
+++ b/src/angular/notifications/container/notifcontainer.component.html.ts
@@ -1,4 +1,4 @@
-export default `
+export const template = `
 <div id="containerid" class="sdc-notification-container ntns">
         <sdc-notification  *ngFor="let notif of notifications" [notificationSetting]="notif" (destroyComponent)="onDestroyed(notif)" >
         </sdc-notification>
diff --git a/src/angular/notifications/container/notifcontainer.component.ts b/src/angular/notifications/container/notifcontainer.component.ts
index a922dc1..d2f7ad1 100644
--- a/src/angular/notifications/container/notifcontainer.component.ts
+++ b/src/angular/notifications/container/notifcontainer.component.ts
@@ -1,8 +1,7 @@
 import { Component, Input, Output, EventEmitter, OnInit } from "@angular/core";
-import { CommonModule } from "@angular/common";
 import { NotificationSettings } from "../utilities/notification.config";
 import { NotificationsService } from "../services/notifications.service";
-import template from "./notifcontainer.component.html";
+import { template } from "./notifcontainer.component.html";
 
 @Component({
     selector: "sdc-notification-container",
@@ -14,14 +13,13 @@
     constructor(private notify: NotificationsService) {
     }
 
-    public ngOnInit(){
-        this.notify.subscribe( (notif : NotificationSettings) => {
+    public ngOnInit() {
+        this.notify.subscribe((notif: NotificationSettings) => {
             this.notifications.push(notif);
         });
     }
 
-
-    private onDestroyed = (event : any):void =>{
+    private onDestroyed = (event: any): void => {
         let index: number = this.notifications.indexOf(event);
         if (index !== -1) {
             this.notifications.splice(index, 1);
diff --git a/src/angular/notifications/notification-inner-content-example.component.ts b/src/angular/notifications/notification-inner-content-example.component.ts
index 552f7b0..fbda881 100644
--- a/src/angular/notifications/notification-inner-content-example.component.ts
+++ b/src/angular/notifications/notification-inner-content-example.component.ts
@@ -14,8 +14,9 @@
         </div>
 `
 })
+
 export class InnerNotifContent {
 
-    @Input() notifyTitle:string;
-    @Input() notifyText:string;
+    @Input() notifyTitle: string;
+    @Input() notifyText: string;
 }
diff --git a/src/angular/notifications/notification.module.ts b/src/angular/notifications/notification.module.ts
index 5891391..4241b5d 100644
--- a/src/angular/notifications/notification.module.ts
+++ b/src/angular/notifications/notification.module.ts
@@ -4,18 +4,21 @@
 import { NotificationContainerComponent } from "./container/notifcontainer.component";
 import { NotificationsService } from "./services/notifications.service";
 import { CreateDynamicComponentService } from "../utils/create-dynamic-component.service";
-
+import { InnerNotifContent } from "./notification-inner-content-example.component";
 
 @NgModule({
     declarations: [
+        InnerNotifContent,
         NotificationComponent,
         NotificationContainerComponent,
     ],
     exports: [
+        InnerNotifContent,
         NotificationComponent,
         NotificationContainerComponent,
     ],
     entryComponents: [
+        InnerNotifContent,
         NotificationComponent,
         NotificationContainerComponent,
     ],
diff --git a/src/angular/notifications/notification/notification.component.html.ts b/src/angular/notifications/notification/notification.component.html.ts
index 450972e..eff98c8 100644
--- a/src/angular/notifications/notification/notification.component.html.ts
+++ b/src/angular/notifications/notification/notification.component.html.ts
@@ -1,4 +1,4 @@
-export default `
+export const template = `
 <div class="sdc-notification" (click)="fadeOut()">
     <div class="sdc-notification__wrapper {{'type-' + notificationSetting.type}}" [class.fade-out__animated]="fade" (animationend)="destroyMe()">
         <div *ngIf="!notificationSetting.hasCustomContent" class="sdc-notification__content">
diff --git a/src/angular/notifications/notification/notification.component.ts b/src/angular/notifications/notification/notification.component.ts
index 476853c..8b89467 100644
--- a/src/angular/notifications/notification/notification.component.ts
+++ b/src/angular/notifications/notification/notification.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, Output, EventEmitter, OnInit, ViewContainerRef, ViewChild } from "@angular/core";
 import { NotificationSettings } from "../utilities/notification.config";
 import { CreateDynamicComponentService } from "../../utils/create-dynamic-component.service";
-import template from "./notification.component.html";
+import { template } from "./notification.component.html";
 
 @Component({
     selector: 'sdc-notification',
@@ -10,31 +10,31 @@
 
 export class NotificationComponent implements OnInit {
 
-    @Input() notificationSetting:NotificationSettings;
+    @Input() notificationSetting: NotificationSettings;
     @Output() destroyComponent = new EventEmitter<any>();
-    @ViewChild("dynamicContentContainer", {read: ViewContainerRef}) contentContainer:ViewContainerRef;
-    private fade: boolean = false;
+    @ViewChild("dynamicContentContainer", { read: ViewContainerRef }) contentContainer: ViewContainerRef;
+    public fade: boolean = false;
 
     constructor(private createDynamicComponentService: CreateDynamicComponentService) {
     }
 
     public ngOnInit() {
-        if(this.notificationSetting.hasCustomContent){
+        if (this.notificationSetting.hasCustomContent) {
             this.createDynamicComponentService.insertComponentDynamically(this.notificationSetting.innerComponentType, this.notificationSetting.innerComponentOptions, this.contentContainer);
         }
 
-        if(!this.notificationSetting.sticky){
+        if (!this.notificationSetting.sticky) {
             setTimeout(() => this.fadeOut(), this.notificationSetting.duration);
         }
     }
 
-    private fadeOut = ():void => {
+    public fadeOut = (): void => {
         this.fade = true;
     }
 
-    private destroyMe() {
+    public destroyMe() {
         /*Only destroy on fade out, not on entry animation */
-        if(this.fade){
+        if (this.fade) {
             this.destroyComponent.emit(this.notificationSetting);
         }
     }
diff --git a/src/angular/notifications/services/notifications.service.ts b/src/angular/notifications/services/notifications.service.ts
index 28a645c..8c77e20 100644
--- a/src/angular/notifications/services/notifications.service.ts
+++ b/src/angular/notifications/services/notifications.service.ts
@@ -3,39 +3,33 @@
 import { Subject } from 'rxjs/Subject';
 import { Subscription } from 'rxjs/Subscription';
 
-
 @Injectable()
 export class NotificationsService  {
 
-    notifs : NotificationSettings[] = [];
+    notifs: NotificationSettings[] = [];
 
-    notifQueue : Subject<any> = new Subject<any>();
+    notifQueue: Subject<any> = new Subject<any>();
 
     constructor() {}
 
-    public push(notif : NotificationSettings):void{
+    public push(notif: NotificationSettings): void {
 
-        if( this.notifQueue.observers.length > 0 ) {
+        if ( this.notifQueue.observers.length > 0 ) {
             this.notifQueue.next(notif);
         } else {
             this.notifs.push(notif);
         }
     }
 
-
-
-    public getNotifications() : NotificationSettings[] {
+    public getNotifications(): NotificationSettings[] {
         return this.notifs;
     }
 
-
-
     public subscribe(observer): Subscription {
-        let s:Subscription = this.notifQueue.subscribe(observer);
+        const s: Subscription = this.notifQueue.subscribe(observer);
         this.notifs.forEach(notif => this.notifQueue.next(notif));
         this.notifs = [];
         return s;
     }
 
-
 }
diff --git a/src/angular/notifications/utilities/notification.config.ts b/src/angular/notifications/utilities/notification.config.ts
index f469b7d..d10ce02 100644
--- a/src/angular/notifications/utilities/notification.config.ts
+++ b/src/angular/notifications/utilities/notification.config.ts
@@ -1,18 +1,18 @@
 import { Type, ComponentRef } from '@angular/core';
 
 export type NotificationType =
-    "info" | "warn" | "error" | "success";
+    "info" | "warning" | "error" | "success";
 
 export class NotificationSettings {
-    
+
     public type: NotificationType;
     public notifyText: string;
     public notifyTitle: string;
     public sticky: boolean;
-    public hasCustomContent :boolean;
-    public duration:number;
+    public hasCustomContent: boolean;
+    public duration: number;
     public innerComponentType: Type<any>;
-    public innerComponentOptions : any;
+    public innerComponentOptions: any;
 
     constructor(type: NotificationType, notifyText: string, notifyTitle: string, duration: number = 10000, sticky: boolean = false, hasCustomContent:boolean = false, innerComponentType?:Type<any>, innerComponentOptions? :any) {
 
diff --git a/src/angular/polyfills.ts b/src/angular/polyfills.ts
new file mode 100644
index 0000000..fbd11b8
--- /dev/null
+++ b/src/angular/polyfills.ts
@@ -0,0 +1,67 @@
+/**
+ * This file includes polyfills needed by Angular and is loaded before the app.
+ * You can add your own extra polyfills to this file.
+ *
+ * This file is divided into 2 sections:
+ *   1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
+ *   2. Application imports. Files imported after ZoneJS that should be loaded before your main
+ *      file.
+ *
+ * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
+ * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
+ * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
+ *
+ * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
+ */
+
+/***************************************************************************************************
+ * BROWSER POLYFILLS
+ */
+
+/** IE9, IE10 and IE11 requires all of the following polyfills. **/
+// import 'core-js/es6/symbol';
+// import 'core-js/es6/object';
+// import 'core-js/es6/function';
+// import 'core-js/es6/parse-int';
+// import 'core-js/es6/parse-float';
+// import 'core-js/es6/number';
+// import 'core-js/es6/math';
+// import 'core-js/es6/string';
+// import 'core-js/es6/date';
+// import 'core-js/es6/array';
+// import 'core-js/es6/regexp';
+// import 'core-js/es6/map';
+// import 'core-js/es6/weak-map';
+// import 'core-js/es6/set';
+
+/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+// import 'classlist.js';  // Run `npm install --save classlist.js`.
+
+/** Evergreen browsers require these. **/
+import 'core-js/es6/reflect';
+import 'core-js/es7/reflect';
+
+/**
+ * Required to support Web Animations `@angular/animation`.
+ * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
+ **/
+// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+
+/***************************************************************************************************
+ * Zone JS is required by Angular itself.
+ */
+import 'zone.js/dist/zone'; // Included with Angular CLI.
+
+/***************************************************************************************************
+ * APPLICATION IMPORTS
+ */
+
+/**
+ * Date, currency, decimal and percent pipes.
+ * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
+ */
+// import 'intl';  // Run `npm install --save intl`.
+/**
+ * Need to import at least one locale-data with intl.
+ */
+// import 'intl/locale-data/jsonp/en';
diff --git a/src/angular/popup-menu/popup-menu-item.component.spec.ts b/src/angular/popup-menu/popup-menu-item.component.spec.ts
index 25b2694..8454317 100644
--- a/src/angular/popup-menu/popup-menu-item.component.spec.ts
+++ b/src/angular/popup-menu/popup-menu-item.component.spec.ts
@@ -1,7 +1,4 @@
-import { Component, Input, Output, ContentChildren, SimpleChanges, QueryList, EventEmitter, OnChanges, AfterContentInit } from '@angular/core';
-import { FormsModule } from "@angular/forms";
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { PopupMenuItemComponent } from './popup-menu-item.component';
 import { PopupMenuListComponent } from './popup-menu-list.component';
 
 describe('Popup Menu', () => {
diff --git a/src/angular/popup-menu/popup-menu.module.ts b/src/angular/popup-menu/popup-menu.module.ts
index 3a58b91..03559f2 100644
--- a/src/angular/popup-menu/popup-menu.module.ts
+++ b/src/angular/popup-menu/popup-menu.module.ts
@@ -3,7 +3,6 @@
 import { PopupMenuItemComponent } from "./popup-menu-item.component";
 import { CommonModule } from "@angular/common";
 
-
 @NgModule({
     declarations: [
         PopupMenuListComponent,
diff --git a/src/angular/searchbar/search-bar.component.html.ts b/src/angular/searchbar/search-bar.component.html.ts
index 79153f4..5d10a87 100644
--- a/src/angular/searchbar/search-bar.component.html.ts
+++ b/src/angular/searchbar/search-bar.component.html.ts
@@ -1,4 +1,4 @@
-export default `
+export const template = `
 <div class="search-bar-container" [ngClass]="{'not-empty': searchQuery}">
     <sdc-input class="sdc-input-wrapper"
                [label]="label"
diff --git a/src/angular/searchbar/search-bar.component.ts b/src/angular/searchbar/search-bar.component.ts
index 7f508d7..42dfaeb 100644
--- a/src/angular/searchbar/search-bar.component.ts
+++ b/src/angular/searchbar/search-bar.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, Output, EventEmitter, HostBinding } from '@angular/core';
-import template from "./search-bar.component.html";
+import { template } from "./search-bar.component.html";
 
 @Component({
     selector: 'sdc-search-bar',
@@ -11,9 +11,14 @@
     @Input() public placeholder: string;
     @Input() public label: string;
     @Input() public searchQuery: string;
+    @Input() public debounceTime: number;
     @Output() public searchQueryClick: EventEmitter<string> = new EventEmitter<string>();
 
-    private searchButtonClick = (): void => {
-      this.searchQueryClick.emit(this.searchQuery);
+    // constructor() {
+    //     this.debounceTime = 200;
+    // }
+    
+    public searchButtonClick = (): void => {
+        this.searchQueryClick.emit(this.searchQuery);
     }
 }
diff --git a/src/angular/services.ts b/src/angular/services.ts
new file mode 100644
index 0000000..65d5918
--- /dev/null
+++ b/src/angular/services.ts
@@ -0,0 +1,13 @@
+/*
+ Exports all the services of onap-ui-angular.
+ */
+
+// Modals
+export { ModalService } from "./modals/modal.service";
+
+// Loader
+export { LoaderService } from './loader/loader.service';
+
+// Notifications
+export { NotificationsService } from "./notifications/services/notifications.service";
+
diff --git a/src/angular/styles.css b/src/angular/styles.css
new file mode 100644
index 0000000..1d04302
--- /dev/null
+++ b/src/angular/styles.css
@@ -0,0 +1,9 @@
+/* You can add global styles to this file, and also import other style files */
+
+.green-color {
+  color: green;
+}
+
+.css-rules-warning {
+  display: none;
+}
diff --git a/src/angular/svg-icon/svg-icon-label.component.html.ts b/src/angular/svg-icon/svg-icon-label.component.html.ts
index 558b7c4..7925739 100644
--- a/src/angular/svg-icon/svg-icon-label.component.html.ts
+++ b/src/angular/svg-icon/svg-icon-label.component.html.ts
@@ -1,4 +1,4 @@
-export default `
+export const template = `
 <div class="svg-icon-wrapper" [ngClass]="[(mode) ? 'mode-'+mode : '', (size) ? 'size-'+size : '', (labelPlacement) ? 'label-placement-'+labelPlacement : '', (clickable) ? 'clickable' : '', className || '']" [attr.disabled]="disabled || undefined">
     <svg-icon [name]="name" className="svg-icon"></svg-icon>
     <span class="svg-icon-label" [ngClass]="[labelClassName || '']">{{ label }}</span>
diff --git a/src/angular/svg-icon/svg-icon-label.component.ts b/src/angular/svg-icon/svg-icon-label.component.ts
index 5a00c3d..c4cdae1 100644
--- a/src/angular/svg-icon/svg-icon-label.component.ts
+++ b/src/angular/svg-icon/svg-icon-label.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input } from "@angular/core";
 import { SvgIconComponent } from './svg-icon.component';
-import { Mode, Size, Placement } from "../common/enums";
+import { Placement } from "../common/enums";
 import { DomSanitizer, SafeHtml } from "@angular/platform-browser";
-import template from './svg-icon-label.component.html';
+import { template } from './svg-icon-label.component.html';
 
 @Component({
     selector: 'svg-icon-label',
diff --git a/src/angular/svg-icon/svg-icon.component.html.ts b/src/angular/svg-icon/svg-icon.component.html.ts
index 1baedbd..a991ed3 100644
--- a/src/angular/svg-icon/svg-icon.component.html.ts
+++ b/src/angular/svg-icon/svg-icon.component.html.ts
@@ -1,3 +1,3 @@
-export default `
+export const template = `
 <div [ngClass]="classes" [attr.disabled]="disabled || undefined" [innerHtml]="svgIconContentSafeHtml"></div>
 `;
diff --git a/src/angular/svg-icon/svg-icon.component.ts b/src/angular/svg-icon/svg-icon.component.ts
index d53981d..f41b206 100644
--- a/src/angular/svg-icon/svg-icon.component.ts
+++ b/src/angular/svg-icon/svg-icon.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input, OnChanges, SimpleChanges, HostBinding } from "@angular/core";
 import { DomSanitizer, SafeHtml } from "@angular/platform-browser";
-import { Mode, Size } from "../common/enums";
-import iconsMap from '../../common/icons-map';
-import template from './svg-icon.component.html';
+import { Mode, Size, BackgroundShape, BackgroundColor } from "../common/enums";
+import { iconsMap } from 'onap-ui-common';
+import { template } from './svg-icon.component.html';
 
 @Component({
     selector: 'svg-icon',
@@ -16,35 +16,37 @@
 export class SvgIconComponent implements OnChanges {
 
     @Input() public name: string;
+    @Input() public category: string;
     @Input() public mode: Mode;
     @Input() public size: Size;
+    @Input() public backgroundShape: BackgroundShape;
+    @Input() public backgroundColor: BackgroundColor;
     @Input() public disabled: boolean;
     @Input() public clickable: boolean;
     @Input() public className: any;
-
+    
     public svgIconContent: string;
     public svgIconContentSafeHtml: SafeHtml;
     public svgIconCustomClassName: string;
-    private classes: string;
+    public classes: string;
 
     constructor(protected domSanitizer: DomSanitizer) {
         this.size = Size.medium;
         this.disabled = false;
+        this.category = this.category || "common";
     }
 
-    static get Icons(): {[key: string]: string} {
+    static Icons(): { [key: string]: string } {
         return iconsMap;
     }
 
     public ngOnChanges(changes: SimpleChanges) {
-        if (changes.name) {
-            this.updateSvgIconByName();
-            this.buildClasses();
-        }
+        this.updateSvgIconByName();
+        this.buildClasses();
     }
 
     protected updateSvgIconByName() {
-        this.svgIconContent = SvgIconComponent.Icons[this.name] || null;
+        this.svgIconContent = iconsMap[this.category][this.name] || null;    
         if (this.svgIconContent) {
             this.svgIconContentSafeHtml = this.domSanitizer.bypassSecurityTrustHtml(this.svgIconContent);
             this.svgIconCustomClassName = '__' + this.name.replace(/\s+/g, '_');
@@ -55,22 +57,17 @@
     }
 
     private buildClasses = (): void => {
-        const _classes = [];
-        _classes.push('svg-icon');
-        if (this.mode) {
-            _classes.push('mode-' + this.mode);
-        }
-        if (this.size) {
-            _classes.push('size-' + this.size);
-        }
-        if (this.clickable) {
-            _classes.push('clickable');
-        }
-        if (this.svgIconCustomClassName) {
-            _classes.push(this.svgIconCustomClassName);
-        }
-        if (this.className) {
-            _classes.push(this.className);
+        const _classes = ['svg-icon'];
+        if (this.mode) { _classes.push('mode-' + this.mode); }
+        if (this.size) { _classes.push('size-' + this.size); }
+        if (this.clickable) { _classes.push('clickable'); }
+        if (this.svgIconCustomClassName) { _classes.push(this.svgIconCustomClassName); }
+        if (this.className) { _classes.push(this.className); }
+        if (this.backgroundShape) { _classes.push('bg-type-' + this.backgroundShape); }
+        if (this.backgroundShape && this.backgroundColor) {
+            _classes.push('bg-color-' + this.backgroundColor);
+        } else if (this.backgroundShape && !this.backgroundColor) {
+            _classes.push('bg-color-primary');
         }
         this.classes = _classes.join(" ");
     }
diff --git a/src/angular/tabs/children/tab.component.html.ts b/src/angular/tabs/children/tab.component.html.ts
index 36ff413..cff7a8c 100644
--- a/src/angular/tabs/children/tab.component.html.ts
+++ b/src/angular/tabs/children/tab.component.html.ts
@@ -1,4 +1,4 @@
-export default `
+export const template = `
 <div [hidden]="!active" class="sdc-tab-content" role="tabpanel">
     <ng-content></ng-content>
 </div>
diff --git a/src/angular/tabs/children/tab.component.ts b/src/angular/tabs/children/tab.component.ts
index 3b96e87..a289aab 100644
--- a/src/angular/tabs/children/tab.component.ts
+++ b/src/angular/tabs/children/tab.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 import { Mode } from './../../common/enums';
-import template from "./tab.component.html";
+import { template } from "./tab.component.html";
 
 @Component({
   selector: 'sdc-tab',
diff --git a/src/angular/tabs/tabs.component.html.ts b/src/angular/tabs/tabs.component.html.ts
index 2333b86..ac82dd6 100644
--- a/src/angular/tabs/tabs.component.html.ts
+++ b/src/angular/tabs/tabs.component.html.ts
@@ -1,4 +1,4 @@
-export default `
+export const template = `
 <ul class="sdc-tabs-list" role="tablist">
     <li *ngFor="let tab of tabs" class="sdc-tab" role="tab" (click)="selectTab(tab)" [class.sdc-tab-active]="tab.active">
         <span *ngIf="tab.title">{{tab.title}}</span>
diff --git a/src/angular/tabs/tabs.component.ts b/src/angular/tabs/tabs.component.ts
index 595f304..c3b6507 100644
--- a/src/angular/tabs/tabs.component.ts
+++ b/src/angular/tabs/tabs.component.ts
@@ -1,8 +1,7 @@
-import { Component, Input, AfterContentInit, ContentChildren, QueryList, HostBinding } from '@angular/core';
+import { Component, Input, AfterContentInit, ContentChildren, QueryList, HostBinding, EventEmitter, Output } from '@angular/core';
 import { TabComponent } from './children/tab.component';
-import { SvgIconComponent } from "./../../../src/angular/svg-icon/svg-icon.component";
-import { Mode, Placement, Size } from './../common/enums';
-import template from "./tabs.component.html";
+import { Mode, Size } from './../common/enums';
+import { template } from "./tabs.component.html";
 
 @Component({
     selector: 'sdc-tabs',
@@ -12,20 +11,22 @@
 export class TabsComponent implements AfterContentInit {
 
     @HostBinding('class') classes = 'sdc-tabs sdc-tabs-header';
-    @ContentChildren(TabComponent) private tabs: QueryList<TabComponent>;
+    @ContentChildren(TabComponent) public tabs: QueryList<TabComponent>;
+    @Output() public selectedTab: EventEmitter<TabComponent> = new EventEmitter<TabComponent>();   
 
     public _size = Size.medium;
 
     public selectTab(tab: TabComponent) {
-      // deactivate all tabs
-      this.tabs.toArray().forEach((_tab: TabComponent) => {
-        _tab.active = false;
-        _tab.titleIconMode = Mode.secondary;
-      });
+        this.selectedTab.emit(tab);
+        // deactivate all tabs
+        this.tabs.toArray().forEach((_tab: TabComponent) => {
+            _tab.active = false;
+            _tab.titleIconMode = Mode.secondary;
+        });
 
-      // activate the tab the user has clicked on.
-      tab.active = true;
-      tab.titleIconMode = Mode.primary;
+        // activate the tab the user has clicked on.
+        tab.active = true;
+        tab.titleIconMode = Mode.primary;
     }
 
     public ngAfterContentInit() {
@@ -38,4 +39,4 @@
         }
     }
 
-  }
+}
diff --git a/src/angular/tabs/tabs.module.ts b/src/angular/tabs/tabs.module.ts
index 107942d..6b42c0e 100644
--- a/src/angular/tabs/tabs.module.ts
+++ b/src/angular/tabs/tabs.module.ts
@@ -1,6 +1,5 @@
 import { NgModule } from "@angular/core";
 import { CommonModule } from "@angular/common";
-import { FormElementsModule } from "../form-elements/form-elements.module";
 import { TabsComponent } from "./tabs.component";
 import { TabComponent } from './children/tab.component';
 import { SvgIconModule } from './../svg-icon/svg-icon.module';
diff --git a/src/angular/tag-cloud/tag-cloud.component.html.ts b/src/angular/tag-cloud/tag-cloud.component.html.ts
index 2ff4e8a..f3439e6 100644
--- a/src/angular/tag-cloud/tag-cloud.component.html.ts
+++ b/src/angular/tag-cloud/tag-cloud.component.html.ts
@@ -1,4 +1,4 @@
-export default `
+export const template = `
 <div class="sdc-tag-cloud-new-item-field" [ngClass]="{'not-empty': newTagItem}">
     <sdc-input [label]="label"
                [disabled]="(isViewOnly===true)"
diff --git a/src/angular/tag-cloud/tag-cloud.component.ts b/src/angular/tag-cloud/tag-cloud.component.ts
index 1635b8d..b7a2fec 100644
--- a/src/angular/tag-cloud/tag-cloud.component.ts
+++ b/src/angular/tag-cloud/tag-cloud.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
-import template from "./tag-cloud.component.html";
+import { template } from "./tag-cloud.component.html";
 
 @Component({
     selector: 'sdc-tag-cloud',
@@ -7,22 +7,22 @@
 })
 export class TagCloudComponent {
     @Input() public list: string[];
-    @Input() public isViewOnly: boolean|number[]; // get a boolean parameter or array of specific items indexes.
+    @Input() public isViewOnly: boolean | number[]; // get a boolean parameter or array of specific items indexes.
     @Input() public isUniqueList: boolean;
     @Input() public uniqueErrorMessage: string = "Unique error";
     @Input() public label: string;
     @Input() public placeholder: string;
     @Output() public listChanged: EventEmitter<string[]> = new EventEmitter<string[]>();
-    private newTagItem: string;
-    private uniqueError: boolean;
+    public newTagItem: string;
+    public uniqueError: boolean;
 
-    private onKeyup = (e): void => {
+    public onKeyup = (e): void => {
         if (e.keyCode === 13) {
             this.insertItemToList();
         }
     }
 
-    private insertItemToList = (): void => {
+    public insertItemToList = (): void => {
         this.validateTag();
         if (!this.uniqueError && this.newTagItem.length) {
             this.list.push(this.newTagItem);
diff --git a/src/angular/tag-cloud/tag-item/tag-item.component.html.ts b/src/angular/tag-cloud/tag-item/tag-item.component.html.ts
index 04112c1..db0e115 100644
--- a/src/angular/tag-cloud/tag-item/tag-item.component.html.ts
+++ b/src/angular/tag-cloud/tag-item/tag-item.component.html.ts
@@ -1,4 +1,4 @@
-export default `
+export const template = `
 <div class="tag-item" [ngClass]="{'view-only':isViewOnly}">
     <span>{{text}}</span>
     <span class="delete-item" *ngIf="!isViewOnly" (click)="clickOnDelete.emit(index)">
diff --git a/src/angular/tag-cloud/tag-item/tag-item.component.ts b/src/angular/tag-cloud/tag-item/tag-item.component.ts
index f2e2fa7..7da8f36 100644
--- a/src/angular/tag-cloud/tag-item/tag-item.component.ts
+++ b/src/angular/tag-cloud/tag-item/tag-item.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, Output, HostBinding } from "@angular/core";
-import template from "./tag-item.component.html";
+import { template } from "./tag-item.component.html";
 
 @Component({
     selector: 'sdc-tag-item',
diff --git a/src/angular/test.ts b/src/angular/test.ts
new file mode 100644
index 0000000..fe4ee8c
--- /dev/null
+++ b/src/angular/test.ts
@@ -0,0 +1,29 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/dist/long-stack-trace-zone';
+import 'zone.js/dist/proxy.js';
+import 'zone.js/dist/sync-test';
+import 'zone.js/dist/jasmine-patch';
+import 'zone.js/dist/async-test';
+import 'zone.js/dist/fake-async-test';
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting,
+} from '@angular/platform-browser-dynamic/testing';
+
+// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
+declare const __karma__: any;
+declare const require: any;
+
+// Prevent Karma from running prematurely.
+__karma__.loaded = function() {};
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);
+// Finally, start Karma to run the tests.
+__karma__.start();
diff --git a/src/angular/tiles/tile.component.html.ts b/src/angular/tiles/tile.component.html.ts
index 81803d5..2e96b42 100644
--- a/src/angular/tiles/tile.component.html.ts
+++ b/src/angular/tiles/tile.component.html.ts
@@ -1,4 +1,4 @@
-export default `
+export const template = `
 <ng-content select="sdc-tile-header"></ng-content>
 <ng-content select="sdc-tile-content"></ng-content>
 <ng-content select="sdc-tile-footer"></ng-content>
diff --git a/src/angular/tiles/tile.component.ts b/src/angular/tiles/tile.component.ts
index 3791ca0..6379294 100644
--- a/src/angular/tiles/tile.component.ts
+++ b/src/angular/tiles/tile.component.ts
@@ -1,5 +1,5 @@
 import { Component, HostBinding } from '@angular/core';
-import template from "./tile.component.html";
+import { template } from "./tile.component.html";
 
 @Component({
     selector: "sdc-tile",
diff --git a/src/angular/tooltip/tooltip.directive.ts b/src/angular/tooltip/tooltip.directive.ts
index 77cec62..5489657 100644
--- a/src/angular/tooltip/tooltip.directive.ts
+++ b/src/angular/tooltip/tooltip.directive.ts
@@ -192,7 +192,7 @@
      * @returns {IPlacementData}
      */
     private getPlacement(placement: TooltipPlacement,
-                         ...additionalPlacements: TooltipPlacement[],
+                         ...additionalPlacements: TooltipPlacement[]
                          ): IPlacementData {
         const placements: TooltipPlacement[] = [placement, ...additionalPlacements];
         const filterPlacements = placements
diff --git a/src/angular/tooltip/tooltip.module.ts b/src/angular/tooltip/tooltip.module.ts
index a4ad86d..8911008 100644
--- a/src/angular/tooltip/tooltip.module.ts
+++ b/src/angular/tooltip/tooltip.module.ts
@@ -1,6 +1,7 @@
 import { NgModule } from '@angular/core';
 import { TooltipDirective } from './tooltip.directive';
 import { TooltipTemplateComponent } from './tooltip-template.component';
+import { CreateDynamicComponentService } from '../utils/create-dynamic-component.service';
 
 @NgModule({
     declarations: [
@@ -12,6 +13,7 @@
     exports: [
         TooltipDirective
     ],
+    providers: [CreateDynamicComponentService]
 })
 export class TooltipModule {
 }
diff --git a/src/angular/tsconfig.app.json b/src/angular/tsconfig.app.json
new file mode 100644
index 0000000..dafdb9b
--- /dev/null
+++ b/src/angular/tsconfig.app.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/app",
+    "baseUrl": "./",
+    "module": "es2015",
+    "types": [
+      "node"
+    ]
+  },
+  "exclude": [
+    "test.ts",
+    "**/*.spec.ts"
+  ]
+}
diff --git a/src/angular/tsconfig.spec.json b/src/angular/tsconfig.spec.json
new file mode 100644
index 0000000..c5d30ee
--- /dev/null
+++ b/src/angular/tsconfig.spec.json
@@ -0,0 +1,20 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/spec",
+    "baseUrl": "./",
+    "module": "commonjs",
+    "target": "es5",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "test.ts"
+  ],
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}
diff --git a/src/angular/typings.d.ts b/src/angular/typings.d.ts
new file mode 100644
index 0000000..b58fa33
--- /dev/null
+++ b/src/angular/typings.d.ts
@@ -0,0 +1,10 @@
+/* SystemJS module definition */
+declare var module: NodeModule;
+interface NodeModule {
+  id: string;
+}
+
+declare module '*.json' {
+  const value: any;
+  export default value;
+}
diff --git a/src/angular/utils/create-dynamic-component.service.ts b/src/angular/utils/create-dynamic-component.service.ts
index 428dd73..506f787 100644
--- a/src/angular/utils/create-dynamic-component.service.ts
+++ b/src/angular/utils/create-dynamic-component.service.ts
@@ -17,8 +17,7 @@
      * @memberOf InjectionService
      */
     private getRootViewContainer(): ComponentRef<any> {
-        const rootComponents = this.applicationRef['_rootComponents']; // Angular2
-        // const rootComponents = this.applicationRef['components']; // Angular5
+        const rootComponents = this.applicationRef['components'];
         if (rootComponents.length) {
             return rootComponents[0];
         }
diff --git a/src/style/scss/angular/_svg_icon.scss b/src/assets/styles/_svg_icon.scss
similarity index 85%
rename from src/style/scss/angular/_svg_icon.scss
rename to src/assets/styles/_svg_icon.scss
index 16be14b..b13e7f6 100644
--- a/src/style/scss/angular/_svg_icon.scss
+++ b/src/assets/styles/_svg_icon.scss
@@ -68,6 +68,11 @@
         @include color-icon-hover($dark-blue);
     }
 
+    &.mode-white {
+        @include color-icon($white);
+        @include color-icon-hover($light-gray);
+    }
+
     &.size-x_small {
         width: 12px;
         height: 12px;
@@ -92,6 +97,39 @@
         width: 48px;
         height: 48px;
     }
+
+    &.bg-type-circle {
+        border-radius: 50%;
+        padding: 6px;
+    }
+
+    &.bg-type-rectangle {
+        padding: 6px;
+    }
+
+    &.bg-color-primary {
+        background-color: $purple;
+    }
+
+    &.bg-color-secondary {
+        background-color: $light-blue;
+    }
+
+    &.bg-color-success {
+        background-color: $green;
+    }
+
+    &.bg-color-error {
+        background-color: $red;
+    }
+
+    &.bg-color-warning {
+        background-color: $yellow;
+    }
+
+    &.bg-color-info {
+        background-color: $blue;
+    }
 }
 
 .svg-icon-wrapper {
diff --git a/src/style/scss/angular/_tooltip_custom_style.scss b/src/assets/styles/_tooltip_custom_style.scss
similarity index 100%
rename from src/style/scss/angular/_tooltip_custom_style.scss
rename to src/assets/styles/_tooltip_custom_style.scss
diff --git a/src/assets/styles/style.scss b/src/assets/styles/style.scss
new file mode 100644
index 0000000..3291bce
--- /dev/null
+++ b/src/assets/styles/style.scss
@@ -0,0 +1,5 @@
+@import 'node_modules/onap-ui-common/lib/style'; 
+@import 'node_modules/onap-ui-common/lib/scss/variables.scss'; 
+@import 'node_modules/onap-ui-common/lib/scss/mixins.scss'; 
+@import 'svg_icon.scss';
+@import 'tooltip_custom_style.scss';
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
new file mode 100644
index 0000000..5d08331
--- /dev/null
+++ b/src/environments/environment.prod.ts
@@ -0,0 +1,3 @@
+export const environment = {
+    production: true
+};
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
new file mode 100644
index 0000000..1550c85
--- /dev/null
+++ b/src/environments/environment.ts
@@ -0,0 +1,7 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// The list of which env maps to which file can be found in `angular-cli.json`.
+export const environment = {
+    production: false
+};
diff --git a/src/react/Accordion.js b/src/react/Accordion.js
deleted file mode 100644
index 3acdd24..0000000
--- a/src/react/Accordion.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import SVGIcon from './SVGIcon.js';
-
-class Accordion extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      open: props.defaultExpanded
-    };
-  }
-  render() {
-    const { children, title, className, dataTestId } = this.props;
-    const { open } = this.state;
-    return (
-      <div className={`sdc-accordion ${className}`}>
-        <div data-test-id={dataTestId} onClick={() => this.setState({ open: !open })} className='sdc-accordion-header'>
-          <SVGIcon name='chevronDown' iconClassName={open ? 'down' : ''} />
-          <div className='title'>{title}</div>
-        </div>
-        <div className={`sdc-accordion-body ${open ? 'open' : ''}`}>{children}</div>
-      </div>
-    );
-  }
-}
-
-Accordion.propTypes = {
-  title: PropTypes.string,
-  children: PropTypes.node,
-  expandByDefault: PropTypes.bool,
-  dataTestId: PropTypes.string
-};
-
-Accordion.defaultProps = {
-  title: '',
-  className: '',
-  defaultExpanded: false
-};
-
-export default Accordion;
diff --git a/src/react/Button.js b/src/react/Button.js
deleted file mode 100644
index c628455..0000000
--- a/src/react/Button.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import SVGIcon from './SVGIcon.js';
-
-const Button = ({btnType, size, className, iconName, onClick, disabled, children, ...other}) => (
-	<button
-		onClick={onClick}
-		className={`sdc-button sdc-button__${btnType} ${size && `btn-${size}`} ${className} ${iconName}`}
-		disabled={disabled}
-		{...other}>
-		{
-			iconName ?
-				<SVGIcon name={iconName} label={children} labelPosition='right' />
-			:
-				children
-		}
-	</button>
-);
-
-Button.propTypes = {
-	btnType: PropTypes.string,
-	size: PropTypes.oneOf(['', 'default', 'x-small', 'small', 'medium', 'large']),
-	className: PropTypes.string,
-	iconName: PropTypes.string,
-	onClick: PropTypes.func,
-	disabled: PropTypes.bool
-};
-
-Button.defaultProps = {
-	btnType: 'primary',
-	size: '',
-	className: '',
-	iconName: '',
-	disabled: false
-};
-
-export default Button;
diff --git a/src/react/Checkbox.js b/src/react/Checkbox.js
deleted file mode 100644
index bef6945..0000000
--- a/src/react/Checkbox.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import React from 'react';
-
-class Checkbox extends React.Component {
-
-	render() {
-		let {checked = false, disabled, value, label, inputRef, className, name} = this.props;
-		let dataTestId = this.props['data-test-id'];
-
-		return (
-			<div className={`sdc-checkbox ${className || ''}`}>
-				<label>
-					<input
-						className='sdc-checkbox__input'
-						ref={inputRef}
-						data-test-id={dataTestId}
-						type='checkbox'
-						checked={checked}
-						name={name}
-						value={value}
-						onChange={(e) => this.onChange(e)}
-						disabled={disabled} />
-					<span className='sdc-checkbox__label'>{label}</span>
-				</label>
-			</div>
-		);
-	}
-
-	onChange(e) {
-		let {onChange} = this.props;
-		if (onChange) {
-			onChange(e.target.checked);
-		}
-	}
-
-	getChecked() {
-		return this.props.checked;
-	}
-
-	getValue() {
-		return this.props.value;
-	}
-
-}
-
-export default Checkbox;
diff --git a/src/react/Checklist.js b/src/react/Checklist.js
deleted file mode 100644
index 1a42aee..0000000
--- a/src/react/Checklist.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import Checkbox from './Checkbox.js';
-
-const Checklist = ({ items = [], className, onChange }) => (
-    <div className={className}>
-        {items.map((item, index) => {
-            return (
-                <div key={`checkbox-item-${index}`} className='checkbox-item'>
-                    <Checkbox
-                        key={`${item.label}${index}`}
-                        label={item.label}
-                        value={item.value}
-                        checked={item.checked}
-                        disabled={item.disabled}
-                        onChange={value => {
-                            let obj = {};
-                            obj[item.value] = value;
-                            onChange(obj);
-                        }}
-                        data-test-id={item.dataTestId}
-                    />
-                </div>
-            );
-        })}
-    </div>
-);
-
-Checklist.propTypes = {
-    items: PropTypes.arrayOf(
-        PropTypes.shape({
-            label: PropTypes.string,
-            value: PropTypes.string,
-            checked: PropTypes.bool,
-            disabled: PropTypes.bool,
-            dataTestId: PropTypes.string
-        })
-    ),
-    className: PropTypes.string,
-    onChange: PropTypes.func
-};
-
-export default Checklist;
\ No newline at end of file
diff --git a/src/react/Input.js b/src/react/Input.js
deleted file mode 100644
index 5760637..0000000
--- a/src/react/Input.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import SVGIcon from './SVGIcon.js';
-
-class Input extends React.Component {
-
-	render() {
-		let {className, disabled, errorMessage, readOnly, label, name, value, type, placeholder, isRequired} = this.props;
-		let dataTestId = this.props['data-test-id'];
-		let inputClasses = `sdc-input__input ${errorMessage ? 'error' : ''} ${readOnly ? 'view-only' : ''}`;
-		let labelClasses = `sdc-input__label ${readOnly ? 'view-only' : ''} ${isRequired ? 'required' : ''}`;
-
-		return (
-			<div className={`sdc-input ${className || ''}`}>
-
-				<label className={labelClasses} htmlFor={name}>{label}</label>
-				<input className={inputClasses}
-				       disabled={disabled}
-				       readOnly={readOnly}
-				       type={type}
-				       id={name}
-				       name={name}
-				       value={this.props.value}
-				       placeholder={placeholder}
-				       data-test-id={dataTestId}
-				       onBlur={(e) => this.onBlur(e)}
-				       onKeyDown={(e) => this.onKeyDown(e)}
-				       onChange={(e) => this.onChange(e)}/>
-				{ errorMessage && <div className="sdc-label__error">
-					<SVGIcon
-						label={errorMessage}
-						labelPosition='right'
-						color='negative'
-						name='exclamationTriangleFull' />
-				</div>}
-			</div>
-		);
-	}
-
-	onChange(e) {
-		let {onChange, readOnly, disabled} = this.props;
-		if (onChange && !readOnly && !disabled) {
-			onChange(e.target.value);
-		}
-	}
-
-	onBlur(e) {
-		let {onBlur, readOnly} = this.props;
-		if (!readOnly && onBlur) {
-			onBlur(e);
-		}
-	}
-
-	onKeyDown(e) {
-		let {onKeyDown, readOnly} = this.props;
-		if (!readOnly && onKeyDown) {
-			onKeyDown(e);
-		}
-	}
-
-	getValue() {
-		return this.props.value;
-	}
-
-}
-Input.propTypes = {
-	name: PropTypes.string,
-	value: PropTypes.string,
-	type: PropTypes.oneOf(['text', 'number']),
-	placeholder : PropTypes.string,
-	onChange: PropTypes.func,
-	onBlur: PropTypes.func,
-	onKeyDown: PropTypes.func,
-	errorMessage: PropTypes.string,
-	readOnly: PropTypes.bool,
-	isRequired: PropTypes.bool,
-	disabled: PropTypes.bool,
-	label: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
-	className: PropTypes.string
-};
-
-Input.defaultProps = {
-	type: 'text',
-	readOnly: false,
-	isRequired: false,
-	disabled: false
-};
-export default Input;
diff --git a/src/react/Modal.js b/src/react/Modal.js
deleted file mode 100644
index ab2f7d7..0000000
--- a/src/react/Modal.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import Portal  from './Portal.js';
-import Body from './ModalBody.js';
-import Header from './ModalHeader.js';
-import Footer from './ModalFooter.js';
-import Title from './ModalTitle.js';
-
-export const modalSize = {
-	medium: 'md',
-	large: 'l',
-	extraLarge: 'xl',
-	small: 'sm',
-	extraSmall: 'xsm'
-};
-
-
-class Modal extends React.Component {
-	
-	render() {       
-		const {size, type, children, show} = this.props;				
-		return (           
-            <Portal>  
-				<div ref={el => { this.modalRef = el;}}>
-					{show && <div className={`sdc-modal ${modalSize[size]}`}>
-						<div className={`sdc-modal__wrapper sdc-modal-type-${type}`}>
-							{children}
-						</div>
-					</div>}            
-					{show && <div className='modal-background' />}
-				</div>    
-            </Portal>
-		);
-	}	
-}
-
-Modal.defaultProps = {
-	show: false,
-	size: 'medium',
-	type: 'info'
-};
-
-Modal.propTypes = {
-	show: PropTypes.bool,
-	size: PropTypes.string,
-	children: PropTypes.node,
-	type: PropTypes.string
-};
-
-Modal.Body = Body;
-Modal.Header = Header;
-Modal.Footer = Footer;
-Modal.Title = Title; 
-export default Modal;
\ No newline at end of file
diff --git a/src/react/ModalBody.js b/src/react/ModalBody.js
deleted file mode 100644
index 4fae0f6..0000000
--- a/src/react/ModalBody.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const ModalBody = ({children, className}) => (
-    <div className={`sdc-modal__content ${className}`} >
-        {children}
-    </div>
-);
-
-ModalBody.propTypes = {
-	children: PropTypes.node,
-	className: PropTypes.string
-};
-
-ModalBody.defaultProps = {
-    className: ''
-};
-
-export default ModalBody;
\ No newline at end of file
diff --git a/src/react/ModalFooter.js b/src/react/ModalFooter.js
deleted file mode 100644
index 607895d..0000000
--- a/src/react/ModalFooter.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import Button from './Button.js';
-
-const Footer = ({onClose, closeButtonText, actionButtonText, actionButtonClick, withButtons, children}) => {
-	const closeBtnType = actionButtonClick ? 'secondary' : 'primary';
-	return (
-        <div className='sdc-modal__footer'>
-            {children}   
-            {                 
-                withButtons && <div>
-                    {actionButtonClick && 
-                        <Button onClick={actionButtonClick}>{actionButtonText}</Button>        
-                    }    
-                    <Button btnType={closeBtnType}  onClick={onClose}>{closeButtonText}</Button>        
-                </div>
-            }
-        </div>
-	);
-};
-
-Footer.propTypes = {
-	onClose: PropTypes.func,
-	closeButtonText: PropTypes.string,
-	actionButtonText: PropTypes.string,
-	actionButtonClick: PropTypes.func,
-	withButtons: PropTypes.bool,
-	children: PropTypes.node
-};
-
-Footer.defaultProps = {
-	closeButtonText: 'Close',
-	withButtons: true
-};
-
-export default Footer;
\ No newline at end of file
diff --git a/src/react/ModalHeader.js b/src/react/ModalHeader.js
deleted file mode 100644
index c6be5ef..0000000
--- a/src/react/ModalHeader.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import SVGIcon from './SVGIcon.js';
-
-const iconMaper = {
-	error: 'error',
-	info: 'errorCircle',
-	alert: 'exclamationTriangleLine'
-};
-
-const headerTypes = {
-    error: 'sdc-error__header',
-    info: 'sdc-info__header',
-    alert: 'sdc-alert__header',
-    custom: 'sdc-custom__header'
-}
-
-
-
-const Header = ({children, onClose, type}) => (
-    <div className={ headerTypes[type] + ' sdc-modal__header'} >
-        {type !== 'custom'
-            &&  
-                    <SVGIcon iconClassName='sdc-modal__icon' className='sdc-modal__svg-use'  name={iconMaper[type]}/>   
-                 
-        } 
-        {children}
-        <SVGIcon iconClassName ='sdc-modal__close-button-svg' className='sdc-modal__close-button' onClick={onClose} name='close'/>        
-    </div>
-);
-
-Header.propTypes = {
-	children: PropTypes.node,
-	onClose: PropTypes.func
-};
-
-Header.defaultProps = {
-	type: 'info'
-};
-
-export default Header;
\ No newline at end of file
diff --git a/src/react/ModalTitle.js b/src/react/ModalTitle.js
deleted file mode 100644
index b48cc8a..0000000
--- a/src/react/ModalTitle.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const Title = ({children, className}) => (
-    <div className={`title ${className}`} >
-        {children}
-    </div>
-);
-
-Title.PropTypes = {
-	children: PropTypes.node,
-	className: PropTypes.string
-};
-
-Title.defaultProps = {
-	className: ''
-};
-
-export default Title;
\ No newline at end of file
diff --git a/src/react/Panel.js b/src/react/Panel.js
deleted file mode 100644
index 34d2e62..0000000
--- a/src/react/Panel.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const Panel = ({ className, children }) => (
-    <div className={`sdc-panel ${className}`}>
-        {children}
-    </div>
-);
-
-Panel.propTypes = {
-    className: PropTypes.string,
-    children: PropTypes.node
-};
-
-Panel.defaultProps = {
-    className: ''
-};
-export default Panel;
\ No newline at end of file
diff --git a/src/react/PopupMenu.js b/src/react/PopupMenu.js
deleted file mode 100644
index d2cd29a..0000000
--- a/src/react/PopupMenu.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import PopupMenuItem from './PopupMenuItem';
-
-class PopupMenu extends React.Component {
-	render() {
-		const {children = [], onMenuItemClick, position = {}, relative} = this.props;
-		const style = relative ? {left: position.x, top: position.y} : {};
-
-		return (
-			<ul className={`sdc-menu-list ${relative ? 'relative' : ''}`} style={style}>
-					{React.Children.toArray(children).map((child, i) => React.cloneElement(child,
-						{
-							onClick: child.props.onClick || onMenuItemClick,
-							key: i
-						}))}
-			</ul>
-		);
-	}
-}
-
-PopupMenu.propTypes = {
-	relative: PropTypes.bool,
-	position: PropTypes.shape({
-		x: PropTypes.number,
-		y: PropTypes.number
-	}),
-	onMenuItemClick: PropTypes.func
-};
-
-PopupMenu.defaultProps = {
-	relative: false
-};
-
-export const PopupMenuSeparator = () => <li className='separator' />;
-
-PopupMenu.Separator = PopupMenuSeparator;
-PopupMenu.Item = PopupMenuItem;
-export default PopupMenu;
diff --git a/src/react/PopupMenuItem.js b/src/react/PopupMenuItem.js
deleted file mode 100644
index 98e3f49..0000000
--- a/src/react/PopupMenuItem.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-class PopupMenuItem extends React.Component {
-	render() {
-		const {itemId, value, onClick, selected, disabled} = this.props;
-		const additionalClasses = selected ? 'selected' : disabled ? 'disabled' : '';
-		return (
-			<li
-			    className={`sdc-menu-item ${additionalClasses}`}
-			    onClick={event => {
-				    event.stopPropagation();
-			        onClick && !disabled && onClick(itemId);
-			    }}>
-				{value}
-			</li>
-		);
-	}
-}
-
-PopupMenuItem.propTypes = {
-	itemId: PropTypes.any,
-	value: PropTypes.any,
-	selected: PropTypes.bool,
-	onClick: PropTypes.func,
-	disabled: PropTypes.bool
-};
-
-PopupMenuItem.defaultProps = {
-	selected: false,
-	disabled: false
-};
-
-export default PopupMenuItem;
diff --git a/src/react/Portal.js b/src/react/Portal.js
deleted file mode 100644
index 90e0675..0000000
--- a/src/react/Portal.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import ReactDOM from 'react-dom';
-
-class Portal extends React.Component {        
-	componentDidMount() {
-		this.renderPortal();
-	}
-    
-	componentDidUpdate() {
-		this.renderPortal();
-	}
-    
-	componentWillUnmount() {
-		if (this.defaultNode) {
-			document.body.removeChild(this.defaultNode);
-		}
-		this.defaultNode = null;
-		this.portal = null;
-	}
-     
-	renderPortal() {
-		if (!this.defaultNode) {
-			this.defaultNode = document.createElement('div');
-			this.defaultNode.className = 'onap-sdc-portal';
-			document.body.appendChild(this.defaultNode);
-		}
-    
-		let children = this.props.children;        
-		if (typeof this.props.children.type === 'function') {
-			children = React.cloneElement(this.props.children);
-		}
-        /**
-         * Change this to ReactDOM.CreatePortal after upgrading to React 16
-         */
-		this.portal = ReactDOM.unstable_renderSubtreeIntoContainer(
-          this,
-          children,
-          this.defaultNode
-        );
-	}
-	render() {
-		return null;
-	}
-        
-}
-
-Portal.propTypes = {
-	children: PropTypes.node.isRequired
-};
-
-export default Portal;
\ No newline at end of file
diff --git a/src/react/Radio.js b/src/react/Radio.js
deleted file mode 100644
index 483521a..0000000
--- a/src/react/Radio.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-class Radio extends React.Component {
-	render() {
-		let {checked, disabled, value, label, className, inputRef, name} = this.props;
-		let dataTestId = this.props['data-test-id'];
-		return (
-			<div className={`sdc-radio ${className}`}>
-				<label>
-					<input
-						ref={inputRef}
-						className='sdc-radio__input'
-						value={value}
-						data-test-id={dataTestId}
-						type='radio'
-						name={name}
-						checked={checked}
-						onChange={(e) => this.onChange(e)}
-						disabled={disabled} />
-					<span className='sdc-radio__label'>{label}</span>
-				</label>
-			</div>
-		);
-	}
-
-	onChange(e) {
-		let {onChange} = this.props;
-		if (onChange) {
-			onChange(e.target.checked);
-		}
-	}
-
-	getChecked() {
-		return this.props.checked;
-	}
-
-	getValue() {
-		return this.props.value;
-	}
-}
-
-Radio.propTypes = {
-	checked: PropTypes.bool,
-	value: PropTypes.any,
-	label: PropTypes.string,
-	className: PropTypes.string,
-	inputRef: PropTypes.func,
-	name: PropTypes.string,
-	disabled: PropTypes.bool
-};
-
-Radio.defaultProps = {
-	checked: false,
-	className: ''
-};
-
-export default Radio;
diff --git a/src/react/RadioGroup.js b/src/react/RadioGroup.js
deleted file mode 100644
index 59eaca7..0000000
--- a/src/react/RadioGroup.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import React from 'react';
-import Radio from './Radio.js';
-
-class RadioGroup extends React.Component {
-	constructor(props) {
-		super(props);
-		this.radios = {};
-	}
-
-	render() {
-		let {name, disabled, title, options, value, className} = this.props;
-		let dataTestId = this.props['data-test-id'];
-		return (<div data-test-id={dataTestId} className={`sdc-radio-group ${className || ''}`}>
-			{ title && <label className='sdc-radio-group__legend'>{title}</label> }
-			<div className='sdc-radio-group__radios'>
-			{options.map(option => {
-				let rName = name + '_' + option.value;
-				return (<Radio ref={(radio) => {this.radios[rName] = radio;}} data-test-id={dataTestId + '_' + option.value}
-					   key={rName} value={option.value}
-					   label={option.label} checked={value === option.value} disabled={disabled}
-					   name={name} onChange={() => this.onChange(rName)} />
-				);})}
-			</div>
-		</div>);
-	}
-
-	onChange(rName) {
-		let {onChange} = this.props;
-		let val = this.radios[rName].getValue();
-		if (onChange) {
-			onChange(val);
-		}
-	}
-
-	getValue() {
-		return this.props.value;
-	}
-}
-
-export default RadioGroup;
diff --git a/src/react/SVGIcon.js b/src/react/SVGIcon.js
deleted file mode 100644
index 8a5b1ae..0000000
--- a/src/react/SVGIcon.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import iconMap from './utils/iconMap.js';
-
-const SVGIcon = ({name, onClick, label, className, iconClassName, labelClassName, labelPosition, color, disabled, ...other}) => {
-
-	let colorClass = (color !== '') ? '__' + color : '';
-	let classes = `svg-icon-wrapper ${iconClassName} ${className} ${colorClass} ${onClick ? 'clickable' : ''} ${labelPosition}`;
-	let camelCasedName = name.replace(/-([a-z])/g, function (g) { return g[1].toUpperCase(); });
-	let IconComponent = iconMap[camelCasedName];
-	if (!IconComponent) {
-		console.error('Icon by the name ' + camelCasedName + ' is missing.');
-	}
-
-	return (
-		<div {...other} onClick={onClick} className={classes} disabled={disabled}>
-			{ IconComponent && <IconComponent className={`svg-icon __${name}`} /> }
-			{ !IconComponent && <span className='svg-icon-missing'>Missing Icon</span> }
-			{label && <span className={`svg-icon-label ${labelClassName}`}>{label}</span>}
-		</div>
-	);
-
-};
-
-SVGIcon.propTypes = {
-	name: PropTypes.string.isRequired,
-	onClick: PropTypes.func,
-	label: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
-	labelPosition: PropTypes.string,
-	className: PropTypes.string,
-	iconClassName: PropTypes.string,
-	labelClassName: PropTypes.string,
-	color: PropTypes.string
-};
-
-SVGIcon.defaultProps = {
-	name: '',
-	label: '',
-	className: '',
-	iconClassName: '',
-	labelClassName: '',
-	labelPosition: 'bottom',
-	color: ''
-};
-
-export default SVGIcon;
diff --git a/src/react/Tab.js b/src/react/Tab.js
deleted file mode 100644
index 5aa0f16..0000000
--- a/src/react/Tab.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-
-class Tab extends React.Component {
-	render() {
-		const {activeTab, tabId, title, onClick, disabled, className = ''} = this.props;
-		const dataTestId = this.props['data-test-id'];
-		return (
-			<li
-				className={`sdc-tab ${activeTab === tabId ? 'sdc-tab-active' : ''} ${className}`}
-				onClick={!disabled && onClick}
-				data-test-id={dataTestId}
-				role='tab'
-				disabled={disabled}>
-				{title}
-			</li>
-		);
-	}
-}
-
-export default Tab;
diff --git a/src/react/TabPane.js b/src/react/TabPane.js
deleted file mode 100644
index 56a4bf0..0000000
--- a/src/react/TabPane.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from 'react';
-
-class TabPane extends React.Component {
-	render() {
-		const {children} = this.props;
-		return (<div className='sdc-tab-content' role='tabpanel'>
-			{children}
-		</div>);
-	}
-}
-
-export default TabPane;
diff --git a/src/react/Tabs.js b/src/react/Tabs.js
deleted file mode 100644
index c502038..0000000
--- a/src/react/Tabs.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import TabPane from './TabPane.js';
-
-class Tabs extends React.Component {
-	render() {
-		const {type, children = [], activeTab, onTabClick, className} = this.props;
-		return (
-			<div className={type === 'header' ? `sdc-tabs sdc-tabs-header ${className || ''}` : `sdc-tabs sdc-tabs-menu ${className || ''}`} >
-				<ul className='sdc-tabs-list' role='tablist'>
-					{children.map(child => React.cloneElement(child,
-						{
-							key: child.props.tabId,
-							onClick: () => onTabClick(child.props.tabId),
-							activeTab
-						}))}
-				</ul>
-				<TabPane>
-					{children.map(child => {
-						if (child.props.tabId === activeTab) {
-							return child.props.children;
-						}
-					})}
-				</TabPane>
-			</div>
-		);
-	}
-}
-
-export default Tabs;
diff --git a/src/react/Tile.js b/src/react/Tile.js
deleted file mode 100644
index f47f88d..0000000
--- a/src/react/Tile.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import React, {Children} from 'react';
-import PropTypes from 'prop-types';
-import TileInfo from './TileInfo.js';
-import TileFooter from './TileFooter.js';
-import SVGIcon from './SVGIcon.js';
-
-const Tile = ({headerText, headerColor, iconName, iconColor, className, onClick, children, dataTestId}) => {
-	let childrenArr = Children.toArray(children);
-	return (
-		<div className={`sdc-tile ${className || ''}`} onClick={onClick} data-test-id={dataTestId}>
-			<div className={`sdc-tile-header ${headerColor || ''}`}>{headerText}</div>
-			<div className='sdc-tile-content'>
-				<div className={`sdc-tile-content-icon ${iconColor || ''}`}>
-					{iconName && <SVGIcon name={iconName}/>}
-				</div>
-				{childrenArr.find(e => e.type === TileInfo)}
-			</div>
-			{childrenArr.find(e => e.type === TileFooter)}
-		</div>
-	);
-};
-
-Tile.propTypes = {
-	headerText: PropTypes.string,
-	headerColor: PropTypes.string,
-	iconName: PropTypes.string,
-	iconColor: PropTypes.string,
-	className: PropTypes.string,
-	onClick: PropTypes.func,
-	dataTestId: PropTypes.string
-};
-
-export default Tile;
diff --git a/src/react/TileFooter.js b/src/react/TileFooter.js
deleted file mode 100644
index 3a56908..0000000
--- a/src/react/TileFooter.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import React, {Children} from 'react';
-import TileFooterCell from './TileFooterCell.js';
-
-const TileFooter = ({children, align}) => (
-	<div className={`sdc-tile-footer ${align === 'center' ? 'centered' : ''}`}>
-		{Children.toArray(children).filter(e => e.type === TileFooterCell)}
-	</div>
-);
-
-export default TileFooter;
diff --git a/src/react/TileFooterCell.js b/src/react/TileFooterCell.js
deleted file mode 100644
index 37e6416..0000000
--- a/src/react/TileFooterCell.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from 'react';
-
-const TileFooterCell = ({className, children, dataTestId}) => (
-	<span className={`sdc-tile-footer-cell ${className || ''}`} data-test-id={dataTestId}>{children}</span>
-);
-
-export default TileFooterCell;
diff --git a/src/react/TileInfo.js b/src/react/TileInfo.js
deleted file mode 100644
index bda8e74..0000000
--- a/src/react/TileInfo.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import React, {Children} from 'react';
-import TileInfoLine from './TileInfoLine.js';
-
-const TileInfo = ({align, children}) => (
-	<div className={`sdc-tile-content-info ${align === 'center' ? 'centered' : ''}`}>
-		{Children.toArray(children).filter(e => e.type === TileInfoLine)}
-	</div>
-);
-
-export default TileInfo;
diff --git a/src/react/TileInfoLine.js b/src/react/TileInfoLine.js
deleted file mode 100644
index 5b0e2c9..0000000
--- a/src/react/TileInfoLine.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from 'react';
-
-const TileInfoLine = ({type, className, children, dataTestId}) => (
-	<div className={`sdc-tile-info-line ${type || ''} ${className || ''}`} data-test-id={dataTestId}>{children}</div>
-);
-
-export default TileInfoLine;
diff --git a/src/react/index.js b/src/react/index.js
deleted file mode 100644
index cbe0161..0000000
--- a/src/react/index.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import Accordion from './Accordion.js';
-import Button from './Button.js';
-import Checkbox from './Checkbox.js';
-import Checklist from './Checklist.js';
-import Input from './Input.js';
-import Modal from './Modal.js';
-import ModalBody from './ModalBody.js';
-import ModalFooter from './ModalFooter.js';
-import ModalHeader from './ModalHeader.js';
-import ModalTitle from './ModalTitle.js';
-import Panel from './Panel.js';
-import PopupMenu from './PopupMenu.js';
-import Portal from './Portal.js';
-import Radio from './Radio.js';
-import RadioGroup from './RadioGroup.js';
-import SVGIcon from './SVGIcon.js';
-import Tab from './Tab.js';
-import Tabs from './Tabs.js';
-import Tile from './Tile.js';
-import TileInfo from './TileInfo.js';
-import TileInfoLine from './TileInfoLine.js';
-import TileFooter from './TileFooter.js';
-import TileFooterCell from './TileFooterCell.js';
-
-
-export { Accordion };
-export { Button };
-export { Checkbox };
-export { Checklist };
-export { Input };
-export { Modal };
-export { ModalBody };
-export { ModalFooter };
-export { ModalHeader };
-export { ModalTitle };
-export { Panel };
-export { PopupMenu };
-export { Portal };
-export { Radio };
-export { RadioGroup };
-export { SVGIcon };
-export { Tab };
-export { Tabs };
-export { Tile };
-export { TileInfo };
-export { TileInfoLine };
-export { TileFooter };
-export { TileFooterCell };
-
-export default {
-	Accordion,
-	Button,
-	Checkbox,
-	Checklist,
-	Input,
-	Modal,
-	ModalBody,
-	ModalFooter,
-	ModalHeader,
-	ModalTitle,
-	Panel,
-	PopupMenu,
-	Portal,
-	Radio,
-	RadioGroup,
-	SVGIcon,
-	Tab,
-	Tabs,
-	Tile,
-	TileInfo,
-	TileInfoLine,
-	TileFooter,
-	TileFooterCell
-};
diff --git a/src/style/scss/_common.scss b/src/style/scss/_common.scss
deleted file mode 100644
index 7daac20..0000000
--- a/src/style/scss/_common.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@import "common/normalize";
-@import "common/variables";
-@import "common/mixins";
-@import "common/typography";
-@import "common/base";
-@import "common/icons";
-@import "common/animation";
diff --git a/src/style/scss/_components.scss b/src/style/scss/_components.scss
deleted file mode 100644
index 3b0d28d..0000000
--- a/src/style/scss/_components.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-@import "../../../components/button/button";
-@import "../../../components/tile/tile";
-@import "../../../components/checkbox/checkbox";
-@import "../../../components/radio/radio";
-@import "../../../components/radioGroup/radioGroup";
-@import "../../../components/tabs/tabs";
-@import "../../../components/icon/icon";
-@import "../../../components/input/input";
-@import "../../../components/dropdown/dropdown";
-@import "../../../components/modal/modal";
-@import "../../../components/menu/menu";
-@import "../../../components/filter-bar/_filter-bar";
-@import "../../../components/search-bar/_search-bar";
-@import "../../../components/checklist/checklist";
-@import "../../../components/autocomplete/autocomplete";
-@import "../../../components/tooltip/tooltip";
-@import "../../../components/tag-cloud/_tag-cloud";
-@import "../../../components/notification/notification";
-@import "../../../components/notifications-container/notifications-container";
-@import "../../../components/accordion/accordion";
-@import "../../../components/panel/panel";
-@import "../../../components/validation/validation";
diff --git a/src/style/scss/common/_animation.scss b/src/style/scss/common/_animation.scss
deleted file mode 100644
index 659bd3b..0000000
--- a/src/style/scss/common/_animation.scss
+++ /dev/null
@@ -1,149 +0,0 @@
-/***********************************************************************************
- VERTICAL COLLAPSE-EXPEND TRANSITION ANIMATION PAIR.
-
- We use the 'transition-vertical-collapse' for the collapse/idle block element,
- and the 'transition-vertical-expand' to expend that element.
-
- -important: The element that will be used for the animation should be
- a block element, adn  have a content or width and height settings for it to work.
-*********************************************************************************/
-
-/**
-Enable to fold an expended block element
-@param $offsetY - The top position from which the drop down should fold
- */
-@mixin keyframes-expand-animation($name, $maxHeight, $boxShadow:0 0 12px 0px rgba(0,0,0,.3), $margin:0){
-  @keyframes #{$name} {
-    0% {
-      opacity: 0;
-      max-height: 0;
-      overflow: hidden;
-      box-shadow: 0 0 0px 0px rgba(0,0,0,.3);
-      margin:0;
-    }
-    10% {
-      opacity: 1;
-      margin: $margin;
-    }
-    50% {
-      box-shadow: $boxShadow;
-    }
-    99%{
-      max-height:$maxHeight;
-
-      overflow: hidden;
-    }
-    100%{
-      opacity: 1;
-      max-height:$maxHeight;
-      overflow: auto;
-    }
-  }
-}
-
-/**
-Enable to expend a folded block element
-@param $maxHeight - most of the animation is done over the max-height property
-                    so we have to set the maximum height the expended element can expend to.
- */
-@mixin keyframes-collapse-animation($name, $maxHeight, $boxShadow:0 0 12px 0px rgba(0,0,0,.3)){
-  @keyframes #{$name} {
-    0% {
-      opacity: 1;
-      max-height:$maxHeight;
-      box-shadow: $boxShadow;
-      overflow: hidden;
-    }
-    40%{
-      opacity: 1;
-    }
-    99%{
-      opacity: 0;
-      max-height: 0;
-      overflow: hidden;
-      box-shadow: 0 0 0px 0px rgba(0,0,0,.3);
-    }
-    100%{
-      opacity: 0;
-      max-height: 0;
-      overflow: auto;
-    }
-  }
-}
-
-/********************************************************************************
-  SIMPLE FADE-IN KEYFRAMES ANIMATION (Used in tooltip for example)
-
-  we use 'mixin-keyframes-fade-in-vertically' to create css @keyframes rule that
-  we later can use with animation property inside our prefered css rules:
-      .our_class {
-        ...
-          animation: keyframes-fade-in-vertically 1s ease-out;
-        ...
-      }
-*********************************************************************************/
-@mixin mixin-keyframes-fade-in-vertically($fromRelativeHeight, $keyframesName:keyframes-fade-in-vertically){
-  @keyframes #{$keyframesName} {
-    from {
-      transform: translateY($fromRelativeHeight);
-      opacity: 0;
-    }
-    to {
-      transform: translateY(0);
-      opacity: 1;
-    }
-  }
-}
-
-/********************************************************************************
-  SIMPLE FADE-OUT KEYFRAMES ANIMATION (Opposite of fade-in mixin above)
-*********************************************************************************/
-@mixin mixin-keyframes-fade-out-vertically($toRelativeHeight, $keyframesName:keyframes-fade-out-vertically){
-  @keyframes #{$keyframesName} {
-    from {
-      transform: translateY(0);
-      opacity: 1;
-    }
-    to {
-      transform: translateY($toRelativeHeight);
-      opacity: 0;
-    }
-  }
-}
-
-
-
-/********************************************************************************
-  RIPPLE ANIMATION (Used for ripple-click directive)
-*********************************************************************************/
-@keyframes ripple-animation {
-  from {
-    transform: scale(0,0);
-    opacity: 1;
-  }
-  to {
-    transform: scale(2,2);
-    opacity: 0;
-  }
-}
-
-.sdc-ripple-click__animated {
-  position:relative;
-}
-.sdc-ripple-click__animated::before{
-  display: inline-block;
-  position:absolute;
-  top: 0;
-  left: 0;
-  content: '';
-  animation: ripple-animation .3s ease-out; 
-  background-color: $blue;
-  width: 14px;
-  height: 14px;
-  border-radius: 50%;
-  pointer-events: none;
-  opacity: 0;
-}
-
-
-
diff --git a/src/style/scss/common/_icons.scss b/src/style/scss/common/_icons.scss
deleted file mode 100644
index 00f425d..0000000
--- a/src/style/scss/common/_icons.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-.sdc-icon {
-    display: inline-block;
-    text-rendering: auto;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-    width: 16px;
-    height: 16px;
-}
-
-.sdc-icon-locked {background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='11' height='15' viewBox='0 0 11 15' id='locked_icon'>  <metadata><?xpacket begin='﻿' id='W5M0MpCehiHzreSzNTczkc9d'?><x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='Adobe XMP Core 5.6-c138 79.159824, 2016/09/14-01:09:01        '>   <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>      <rdf:Description rdf:about=''/>   </rdf:RDF></x:xmpmeta><?xpacket end='w'?></metadata><defs>    <style>      .cls-1 {        fill: #959595;        fill-rule: evenodd;      }    </style>  </defs>  <path id='Shape_77_copy_10' data-name='Shape 77 copy 10' class='cls-1' d='M445,359a16.71,16.71,0,0,0-2.1-.009c-1.945.045-3.195,0.049-3.9,0.009v-5a1.743,1.743,0,0,1,2-2h1a1.743,1.743,0,0,1,2,2v5c0.474,0.063.343-.073,1,0,0.266,0.029,0,.279,0,0v-5a2.726,2.726,0,0,0-3-3h-1.142c-1.72-.125-2.715,1.562-2.858,3,0.088,0.009,0,7.338,0,5h0a1.891,1.891,0,0,0-2,1.689v3.461A1.823,1.823,0,0,0,437.775,366h7.448A1.823,1.823,0,0,0,447,364.15v-3.461A2.018,2.018,0,0,0,445,359Z' transform='translate(-436 -351)'/></svg>"); background-repeat: no-repeat;}
-.sdc-icon-plus {background-image: url("data:image/svg+xml;utf8,<?xml version='1.0' encoding='utf-8'?><!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  --><svg version='1.1' id='plus_icon' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' viewBox='0 0 19 19' style='enable-background:new 0 0 19 19;' xml:space='preserve'><g><rect y='8' width='19' height='3'/><path id='Rectangle_2139_copy' d='M8,19V0h3v19H8z'/></g></svg>"); background-repeat: no-repeat;}
-.sdc-icon-unlocked {background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='11' height='18' viewBox='0 0 11 18' id='unlocked_icon'>  <metadata><?xpacket begin='﻿' id='W5M0MpCehiHzreSzNTczkc9d'?><x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='Adobe XMP Core 5.6-c138 79.159824, 2016/09/14-01:09:01        '>   <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>      <rdf:Description rdf:about=''/>   </rdf:RDF></x:xmpmeta><?xpacket end='w'?></metadata><defs>    <style>      .cls-1 {        fill: #959595;        fill-rule: evenodd;      }    </style>  </defs>  <path id='Shape_77_copy_16' data-name='Shape 77 copy 16' class='cls-1' d='M663,358a16.723,16.723,0,0,0-2.1-.009c-1.944.045-3.194,0.049-3.9,0.009v-7a1.743,1.743,0,0,1,2-2h1a1.743,1.743,0,0,1,2,2v2c0.474,0.064.343-.073,1,0,0.266,0.029,0,.279,0,0v-2a2.726,2.726,0,0,0-3-3h-1.142c-1.72-.125-2.715,1.562-2.858,3,0.088,0.009,0,9.338,0,7h0a1.891,1.891,0,0,0-2,1.689v4.461a1.823,1.823,0,0,0,1.775,1.85h7.448A1.823,1.823,0,0,0,665,364.15v-4.461A2.018,2.018,0,0,0,663,358Zm1.05,6.15a0.827,0.827,0,0,1-.8.836H655.8a0.827,0.827,0,0,1-.8-0.836l0-4.15a1.164,1.164,0,0,1,.8-1.147h7.448A1.129,1.129,0,0,1,664,360Z' transform='translate(-654 -348)'/></svg>"); background-repeat: no-repeat;}
-.sdc-icon-vendor {background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 53 47'  id='vendor_icon'><title>vendor</title><g id='Layer_2' data-name='Layer 2'><g id='vlm_icon' data-name='vlm icon'><path d='M49,7,38.5,7V5.92A5.92,5.92,0,0,0,32.58,0H20.42A5.92,5.92,0,0,0,14.5,5.92V7.15L4,7.2a3.8,3.8,0,0,0-4,3.5V43.5C0,45.4,2,47,4.2,47L49,46.8a3.8,3.8,0,0,0,4-3.5V10.5A3.8,3.8,0,0,0,49,7ZM16.5,5.92A3.92,3.92,0,0,1,20.42,2H32.58A3.92,3.92,0,0,1,36.5,5.92V7.06l-20,.09ZM2,10.8A1.9,1.9,0,0,1,4,9l45-.2a1.9,1.9,0,0,1,2,1.8v8.87L32.94,24.18a6.49,6.49,0,0,0-12.89,0L2,19.51V10.8ZM31,25a4.5,4.5,0,1,1-4.5-4.5A4.5,4.5,0,0,1,31,25ZM49,45,4,45.2A1.9,1.9,0,0,1,2,43.4V21.57l18.13,4.73a6.5,6.5,0,0,0,12.74,0L51,21.53V43.21A1.9,1.9,0,0,1,49,45Z'/></g></g></svg>"); background-repeat: no-repeat;}
-.sdc-icon-vlm {background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 45 53'><title>vlm_new_icon</title><g id='Layer_2' data-name='Layer 2'><g id='vlm_icon' data-name='vlm icon'><path d='M41,2a2,2,0,0,1,2,2l.19,45a2,2,0,0,1-2,2H4a2,2,0,0,1-2-2L1.81,4a2,2,0,0,1,2-2H41m-.15-2H4A4.2,4.2,0,0,0,0,4.24L.19,49a4,4,0,0,0,4,4H41a4,4,0,0,0,4-4L44.81,4a4,4,0,0,0-4-4Z'/><rect x='14' y='11' width='17' height='2'/><rect x='14' y='18' width='10' height='2'/><polygon points='20.56 38.85 13.87 33.14 15.16 31.62 20.39 36.08 29.08 26.63 30.55 27.98 20.56 38.85'/></g></g></svg>"); background-repeat: no-repeat;}
-.sdc-icon-vsp {background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 59.5 40' id='vsp_icon'><title>vsp_new_icon</title><g id='Layer_2' data-name='Layer 2'><g id='vlm_icon' data-name='vlm icon'><path d='M58.28,30.74c-1.49-1.82-3-2.7-4.67-2.74a8.5,8.5,0,0,0-16.22-2.44,6.93,6.93,0,0,0-4.06.66A7.23,7.23,0,0,0,36.42,40H53.5a6,6,0,0,0,6-6A5.18,5.18,0,0,0,58.28,30.74ZM53.5,38H36.42a5.25,5.25,0,0,1-5.21-5.91,5.32,5.32,0,0,1,3-4.06,5,5,0,0,1,2.21-.53,5.25,5.25,0,0,1,1.35.18l.92.24L39,27A6.5,6.5,0,0,1,51.67,29v1.3l1.17-.2c1-.17,2.17-.17,3.91,2a3.18,3.18,0,0,1,.76,2A4,4,0,0,1,53.5,38Z'/><path d='M49,0,4,.17A3.79,3.79,0,0,0,0,3.69V7.94H0v2H0V36.31C0,38.35,2,40,4.25,40l20.84-.08a1,1,0,0,0,0-1.92L4,38.08a1.89,1.89,0,0,1-2-1.76V10H51v7a1,1,0,0,0,2,0V3.53A3.79,3.79,0,0,0,49,0ZM2,8V3.76A1.89,1.89,0,0,1,4,2l45-.16a1.89,1.89,0,0,1,2,1.76V8Z'/></g></g></svg>"); background-repeat: no-repeat;}
-
-.sdc-icon-transform{
-    transform: rotate(180deg);
-}
diff --git a/src/style/scss/common/_normalize.scss b/src/style/scss/common/_normalize.scss
deleted file mode 100644
index 9375ee9..0000000
--- a/src/style/scss/common/_normalize.scss
+++ /dev/null
@@ -1,578 +0,0 @@
-/* ==========================================================================
-   Normalize.scss settings
-   ========================================================================== */
-/**
- * Includes legacy browser support IE6/7
- *
- * Set to false if you want to drop support for IE6 and IE7
- */
-
-$legacy_browser_support: false !default;
-
-/* Base
-   ========================================================================== */
-
-/**
- * 1. Set default font family to sans-serif.
- * 2. Prevent iOS and IE text size adjust after device orientation change,
- *    without disabling user zoom.
- * 3. Corrects text resizing oddly in IE 6/7 when body `font-size` is set using
- *  `em` units.
- */
-
-html {
-  font-family: sans-serif; /* 1 */
-  -ms-text-size-adjust: 100%; /* 2 */
-  -webkit-text-size-adjust: 100%; /* 2 */
-  @if $legacy_browser_support {
-    *font-size: 100%; /* 3 */
-  }
-}
-
-/**
- * Remove default margin.
- */
-
-body {
-  margin: 0;
-}
-
-/* HTML5 display definitions
-   ========================================================================== */
-
-/**
- * Correct `block` display not defined for any HTML5 element in IE 8/9.
- * Correct `block` display not defined for `details` or `summary` in IE 10/11
- * and Firefox.
- * Correct `block` display not defined for `main` in IE 11.
- */
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-menu,
-nav,
-section,
-summary {
-  display: block;
-}
-
-/**
- * 1. Correct `inline-block` display not defined in IE 6/7/8/9 and Firefox 3.
- * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
- */
-
-audio,
-canvas,
-progress,
-video {
-  display: inline-block; /* 1 */
-  vertical-align: baseline; /* 2 */
-  @if $legacy_browser_support {
-    *display: inline;
-    *zoom: 1;
-  }
-}
-
-/**
- * Prevents modern browsers from displaying `audio` without controls.
- * Remove excess height in iOS 5 devices.
- */
-
-audio:not([controls]) {
-  display: none;
-  height: 0;
-}
-
-/**
- * Address `[hidden]` styling not present in IE 8/9/10.
- * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.
- */
-
-[hidden],
-template {
-  display: none;
-}
-
-/* Links
-   ========================================================================== */
-
-/**
- * Remove the gray background color from active links in IE 10.
- */
-
-a {
-  background-color: transparent;
-}
-
-/**
- * Improve readability of focused elements when they are also in an
- * active/hover state.
- */
-
-a {
-  &:active, &:hover {
-    outline: 0;
-  };
-}
-
-/* Text-level semantics
-   ========================================================================== */
-
-/**
- * Address styling not present in IE 8/9/10/11, Safari, and Chrome.
- */
-
-abbr[title] {
-  border-bottom: 1px dotted;
-}
-
-/**
- * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
- */
-
-b,
-strong {
-  font-weight: bold;
-}
-
-@if $legacy_browser_support {
-  blockquote {
-    margin: 1em 40px;
-  }
-}
-
-/**
- * Address styling not present in Safari and Chrome.
- */
-
-dfn {
-  font-style: italic;
-}
-
-/**
- * Address variable `h1` font-size and margin within `section` and `article`
- * contexts in Firefox 4+, Safari, and Chrome.
- */
-
-h1 {
-  font-size: 2em;
-  margin: 0.67em 0;
-}
-
-@if $legacy_browser_support {
-  h2 {
-    font-size: 1.5em;
-    margin: 0.83em 0;
-  }
-
-  h3 {
-    font-size: 1.17em;
-    margin: 1em 0;
-  }
-
-  h4 {
-    font-size: 1em;
-    margin: 1.33em 0;
-  }
-
-  h5 {
-    font-size: 0.83em;
-    margin: 1.67em 0;
-  }
-
-  h6 {
-    font-size: 0.67em;
-    margin: 2.33em 0;
-  }
-}
-
-/**
- * Addresses styling not present in IE 8/9.
- */
-
-mark {
-  background: #ff0;
-  color: #000;
-}
-
-@if $legacy_browser_support {
-
-  /**
-   * Addresses margins set differently in IE 6/7.
-   */
-
-  p,
-  pre {
-    *margin: 1em 0;
-  }
-
-  /*
-   * Addresses CSS quotes not supported in IE 6/7.
-   */
-
-  q {
-    *quotes: none;
-  }
-
-  /*
-   * Addresses `quotes` property not supported in Safari 4.
-   */
-
-  q:before,
-  q:after {
-    content: '';
-    content: none;
-  }
-}
-
-/**
- * Address inconsistent and variable font size in all browsers.
- */
-
-small {
-  font-size: 80%;
-}
-
-/**
- * Prevent `sub` and `sup` affecting `line-height` in all browsers.
- */
-
-sub,
-sup {
-  font-size: 75%;
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline;
-}
-
-sup {
-  top: -0.5em;
-}
-
-sub {
-  bottom: -0.25em;
-}
-
-@if $legacy_browser_support {
-
-  /* ==========================================================================
-     Lists
-     ========================================================================== */
-
-  /*
-   * Addresses margins set differently in IE 6/7.
-   */
-
-  dl,
-  menu,
-  ol,
-  ul {
-    *margin: 1em 0;
-  }
-
-  dd {
-    *margin: 0 0 0 40px;
-  }
-
-  /*
-   * Addresses paddings set differently in IE 6/7.
-   */
-
-  menu,
-  ol,
-  ul {
-    *padding: 0 0 0 40px;
-  }
-
-  /*
-   * Corrects list images handled incorrectly in IE 7.
-   */
-
-  nav ul,
-  nav ol {
-    *list-style: none;
-    *list-style-image: none;
-  }
-
-}
-
-/* Embedded content
-   ========================================================================== */
-
-/**
- * 1. Remove border when inside `a` element in IE 8/9/10.
- * 2. Improves image quality when scaled in IE 7.
- */
-
-img {
-  border: 0;
-  @if $legacy_browser_support {
-    *-ms-interpolation-mode: bicubic; /* 2 */
-  }
-}
-
-/**
- * Correct overflow not hidden in IE 9/10/11.
- */
-
-svg:not(:root) {
-  overflow: hidden;
-}
-
-/* Grouping content
-   ========================================================================== */
-
-/**
- * Address margin not present in IE 8/9 and Safari.
- */
-
-figure {
-  margin: 1em 40px;
-}
-
-/**
- * Address differences between Firefox and other browsers.
- */
-
-hr {
-  box-sizing: content-box;
-  height: 0;
-}
-
-/**
- * Contain overflow in all browsers.
- */
-
-pre {
-  overflow: auto;
-}
-
-/**
- * Address odd `em`-unit font size rendering in all browsers.
- * Correct font family set oddly in IE 6, Safari 4/5, and Chrome.
- */
-
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, monospace;
-  @if $legacy_browser_support {
-    _font-family: 'courier new', monospace;
-  }
-  font-size: 1em;
-}
-
-/* Forms
-   ========================================================================== */
-
-/**
- * Known limitation: by default, Chrome and Safari on OS X allow very limited
- * styling of `select`, unless a `border` property is set.
- */
-
-/**
- * 1. Correct color not being inherited.
- *  Known issue: affects color of disabled elements.
- * 2. Correct font properties not being inherited.
- * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
- * 4. Improves appearance and consistency in all browsers.
- */
-
-button,
-input,
-optgroup,
-select,
-textarea {
-  color: inherit; /* 1 */
-  font: inherit; /* 2 */
-  margin: 0; /* 3 */
-  @if $legacy_browser_support {
-    vertical-align: baseline; /* 3 */
-    *vertical-align: middle; /* 3 */
-  }
-}
-
-/**
- * Address `overflow` set to `hidden` in IE 8/9/10/11.
- */
-
-button {
-  overflow: visible;
-}
-
-/**
- * Address inconsistent `text-transform` inheritance for `button` and `select`.
- * All other form control elements do not inherit `text-transform` values.
- * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
- * Correct `select` style inheritance in Firefox.
- */
-
-button,
-select {
-  text-transform: none;
-}
-
-/**
- * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
- *  and `video` controls.
- * 2. Correct inability to style clickable `input` types in iOS.
- * 3. Improve usability and consistency of cursor style between image-type
- *  `input` and others.
- * 4. Removes inner spacing in IE 7 without affecting normal text inputs.
- *  Known issue: inner spacing remains in IE 6.
- */
-
-button,
-html input[type="button"], /* 1 */
-input[type="reset"],
-input[type="submit"] {
-  -webkit-appearance: button; /* 2 */
-  cursor: pointer; /* 3 */
-  @if $legacy_browser_support {
-    *overflow: visible;  /* 4 */
-  }
-}
-
-/**
- * Re-set default cursor for disabled elements.
- */
-
-button[disabled],
-html input[disabled] {
-  cursor: default;
-}
-
-/**
- * Remove inner padding and border in Firefox 4+.
- */
-
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-  border: 0;
-  padding: 0;
-}
-
-/**
- * Address Firefox 4+ setting `line-height` on `input` using `!important` in
- * the UA stylesheet.
- */
-
-input {
-  line-height: normal;
-}
-
-/**
- * 1. Address box sizing set to `content-box` in IE 8/9/10.
- * 2. Remove excess padding in IE 8/9/10.
- *  Known issue: excess padding remains in IE 6.
- */
-
-input[type="checkbox"],
-input[type="radio"] {
-  box-sizing: border-box; /* 1 */
-  padding: 0; /* 2 */
-  @if $legacy_browser_support {
-    *height: 13px; /* 3 */
-    *width: 13px; /* 3 */
-  }
-}
-
-/**
- * Fix the cursor style for Chrome's increment/decrement buttons. For certain
- * `font-size` values of the `input`, it causes the cursor style of the
- * decrement button to change from `default` to `text`.
- */
-
-input[type="number"]::-webkit-inner-spin-button,
-input[type="number"]::-webkit-outer-spin-button {
-  height: auto;
-}
-
-/**
- * 1. Address `appearance` set to `searchfield` in Safari and Chrome.
- * 2. Address `box-sizing` set to `border-box` in Safari and Chrome.
- */
-
-input[type="search"] {
-  -webkit-appearance: textfield; /* 1 */
-  box-sizing: content-box; /* 2 */
-}
-
-/**
- * Remove inner padding and search cancel button in Safari and Chrome on OS X.
- * Safari (but not Chrome) clips the cancel button when the search input has
- * padding (and `textfield` appearance).
- */
-
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-/**
- * Define consistent border, margin, and padding.
- */
-
-fieldset {
-  border: 1px solid #c0c0c0;
-  margin: 0 2px;
-  padding: 0.35em 0.625em 0.75em;
-}
-
-/**
- * 1. Correct `color` not being inherited in IE 8/9/10/11.
- * 2. Remove padding so people aren't caught out if they zero out fieldsets.
- * 3. Corrects text not wrapping in Firefox 3.
- * 4. Corrects alignment displayed oddly in IE 6/7.
- */
-
-legend {
-  border: 0; /* 1 */
-  padding: 0; /* 2 */
-  @if $legacy_browser_support {
-    white-space: normal; /* 3 */
-    *margin-left: -7px; /* 4 */
-  }
-}
-
-/**
- * Remove default vertical scrollbar in IE 8/9/10/11.
- */
-
-textarea {
-  overflow: auto;
-}
-
-/**
- * Don't inherit the `font-weight` (applied by a rule above).
- * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
- */
-
-optgroup {
-  font-weight: bold;
-}
-
-/* Tables
-   ========================================================================== */
-
-/**
- * Remove most spacing between table cells.
- */
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-td,
-th {
-  padding: 0;
-}
diff --git a/src/style/scss/common/_typography.scss b/src/style/scss/common/_typography.scss
deleted file mode 100644
index 6fd59cc..0000000
--- a/src/style/scss/common/_typography.scss
+++ /dev/null
@@ -1,96 +0,0 @@
-$heading-font-1: 28px;
-$heading-font-2: 24px;
-$heading-font-3: 20px;
-$heading-font-4: 16px;
-$heading-font-5: 14px;
-
-$body-font-1: 14px;
-$body-font-2: 13px;
-$body-font-3: 12px;
-$body-font-4: 10px;
-
-@mixin base-font-regular() {
-  font-family: OpenSans-Regular, Arial, sans-serif;
-  font-style: normal;
-  font-weight: 400;
-}
-
-@mixin base-font-italic(){
-  font-family: OpenSans-Italic, OpenSans-Regular, Arial, sans-serif;
-  font-style: normal;
-  font-weight: 400;
-}
-
-@mixin base-font-semibold() {
-  font-family: OpenSans-Semibold, Arial, sans-serif;
-  font-style: normal;
-  font-weight: 400;
-}
-
-@mixin font-error() {
-  color: $red;
-}
-
-@mixin heading-1() {
-  @include base-font-regular;
-  font-size: $heading-font-1;
-}
-
-@mixin heading-2() {
-  @include base-font-regular;
-  font-size: $heading-font-2;
-}
-
-@mixin heading-3 {
-  @include base-font-regular;
-  font-size: $heading-font-3;
-}
-
-@mixin heading-4 {
-  @include base-font-regular;
-  font-size: $heading-font-4;
-}
-
-@mixin heading-4-emphasis {
-  @include base-font-semibold;
-  font-size: $heading-font-4;
-}
-
-@mixin heading-5 {
-  @include base-font-semibold;
-  font-size: $heading-font-5;
-}
-
-@mixin body-1 {
-  @include base-font-regular;
-  font-size: $body-font-1;
-}
-
-@mixin body-1-italic {
-  @include base-font-italic;
-  font-size: $body-font-1;
-}
-
-@mixin body-2 {
-  @include base-font-regular;
-  font-size: $body-font-2;
-}
-
-@mixin body-2-emphasis {
-  @include base-font-semibold;
-  font-size: $body-font-2;
-}
-
-@mixin body-3 {
-  @include base-font-regular;
-  font-size: $body-font-3;
-}
-@mixin body-3-emphasis {
-  @include base-font-semibold;
-  font-size: $body-font-3;
-}
-
-@mixin body-4 {
-  @include base-font-regular;
-  font-size: $body-font-4;
-}
\ No newline at end of file
diff --git a/src/style/scss/common/base.scss b/src/style/scss/common/base.scss
deleted file mode 100644
index 02baf81..0000000
--- a/src/style/scss/common/base.scss
+++ /dev/null
@@ -1,96 +0,0 @@
-html {
-  font-size: 100%;
-  height: 100%;
-}
-
-body {
-  /* scrollbar styling for Internet Explorer */
-  scrollbar-face-color: $light-gray;
-  scrollbar-track-color: $white;
-  scrollbar-shadow-color:$white;
-  scrollbar-arrow-color: $gray;
-
-  height: 100%;
-  @extend %noselect;
-}
-
-/* scrollbar styling for Google Chrome | Safari | Opera */
-::-webkit-scrollbar {
-  width: 11px;
-  height: 8px;
-}
-
-::-webkit-scrollbar-track {
-  background-color: $white;
-  border: 1px solid $light-gray;
-  border-top:none;
-  border-bottom:none;
-}
-
-::-webkit-scrollbar-thumb {
-  border-radius: 6px;
-  background-color: $gray;
-  border: 2px solid rgba(0,0,0,0);
-  background-clip: padding-box;
-  
-  &:hover {
-    border-width:1px 0px 1px 1px;
-  }
-}
-
-/* Mozilla Firefox currently doesn't support scrollbar styling */
-
-ul {
-  list-style: none;
-}
-
-h1, h2, h3, h4, h5, h6, ul {
-  margin: 0;
-  padding: 0;
-}
-
-input[type='text'] {
-  padding: 4px;
-  width: 100%;
-}
-
-input[type="checkbox"] {
-  width: auto;
-}
-
-input, select, button {
-  @include body-1;
-  box-sizing: border-box;
-}
-
-fieldset {
-  border: none;
-}
-
-fieldset {
-  label {
-    display: inline-block;
-  }
-}
-
-.nav-tabs > li > a:focus,
-.btn:focus,
-.btn:active:focus,
-.btn.active:focus {
-  outline: none;
-}
-
-.error-message{
-  color: $red;
-  @include body-3;
-  margin-top: 3px;
-  &:before{
-    content: "";
-    display: inline-block;
-    width: 14px;
-    height: 14px;
-    margin-right: 6px;
-    //not correct icon
-    background: no-repeat url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="14" height="14" viewBox="0 0 24 24"><defs><path id="alert-copy-a" d="M22.3815,16.5997 L13.9815,2.4007 C13.5815,1.6997 12.8815,1.1997 12.0815,0.9997 C11.2815,0.7997 10.4815,0.9007 9.7815,1.2997 C9.3815,1.4997 8.9815,1.9007 8.7815,2.2997 L0.3815,16.5997 C-0.4185,17.9997 0.0815,19.9007 1.4815,20.6997 C1.8815,20.9997 2.3815,21.0997 2.8815,21.0997 L19.8815,21.0997 C20.6825,21.0997 21.4815,20.7997 21.9815,20.1997 C22.5815,19.5997 22.8815,18.9007 22.8815,18.0997 C22.7815,17.5997 22.6825,16.9997 22.3815,16.5997 M11,7 C10.4,7 10,7.4 10,8 L10,12 C10,12.601 10.4,13 11,13 C11.6,13 12,12.601 12,12 L12,8 C12,7.4 11.6,7 11,7 M10.3,15.3 C10.1,15.499 10,15.699 10,15.999 C10,16.3 10.1,16.499 10.3,16.699 C10.5,16.9 10.7,16.999 11,16.999 C11.3,16.999 11.5,16.9 11.7,16.699 C11.9,16.499 12,16.199 12,15.999 C12,15.8 11.9,15.499 11.7,15.3 C11.3,14.9 10.7,14.9 10.3,15.3"/></defs><g fill="none" fill-rule="evenodd" transform="translate(1 1)"><use fill="'+ $red +'" xlink:href="#alert-copy-a"/></g></svg>');
-  }
-}
diff --git a/src/style/scss/common/mixins.scss b/src/style/scss/common/mixins.scss
deleted file mode 100644
index c4cb733..0000000
--- a/src/style/scss/common/mixins.scss
+++ /dev/null
@@ -1,337 +0,0 @@
-/* Colors */
-.sdc-bc-white           { background-color: $white; }
-.sdc-bc-blue            { background-color: $blue; }
-.sdc-bc-light-blue      { background-color: $light-blue; }
-.sdc-bc-lighter-blue    { background-color: $lighter-blue; }
-.sdc-bc-blue-disabled   { background-color: $blue-disabled; }
-.sdc-bc-dark-blue       { background-color: $dark-blue; }
-.sdc-bc-black           { background-color: $black; }
-.sdc-bc-rich-black      { background-color: $rich-black; }
-.sdc-bc-text-black      { background-color: $text-black; }
-.sdc-bc-dark-gray       { background-color: $dark-gray; }
-.sdc-bc-gray            { background-color: $gray; }
-.sdc-bc-light-gray      { background-color: $light-gray; }
-.sdc-bc-silver  { background-color: $silver; }
-.sdc-bc-light-silver { background-color: $light-silver; }
-.sdc-bc-green           { background-color: $green; }
-.sdc-bc-red             { background-color: $red; }
-.sdc-bc-disabled-red    { background-color: $disabled-red; }
-.sdc-bc-light-red       { background-color: $light-red; }
-.sdc-bc-yellow          { background-color: $yellow; }
-.sdc-bc-dark-purple     { background-color: $dark-purple; }
-.sdc-bc-purple          { background-color: $purple; }
-.sdc-bc-light-purple    { background-color: $light-purple; }
-.sdc-bc-lighter-silver        { background-color: $lighter-silver; }
-/* Prefix */
-$box-sizing-prefix: webkit moz spec;
-$border-radius-prefix: webkit spec;
-$box-shadow-radius-prefix: webkit moz spec;
-$text-shadow-radius-prefix: spec;
-$text-shadow-prefix: spec;
-$box-shadow-prefix: all;
-$linear-gradient-prefix: all;
-$transition-prefix: webkit moz o spec;
-$flex-prefix: webkit spec;
-$browserPrefixes: webkit moz o ms;
-
-@mixin prefix($property, $value, $prefixeslist: 'all') {
-  @if $prefixeslist == all {
-    -webkit-#{$property}: $value;
-    -moz-#{$property}: $value;
-    -ms-#{$property}: $value;
-    -o-#{$property}: $value;
-    #{$property}: $value;
-  } @else {
-    @each $prefix in $prefixeslist {
-      @if $prefix == webkit {
-        -webkit-#{$property}: $value;
-      } @else if $prefix == moz {
-        -moz-#{$property}: $value;
-      } @else if $prefix == ms {
-        -ms-#{$property}: $value;
-      } @else if $prefix == o {
-        -o-#{$property}: $value;
-      } @else if $prefix == spec {
-        #{$property}: $value;
-      } @else {
-        @warn "No such prefix: #{$prefix}";
-      }
-    }
-  }
-}
-
-/* Value Prefix*/
-@mixin value-suffix-with-range($property, $valuesuffix, $from, $to, $prefixeslist) {
-
-  @if $prefixeslist == all {
-    #{property} : -webkit-#{$valuesuffix}($from, $to);
-    #{property} : -moz-#{$valuesuffix}($from, $to);
-    #{property} : -o-#{$valuesuffix}($from, $to);
-    #{property} : -ms-#{$valuesuffix}($from, $to);
-
-  } @else {
-    @each $prefix in $prefixeslist {
-      @if $prefix == webkit {
-        #{property} : -webkit-#{$valuesuffix}($from, $to);
-      } @else if $prefix == moz {
-        #{property} : -moz-#{$valuesuffix}($from, $to);
-      } @else if $prefix == ms {
-        #{property} : -ms-#{$valuesuffix}($from, $to);
-      } @else if $prefix == o {
-        #{property} : -o-#{$valuesuffix}($from, $to);
-      } @else {
-        @warn "No such prefix: #{$prefix}";
-      }
-    }
-  }
-}
-
-/* Box sizing */
-@mixin box-sizing($value: border-box) {
-  @include prefix(box-sizing, $value, $box-sizing-prefix);
-}
-
-/* Borders & Shadows */
-@mixin box-shadow($value) {
-  @include prefix(box-shadow, $value, $box-shadow-radius-prefix);
-}
-
-@mixin text-shadow($value) {
-  @include prefix(text-shadow, $value, $text-shadow-radius-prefix);
-}
-
-@mixin border-radius($value, $positions: all) {
-  @if ($positions == all) {
-    @include prefix(border-radius, $value, $border-radius-prefix);
-  } @else {
-    @each $position in $positions {
-      @include prefix(border-#{$position}-radius, $value, $border-radius-prefix);
-    }
-  }
-
-}
-
-@mixin transition($value) {
-  @include prefix(transition, $value, $transition-prefix);
-}
-
-/* Opacity */
-@mixin opacity($alpha) {
-  $ie-opacity: round($alpha * 100);
-  opacity: $alpha;
-  filter: unquote("alpha(opacity = #{$ie-opacity})");
-}
-
-/* Ellipsis */
-@mixin ellipsis($width: 100%, $display: inline-block, $max-width: none) {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  width: $width;
-  white-space: nowrap;
-  display: $display;
-  max-width: $max-width;
-}
-
-@mixin multiline-ellipsis($lineHeight: 1.3em, $lineCount: 2, $bgColor: $white){
-  overflow: hidden;
-  position: relative;
-  line-height: $lineHeight;
-  max-height: $lineHeight * $lineCount;
-  text-align: justify;
-  // margin-right: -1em;
-  padding-right: 1em;
-  &:before {
-    content: '...';
-    position: absolute;
-    right: 3px;
-    bottom: 0;
-  }
-  &:after {
-    content: '';
-    position: absolute;
-    right: 0;
-    width: 1em;
-    height: 1em;
-    margin-top: 0.2em;
-    background: $bgColor;
-  }
-}
-
-@mixin gradient($from, $to) {
-  /* fallback/image non-cover color */
-  background-color: $from;
-  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from($from), to($to));
-  @include value-suffix-with-range(background-color, linear-gradient, $from, $to, $linear-gradient-prefix);
-}
-
-/* Vertical placement of multuple lines of text */
-@mixin vertical-text($height) {
-  position: absolute;
-  top: 50%;
-  margin-top: -$height/2;
-}
-
-@mixin text-vertical-align($align: middle) {
-  display: table;
-  width: 100%;
-
-  & > * {
-    vertical-align: $align;
-    display: table-cell;
-  }
-}
-
-@mixin center-element($width) {
-  width: $width;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-@mixin center-content($width) {
-  & > * {
-    @include center-element($width);
-  }
-}
-
-/* transform-rotate */
-// @mixin
-//	   Defines a 2D rotation, the angle is specified in the parameter
-// @param
-//     $deg - angle in degrees
-@mixin transform-rotate($deg) {
-  transform: rotate($deg + deg); /* IE10 and Mozilla */
-  -ms-transform: rotate($deg + deg); /* IE 9 */
-  -webkit-transform: rotate($deg + deg); /* Safari and Chrome */
-}
-
-/* transform-translate */
-// @mixin
-//	   Defines a 2D rotation, the angle is specified in the parameter
-// @param
-//     $deg - angle in degrees
-@mixin transform-translate($x, $y) {
-  transform: translate($x, $y); /* IE10 and Mozilla */
-  -ms-transform: translate($x, $y); /* IE 9 */
-  -webkit-transform: translate($x, $y); /* Safari and Chrome */
-}
-
-/* transform-scale */
-// @mixin
-//	   Defines a 2D scale transformation, changing the elements width and height
-// @param
-//     $width - width
-// @param
-//     $height - height
-@mixin transform-scale($width, $height) {
-  transform: scale($width, $height); /* IE10 and Mozilla */
-  -ms-transform: scale($width, $height); /* IE 9 */
-  -webkit-transform: scale($width, $height); /* Safari and Chrome */
-}
-
-@mixin scrollable() {
-  ::-webkit-scrollbar {
-    width: 8px;
-  }
-}
-
-@mixin create-circle($size, $bgcolor, $content) {
-  border-radius: 50%;
-  width: $size;
-  height: $size;
-  background: $bgcolor;
-  border: 3px solid $bgcolor;
-  &:after {
-    content: $content;
-    position: relative;
-    left: 9px;
-    top: 9px;
-    @include base-font-semibold;
-    font-size: $body-font-1;
-  }
-}
-
-/**/
-@mixin keyframe-animation($animationType, $properties, $fromValue, $toValue) {
-
-  @keyframes #{$animationType} {
-    from {
-      $startIndex: 1;
-      @each $property in $properties {
-        #{$property}: nth($fromValue, $startIndex);
-        $startIndex: $startIndex + 1;
-      }
-    }
-    to {
-      $startIndex: 1;
-      @each $property in $properties {
-        #{$property}: nth($toValue, $startIndex);
-        $startIndex: $startIndex + 1;
-      }
-    }
-  }
-  @-moz-keyframes #{$animationType}{
-    /* Firefox */
-    from {
-      $startIndex: 1;
-      @each $property in $properties {
-        #{$property}: nth($fromValue, $startIndex);
-        $startIndex: $startIndex + 1;
-      }
-    }
-    to {
-      $startIndex: 1;
-      @each $property in $properties {
-        #{$property}: nth($toValue, $startIndex);
-        $startIndex: $startIndex + 1;
-      }
-    }
-  }
-  @-webkit-keyframes #{$animationType} {
-    /* Safari and Chrome */
-    from {
-      $startIndex: 1;
-      @each $property in $properties {
-        #{$property}: nth($fromValue, $startIndex);
-        $startIndex: $startIndex + 1;
-      }
-    }
-    to {
-      $startIndex: 1;
-      @each $property in $properties {
-        #{$property}: nth($toValue, $startIndex);
-        $startIndex: $startIndex + 1;
-      }
-    }
-  }
-  @-o-keyframes #{$animationType} {
-    /* Opera */
-    from {
-      $startIndex: 1;
-      @each $property in $properties {
-        #{$property}: nth($fromValue, $startIndex);
-        $startIndex: $startIndex + 1;
-      }
-    }
-    to {
-      $startIndex: 1;
-      @each $property in $properties {
-        #{$property}: nth($toValue, $startIndex);
-        $startIndex: $startIndex + 1;
-      }
-    }
-  }
-}
-
-
-/**/
-@mixin border-shadow($xShadow: 0.545px, $yShadow: 0.839px, $blur: 4px, $spread: 0, $color: $light-gray, $opacity: 0.2) {
-  @include box-shadow($xShadow $yShadow $blur $spread rgba($color, $opacity));
-}
-
-%noselect {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
diff --git a/src/style/scss/common/variables.scss b/src/style/scss/common/variables.scss
deleted file mode 100644
index 38eded4..0000000
--- a/src/style/scss/common/variables.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-// Colors
-$black: #000000;
-$rich-black: #323943;
-$text-black: #191919;
-$blue: #009fdb;
-$dark-blue: #0568ae;
-$light-blue: #1eb9f3;
-$lighter-blue: #e6f6fb;
-$blue-disabled: #9dd9ef;
-$red: #cf2a2a;
-$light-red:#ed4141;
-$disabled-red:#f4adad;
-$purple: #9063cd;
-$dark-purple: #702f8a;
-$yellow: #ffb81c;
-$green: #4ca90c;
-$gray: #959595;
-$dark-gray: #5a5a5a;
-$light-gray: #d2d2d2;
-$light-silver: #f2f2f2;
-$silver: #eaeaea;
-
-
-$light-purple: #caa2dd;
-$lighter-silver: #f8f8f8;
-$white: #ffffff;
-
-$scroll-bar-color: $text-black;
-
-// Button Sizes
-$btn-extra-small: 90px;
-$btn-small: 110px;
-$btn-medium: 140px;
-$btn-large: 180px;
-$btn-default: auto;
diff --git a/src/style/scss/style.scss b/src/style/scss/style.scss
deleted file mode 100644
index 5512776..0000000
--- a/src/style/scss/style.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@import "common";
-@import "components";
-
-// for angular
-@import "angular/svg_icon";
-@import "angular/tooltip_custom_style";
diff --git a/src/style/scss/themes/1802/_components.scss b/src/style/scss/themes/1802/_components.scss
deleted file mode 100644
index 6800005..0000000
--- a/src/style/scss/themes/1802/_components.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Deafult theme */
-@import "../../../../../components/tile/tile";
-@import "../../../../../components/checkbox/checkbox";
-@import "../../../../../components/radio/radio";
-@import "../../../../../components/radioGroup/radioGroup";
-@import "../../../../../components/icon/icon";
-@import "../../../../../components/input/input";
-@import "../../../../../components/dropdown/dropdown";
-@import "../../../../../components/menu/menu";
-@import "../../../../../components/filter-bar/_filter-bar";
-@import "../../../../../components/search-bar/_search-bar";
-@import "../../../../../components/checklist/checklist";
-@import "../../../../../components/autocomplete/autocomplete";
-@import "../../../../../components/tooltip/tooltip";
-@import "../../../../../components/tag-cloud/_tag-cloud";
-@import "../../../../../components/notification/notification";
-@import "../../../../../components/notifications-container/notifications-container";
-@import "../../../../../components/validation/validation";
-
-/* 1802 theme */
-@import "button";
-@import "modal";
-@import "tabs";
diff --git a/src/style/scss/themes/1802/button.scss b/src/style/scss/themes/1802/button.scss
deleted file mode 100644
index 05d91d5..0000000
--- a/src/style/scss/themes/1802/button.scss
+++ /dev/null
@@ -1,148 +0,0 @@
-.sdc-button {
-  @include box-sizing;
-  display: inline-block;
-
-  outline: none;
-  border-radius: 2px;
-  padding: 0 16px;
-
-  height: 32px;
-  line-height: 32px;
-  width: 120px;
-  min-width: 90px;
-
-  cursor: pointer;
-  text-align: center;
-  @include body-1;
-  &:disabled {
-    cursor: default;
-  }
-
-  // Primary button
-  &.sdc-button__primary {
-    border: none;
-    background-color: $blue;
-    color: $white;
-
-    &:not(:disabled) {
-      &:hover, &:active {
-        background-color: $light-blue;
-      }
-      &:focus:not(:active) {
-        border: 0.5px solid $white;
-        background-color: $light-blue;
-        box-shadow: 0px 0px 0px 1px $light-blue;
-      }
-    }
-
-    &:disabled{
-      background: $blue-disabled;
-    }
-  }
-
-  // Secondary button
-  &.sdc-button__secondary {
-    border: 1px solid $light-gray;
-    background-color: transparent;
-    color: $text-black;
-
-    &:not(:disabled) {
-      &:hover, &:active {
-        background-color: transparent;
-        color:$text-black;
-        border: 1px solid $gray;
-      }
-      &:focus:not(:active) {
-        color: $text-black;
-        box-shadow: inset 0px 0px 0px 0px $light-gray, 0px 0px 0px 1px $gray;
-      }
-    }
-
-    &:disabled {
-      color: $blue-disabled;
-      border-color: $blue-disabled;
-    }
-  }
-
-  // Link button
-  &.sdc-button__link {
-    background-color: transparent;
-    color: $blue;
-    fill: $blue;
-    border: none;
-
-    &:not(:disabled) {
-      &:hover, &:active {
-        color: $light-blue;
-      }
-      &:focus:not(:active) {
-        border: 1px solid $dark-blue;
-        color: $light-blue;
-      }
-    }
-
-    &:disabled{
-      color: $blue-disabled;
-    }
-  }
-
-
-  // alert button
-  &.sdc-button__alert {
-    border: none;
-    background-color: $red;
-    color: $white;
-
-    &:not(:disabled) {
-      &:hover, &:active {
-        background-color: $light-red;
-      }
-      &:focus:not(:active) {
-        border: 0.5px solid $white;
-        background-color: $light-red;
-        box-shadow: 0px 0px 0px 1px $light-red;
-      }
-    }
-
-    &:disabled{
-      background: $disabled-red;
-    }
-  }
-
-
-  /*** Sizes ***/
-  &.btn-large{
-    width: $btn-large;
-  }
-
-  &.btn-medium{
-    width: $btn-medium;
-  }
-
-  &.btn-small{
-    width: $btn-small;
-  }
-
-  &.btn-x-small{
-    width: $btn-extra-small;
-  }
-
-  &.btn-default{
-    width: $btn-default;
-  }
-
-  /*** Buttons with icons ***/
-  .sdc-icon-right{
-    margin-left: 15px;
-  }
-
-  .sdc-icon-left{
-    margin-right: 15px;
-  }
-
-  svg {
-    display: inline-block;
-    vertical-align: middle;
-  }
-}
-
diff --git a/src/style/scss/themes/1802/modal.scss b/src/style/scss/themes/1802/modal.scss
deleted file mode 100644
index de99d52..0000000
--- a/src/style/scss/themes/1802/modal.scss
+++ /dev/null
@@ -1,193 +0,0 @@
-
-.sdc-modal {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-
-  overflow: auto;
-  margin: auto;
-  display: flex;
-  align-items: center;
-  z-index: 1001;
-
-
-  svg path {
-    fill: inherit;
-  }
-
-  .sdc-modal__wrapper {
-    @include body-1;
-    background: $white;
-    width: 100%;
-
-    @include box-shadow(0 0 4px 0 rgba(0,0,0,0.50));
-    color: $text-black;
-    display: flex;
-    flex-direction: column;
-    &.sdc-modal-type-info {
-      border-top: solid 6px $blue;
-      .sdc-modal__svg-use {
-        fill: $blue;
-      }
-      .svg-icon {
-        &.__errorCircle {
-          width: 30px;
-          height: 30px;
-        }
-      }
-    }
-    &.sdc-modal-type-alert {
-      border-top: solid 6px $yellow;
-      .sdc-modal__svg-use {
-        fill: $yellow;
-      }
-      .svg-icon {
-        &.__exclamationTriangleLine {
-          width: 30px;
-          height: 30px;
-        }
-      }
-    }
-    &.sdc-modal-type-error {
-      border-top: solid 6px $red;
-      .sdc-modal__svg-use {
-        fill: $red;
-      }
-      .svg-icon {
-        &.__error {
-          width: 30px;
-          height: 30px;
-        }
-      }
-    }
-    &.sdc-modal-type-custom {
-      padding: 0 30px;
-      border-radius: 4px;
-
-      .sdc-custom__header {
-        @include box-sizing;
-        color: $dark-gray;
-        height: 50px;
-        border-bottom: solid 3px $blue;
-        padding: 0;
-
-        .title {
-          @include heading-3;
-          color: $dark-gray;
-        }
-
-        .sdc-modal__close-button {
-          margin-top: 0px;
-          width: 20px;
-          height: 14px;
-        }
-        .sdc-modal__close-button-svg {
-          width: 20px;
-          height: 20px;
-          .sdc-modal__svg-use {
-              fill: $white;
-          }
-          .svg-icon {
-            height: 14px;
-            width: 14px;
-            fill: $white;
-          }
-        }
-      }
-      .sdc-modal__content {
-        padding: 20px 40px;
-      }
-    }
-    .sdc-modal__header {
-      padding: 0px 10px 8px 14px;
-      display: flex;
-      justify-content: space-between;
-      text-align: left;
-      .sdc-modal__icon {
-        padding: 20px 12px 0px 6px;
-      }
-
-      .title {
-        @include heading-2;
-        flex: 1 1 auto;
-        color: $text-black;
-        padding-top: 19px;
-      }
-
-      .sdc-modal__close-button {
-        order:3;
-        width: 14px;
-        height: 14px;
-        margin-top:10px;
-        cursor: pointer;
-        .sdc-modal__svg-use {
-          fill: $black;
-        }
-      }
-    }
-    .sdc-modal__content {
-      order:2;
-      padding-left: 63px;
-      padding-right: 68px;
-      padding-bottom: 26px;
-    }
-
-    .sdc-modal__footer {
-      order:3;
-      background-color: $light-silver;
-      border-top: solid 1px $silver;
-      padding: 17px 30px;
-      display: flex;
-      justify-content: flex-end;
-      margin: 0 -30px;
-      button{
-        margin-left: 10px;
-      }
-    }
-  }
-}
-
-.modal-background {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  background-color: $black;
-  opacity: 0.70;
-  z-index: 1000;
-
-  &.show {
-    z-index: 1000;
-    opacity: 0.70;
-    transition: opacity .3s ease, z-index .3s;
-  }
-  &.hide {
-    z-index: -1;
-    opacity: 0;
-    transition: opacity .35s ease, z-index .35s;
-  }
-}
-
-.xl {
-  width: 1200px;
-}
-
-.l {
-  width: 875px;
-}
-
-.md {
-  width: 650px;
-}
-
-.sm {
-  width: 500px;
-}
-
-.xsm {
-  width: 432px;
-}
-
diff --git a/src/style/scss/themes/1802/style.scss b/src/style/scss/themes/1802/style.scss
deleted file mode 100644
index ae314d8..0000000
--- a/src/style/scss/themes/1802/style.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@import "../../common";
-@import "components";
-
-// for angular
-@import "../../angular/svg_icon";
diff --git a/src/style/scss/themes/1802/tabs.scss b/src/style/scss/themes/1802/tabs.scss
deleted file mode 100644
index 70ee4cb..0000000
--- a/src/style/scss/themes/1802/tabs.scss
+++ /dev/null
@@ -1,39 +0,0 @@
-.sdc-tabs {
-    .sdc-tab {
-        background-color: $white;
-        border: 1px solid $silver;
-        border-left: none;
-        display: inline-block;
-        height: 36px;
-        text-align: center;
-        cursor: pointer;
-        padding: 2px 10px 0 10px;
-        margin: 0;
-
-
-        &:first-child {
-            border-left: 1px solid $silver;
-        }
-        &.sdc-tab-active {
-            background-color: $silver;
-        }
-        &[disabled] {
-            opacity: 0.3;
-            cursor: default;
-        }
-    }
-    &.sdc-tabs-header {
-        .sdc-tab {
-            @include heading-2;
-        }
-    }
-    &.sdc-tabs-menu {
-        .sdc-tab {
-            @include body-1;
-            padding: 0px 10px 4px 10px;
-        }
-    }
-    .sdc-tab-content {
-        margin-top: 30px;
-    }
-}