diff --git a/src/app/ds-command-demo/ds-command-demo-page/ds-command-demo-page.component.ts b/src/app/ds-command-demo/ds-command-demo-page/ds-command-demo-page.component.ts
index 55dd0d1..c297938 100644
--- a/src/app/ds-command-demo/ds-command-demo-page/ds-command-demo-page.component.ts
+++ b/src/app/ds-command-demo/ds-command-demo-page/ds-command-demo-page.component.ts
@@ -1,7 +1,7 @@
 import {Component, OnInit} from '@angular/core';
 import {IDataSource} from '@poweredsoft/data';
-import {HttpDataSourceService} from '@poweredsoft/ngx-data';
 import {of, throwError} from 'rxjs';
+import {HttpDataSourceService} from "@openharbor/ngx-data";
 
 interface ContactQuery {
   contactId: number
diff --git a/src/app/list-view-demo/list-view-demo-home/list-view-demo-home.component.ts b/src/app/list-view-demo/list-view-demo-home/list-view-demo-home.component.ts
index 056fd1d..82cbdea 100644
--- a/src/app/list-view-demo/list-view-demo-home/list-view-demo-home.component.ts
+++ b/src/app/list-view-demo/list-view-demo-home/list-view-demo-home.component.ts
@@ -1,11 +1,8 @@
-import { Component, OnInit } from '@angular/core';
-import { IMerchant } from 'src/app/data/services/IMerchant';
-import { IDataSource } from '@poweredsoft/data';
-import { MerchantService } from 'src/app/data/services/merchant.service';
-import { Subscription } from 'rxjs';
-import { HttpDataSourceService } from '@poweredsoft/ngx-data';
-import { IModelFormCreateEvent } from '@poweredsoft/ngx-bootstrap';
-import { FormBuilder, Validators } from '@angular/forms';
+import {Component, OnInit} from '@angular/core';
+import {IDataSource} from '@poweredsoft/data';
+import {MerchantService} from 'src/app/data/services/merchant.service';
+import {FormBuilder, Validators} from '@angular/forms';
+import {IModelFormCreateEvent} from "@openharbor/ngx-data-bootstrap-ui";
 
 
 interface ISchool {
@@ -44,7 +41,7 @@ export class ListViewDemoHomeComponent implements OnInit {
     })
   }
 
-  onFormCreate(event: IModelFormCreateEvent) {    
+  onFormCreate(event: IModelFormCreateEvent) {
     event.shouldSetCommandModel = false;
     event.formGroup = this.fb.group({
       'name': [event.commandModel.name, Validators.required],
diff --git a/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.ts b/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.ts
index 93415f9..58c36bd 100644
--- a/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.ts
+++ b/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component} from '@angular/core';
 import {MerchantService} from 'src/app/data/services/merchant.service';
 import {IMerchant} from 'src/app/data/services/IMerchant';
 import {IDataSource} from '@poweredsoft/data';
diff --git a/src/app/view-demo/view-demo-page/view-demo-page.component.ts b/src/app/view-demo/view-demo-page/view-demo-page.component.ts
index ddd0f79..b6c916a 100644
--- a/src/app/view-demo/view-demo-page/view-demo-page.component.ts
+++ b/src/app/view-demo/view-demo-page/view-demo-page.component.ts
@@ -1,7 +1,7 @@
 import {Component, OnInit} from '@angular/core';
 import {IDataSource} from '@poweredsoft/data';
-import {HttpDataSourceService} from '@poweredsoft/ngx-data';
 import {of} from 'rxjs';
+import {HttpDataSourceService} from "@openharbor/ngx-data";
 
 interface OnePersonQuery {
   personId: number;