diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.html b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.html
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.html
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.html
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.scss b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.scss
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.scss
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.scss
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.ts
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.ts
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.ts
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.html b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.html
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.html
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.html
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.scss b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.scss
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.scss
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.scss
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.ts
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.ts
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.ts
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/not-found-template.directive.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/not-found-template.directive.ts
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/not-found-template.directive.ts
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/not-found-template.directive.ts
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ps-ng-selectors.module.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ps-ng-select.module.ts
similarity index 95%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ps-ng-selectors.module.ts
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/ps-ng-select.module.ts
index 1df2cd8..a833cda 100644
--- a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ps-ng-selectors.module.ts
+++ b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ps-ng-select.module.ts
@@ -25,4 +25,4 @@ import { NotFoundTemplateDirective } from './not-found-template.directive';
     NotFoundTemplateDirective
   ]
 })
-export class PsNgSelectorsModule { }//NGSELECT
+export class PsNgSelectModule { }//NGSELECT
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/select-label-template.directive.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/select-label-template.directive.ts
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/select-label-template.directive.ts
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/select-label-template.directive.ts
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/select-option-template.directive.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/select-option-template.directive.ts
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/select-option-template.directive.ts
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/select-option-template.directive.ts
diff --git a/projects/poweredsoft/ng-select/src/public-api.ts b/projects/poweredsoft/ng-select/src/public-api.ts
index eaa0877..8c65c66 100644
--- a/projects/poweredsoft/ng-select/src/public-api.ts
+++ b/projects/poweredsoft/ng-select/src/public-api.ts
@@ -2,12 +2,9 @@
  * Public API Surface of ng-select
  */
 
-export * from './lib/ps-ng-selectors/ps-ng-selectors.module';
-export * from './lib/ps-ng-selectors/ng-select/ng-select.component';
-export * from './lib/ps-ng-selectors/multi-select/multi-select.component';
-export * from './lib/ps-ng-selectors/select-label-template.directive';
-export * from './lib/ps-ng-selectors/select-option-template.directive';
-export * from './lib/ps-ng-selectors/not-found-template.directive';
-
-
-
+export * from './lib/ps-ng-select/ps-ng-select.module';
+export * from './lib/ps-ng-select/ng-select/ng-select.component';
+export * from './lib/ps-ng-select/multi-select/multi-select.component';
+export * from './lib/ps-ng-select/select-label-template.directive';
+export * from './lib/ps-ng-select/select-option-template.directive';
+export * from './lib/ps-ng-select/not-found-template.directive';
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/data-source-filter.module.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/data-source-filter.module.ts
new file mode 100644
index 0000000..ca1bb73
--- /dev/null
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/data-source-filter.module.ts
@@ -0,0 +1,27 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { DataSourceTextFilterComponent } from './text-filter/data-source-text-filter.component';
+import { FormsModule } from '@angular/forms';
+import { DataSourceNumberFilterComponent } from './number-filter/data-source-number-filter.component';
+import { DataSourceDatetimeFilterComponent } from './datetime-filter/data-source-datetime-filter.component';
+import { BsDatepickerModule } from 'ngx-bootstrap/datepicker';
+import { PopoverModule } from 'ngx-bootstrap/popover';
+import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
+import { TooltipModule } from 'ngx-bootstrap/tooltip';
+
+
+
+
+@NgModule({
+  declarations: [DataSourceTextFilterComponent, DataSourceNumberFilterComponent,DataSourceDatetimeFilterComponent],
+  imports: [
+    CommonModule,
+    FormsModule,    
+    BsDatepickerModule.forRoot(),
+    PopoverModule.forRoot(),
+    BsDropdownModule.forRoot(),
+    TooltipModule.forRoot()
+  ],
+  exports: [DataSourceTextFilterComponent, DataSourceNumberFilterComponent,DataSourceDatetimeFilterComponent]
+})
+export class DataSourceFilterModule { }
\ No newline at end of file
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/datetime-filter.component.html b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.html
similarity index 100%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/datetime-filter.component.html
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.html
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/datetime-filter.component.scss b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.scss
similarity index 100%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/datetime-filter.component.scss
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.scss
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/datetime-filter.component.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.ts
similarity index 85%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/datetime-filter.component.ts
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.ts
index 4b6ce79..5c8c5ec 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/datetime-filter.component.ts
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.ts
@@ -2,11 +2,11 @@ import { Component, OnInit, Input } from '@angular/core';
 import { IDataSource, ISimpleFilter } from '@poweredsoft/data';
 
 @Component({
-  selector: 'psbx-datetime-filter',
-  templateUrl: './datetime-filter.component.html',
-  styleUrls: ['./datetime-filter.component.scss']
+  selector: 'psbx-ds-datetime-filter',
+  templateUrl: './data-source-datetime-filter.component.html',
+  styleUrls: ['./data-source-datetime-filter.component.scss']
 })
-export class DatetimeFilterComponent {
+export class DataSourceDatetimeFilterComponent {
 
   @Input() path: string;
   @Input() dataSource : IDataSource<any>; 
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/grid-filter.module.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/grid-filter.module.ts
deleted file mode 100644
index a720d04..0000000
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/grid-filter.module.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { TextFilterComponent } from './text-filter/text-filter.component';
-import { FormsModule } from '@angular/forms';
-import { NumberFilterComponent } from './number-filter/number-filter.component';
-import { DatetimeFilterComponent } from './datetime-filter/datetime-filter.component';
-import { BsDatepickerModule } from 'ngx-bootstrap/datepicker';
-import { PopoverModule } from 'ngx-bootstrap/popover';
-import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
-import { TooltipModule } from 'ngx-bootstrap/tooltip';
-
-
-
-
-@NgModule({
-  declarations: [TextFilterComponent, NumberFilterComponent,DatetimeFilterComponent],
-  imports: [
-    CommonModule,
-    FormsModule,    
-    BsDatepickerModule.forRoot(),
-    PopoverModule.forRoot(),
-    BsDropdownModule.forRoot(),
-    TooltipModule.forRoot()
-  ],
-  exports: [TextFilterComponent, NumberFilterComponent,DatetimeFilterComponent]
-})
-export class GridFilterModule { } //DS Filter
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/number-filter.component.html b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.html
similarity index 100%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/number-filter.component.html
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.html
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/number-filter.component.scss b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.scss
similarity index 100%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/number-filter.component.scss
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.scss
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/number-filter.component.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.ts
similarity index 90%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/number-filter.component.ts
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.ts
index 74048b8..bcc395b 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/number-filter.component.ts
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.ts
@@ -4,10 +4,10 @@ import { ISimpleFilter } from '../../models/IFilter';
 
 @Component({
   selector: 'psbx-ds-number-filter',
-  templateUrl: './number-filter.component.html',
-  styleUrls: ['./number-filter.component.scss']
+  templateUrl: './data-source-number-filter.component.html',
+  styleUrls: ['./data-source-number-filter.component.scss']
 })
-export class NumberFilterComponent implements OnInit {
+export class DataSourceNumberFilterComponent implements OnInit {
   @Input() dataSource : IDataSource<any>;   
   @Input() path:string;
  
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/text-filter.component.html b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.html
similarity index 100%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/text-filter.component.html
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.html
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/text-filter.component.scss b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.scss
similarity index 100%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/text-filter.component.scss
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.scss
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/text-filter.component.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.ts
similarity index 90%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/text-filter.component.ts
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.ts
index 990356f..9ebd44a 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/text-filter.component.ts
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.ts
@@ -6,10 +6,10 @@ import { PopoverDirective } from 'ngx-bootstrap/popover';
 
 @Component({
   selector: 'psbx-ds-text-filter',
-  templateUrl: './text-filter.component.html',
-  styleUrls: ['./text-filter.component.scss']
+  templateUrl: './data-source-text-filter.component.html',
+  styleUrls: ['./data-source-text-filter.component.scss']
 })
-export class TextFilterComponent implements OnInit {
+export class DataSourceTextFilterComponent implements OnInit {
 
   @Input() dataSource : IDataSource<any>;   
   @Input() path:string;
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting.module.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/data-source-sorting.module.ts
similarity index 63%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting.module.ts
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/data-source-sorting.module.ts
index 614d8d9..a4597b0 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting.module.ts
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/data-source-sorting.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { DataSourceSortingComponent } from './ds-sorting/ds-sorting.component';
+import { DataSourceSortingComponent } from './ds-sorting/data-source-sorting.component';
 
 
 
@@ -11,4 +11,4 @@ import { DataSourceSortingComponent } from './ds-sorting/ds-sorting.component';
   ],
   exports:[DataSourceSortingComponent]
 })
-export class GridSortingModule { }
+export class DataSourceSortingModule { }
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/ds-sorting.component.html b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/data-source-sorting.component.html
similarity index 100%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/ds-sorting.component.html
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/data-source-sorting.component.html
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/ds-sorting.component.scss b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/data-source-sorting.component.scss
similarity index 100%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/ds-sorting.component.scss
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/data-source-sorting.component.scss
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/ds-sorting.component.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/data-source-sorting.component.ts
similarity index 88%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/ds-sorting.component.ts
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/data-source-sorting.component.ts
index bf66deb..1b57287 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/ds-sorting.component.ts
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/data-source-sorting.component.ts
@@ -3,8 +3,8 @@ import { IDataSource } from '@poweredsoft/data';
 
 @Component({
   selector: 'psbx-ds-sorting',
-  templateUrl: './ds-sorting.component.html',
-  styleUrls: ['./ds-sorting.component.scss']
+  templateUrl: './data-source-sorting.component.html',
+  styleUrls: ['./data-source-sorting.component.scss']
 })
 export class DataSourceSortingComponent implements OnInit {
 
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/form-group-command-modal/directives/form-group-command-modal.directive.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/form-group-command-modal/directives/form-group-command-modal.directive.ts
index c037cd1..42de551 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/form-group-command-modal/directives/form-group-command-modal.directive.ts
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/form-group-command-modal/directives/form-group-command-modal.directive.ts
@@ -95,48 +95,4 @@ export class FormGroupCommandModalDirective {
     });
   }
 
-  // @HostListener('click')
-  // wasClicked() {
-  //   this.dataSource.resolveCommandModelByName({
-  //     command: this.command,
-  //     model: this.model
-  //   }).subscribe(commandModel => {
-  //     debugger;
-  //     const event = <IModelFormCreateEvent>{
-  //       commandName: this.command,
-  //       viewModel: this.model,
-  //       commandModel: commandModel,
-  //       shouldSetCommandModel: true
-  //     }
-
-  //     this.formCreate.emit(event);
-
-  //     if (event.formGroup == null)
-  //       throw new Error('form group should be set, after form createEvent');
-
-  //     if (event.shouldSetCommandModel)
-  //       event.formGroup.patchValue(commandModel);
-
-  //     const initialState = {
-  //       dataSource: this.dataSource,
-  //       command: this.command,
-  //       template: this.template,
-  //       title: this.commandTitle,
-  //       refreshOnSuccess: this.refreshOnSuccess === undefined ? true : this.refreshOnSuccess,
-  //       commandText: this.commandText || 'OK',
-  //       cancelText: this.cancelText || 'Cancel',
-  //       modelForm: event.formGroup,
-  //       commandModel:commandModel
-  //     };
-      
-  //     this.modalService.show(FormGroupCommandModalComponent, {
-  //       animated: this.animated === undefined ? true : this.animated,
-  //       initialState
-  //     });
-
-  //   }, error => {
-
-  //   });
-  // }
-
 }
diff --git a/projects/poweredsoft/ngx-bootstrap/src/public-api.ts b/projects/poweredsoft/ngx-bootstrap/src/public-api.ts
index ea42355..4deaf47 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/public-api.ts
+++ b/projects/poweredsoft/ngx-bootstrap/src/public-api.ts
@@ -13,9 +13,9 @@ export * from './lib/confirm-modal/confirm-modal.service';
 export * from './lib/confirm-modal/confirm-modal.directive';
 export * from './lib/spinner/spinner.module';
 export * from './lib/spinner/spinner/spinner.component';
-export * from './lib/dataSource-filter/grid-filter.module';
-export * from './lib/dataSource-filter/text-filter/text-filter.component';
-export * from './lib/dataSource-filter/number-filter/number-filter.component';
-export * from './lib/dataSource-filter/datetime-filter/datetime-filter.component';
-export * from './lib/dataSource-sorting/ds-sorting.module';
-export * from './lib/dataSource-sorting/ds-sorting/ds-sorting.component';
\ No newline at end of file
+export * from './lib/dataSource-filter/data-source-filter.module';
+export * from './lib/dataSource-filter/text-filter/data-source-text-filter.component';
+export * from './lib/dataSource-filter/number-filter/data-source-number-filter.component';
+export * from './lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component';
+export * from './lib/dataSource-sorting/data-source-sorting.module';
+export * from './lib/dataSource-sorting/ds-sorting/data-source-sorting.component';
\ No newline at end of file
diff --git a/src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.html b/src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.html
index 02442e8..94bce33 100644
--- a/src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.html
+++ b/src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.html
@@ -23,12 +23,8 @@
         <ng-container *psDataGridCell="let model">
             <button class="btn-success btn" psbxFormGroupCommandModal [commandTitle]="'Change ' + model.name + ' name'" commandText="Update"
             [dataSource]="merchantDataSource" command="changeMerchant" (formCreate)="onFormCreate($event)" [model]="model" [template]="theModal">Change</button>
-
             <button class="btn-danger btn" psbxConfirmModal [commandTitle]="'Are you sure you wnat to remove ' + model.name + '?'" commandText="Remove"
             [dataSource]="merchantDataSource" command="removeMerchant" [model]="model" >Delete!</button>
-
-            <!-- <button class="btn-danger btn" psbxExecuteCommand [dataSource]="merchantDataSource" [command]="removeMerchant"
-             [model]="model" [confirm]="true" [confirmMessage]="do you wish to delete the merchant `' + model.name + '`" [refresh]="false">Delete</button> -->
         </ng-container>
     </ng-container>
     <ng-container *psDataGridFooter>
diff --git a/src/app/grid-filter&sorting-demo/grid-filter-demo.module.ts b/src/app/grid-filter&sorting-demo/grid-filter-demo.module.ts
index e3b3dc5..0a2a6ae 100644
--- a/src/app/grid-filter&sorting-demo/grid-filter-demo.module.ts
+++ b/src/app/grid-filter&sorting-demo/grid-filter-demo.module.ts
@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
 
 import { GridFilterDemoRoutingModule } from './grid-filter-demo-routing.module';
 import { GridFilterDemoComponent } from './grid-filter-demo/grid-filter-demo.component';
-import { GridFilterModule, psbxPaginationModule, CommandModalModule, ConfirmModalModule, SpinnerModule, GridSortingModule } from '@poweredsoft/ngx-bootstrap';
+import { DataSourceFilterModule, psbxPaginationModule, CommandModalModule, ConfirmModalModule, SpinnerModule, DataSourceSortingModule } from '@poweredsoft/ngx-bootstrap';
 import { DataGridModule } from '@poweredsoft/ngx-cdk-ui';
 import { FormsModule } from '@angular/forms';
 
@@ -12,14 +12,14 @@ import { FormsModule } from '@angular/forms';
   imports: [
     CommonModule,
     GridFilterDemoRoutingModule,
-    GridFilterModule,    
+    DataSourceFilterModule,    
     psbxPaginationModule,
     DataGridModule,
     CommandModalModule,
     ConfirmModalModule,
     FormsModule,
     SpinnerModule,
-    GridSortingModule
+    DataSourceSortingModule
   ]
 })
 export class GridFilterDemoModule { }
diff --git a/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.html b/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.html
index 148fe65..0d3d0bb 100644
--- a/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.html
+++ b/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.html
@@ -43,8 +43,8 @@
     <ng-container psDataGridCol="openDate">
         <ng-container *psDataGridColHeader>Open Date</ng-container>
         <ng-container *psDataGridCell="let model">{{model.openDate}}</ng-container>
-        <psbx-datetime-filter *psDataGridCellFilter [dataSource]="merchantDataSource" path="openDate">
-        </psbx-datetime-filter>
+        <psbx-ds-datetime-filter *psDataGridCellFilter [dataSource]="merchantDataSource" path="openDate">
+        </psbx-ds-datetime-filter>
         <psbx-ds-sorting *psDataGridColSort [dataSource]="merchantDataSource" path="openDate"></psbx-ds-sorting>
     </ng-container>
 
diff --git a/src/app/ng-select-demo/ng-select-demo.module.ts b/src/app/ng-select-demo/ng-select-demo.module.ts
index 0bd078e..2088487 100644
--- a/src/app/ng-select-demo/ng-select-demo.module.ts
+++ b/src/app/ng-select-demo/ng-select-demo.module.ts
@@ -4,7 +4,7 @@ import { NgSelectDemoComponent } from './ng-select-demo/ng-select-demo.component
 import { NgSelectDemoRoutingModule } from './ng-select-demo-routing.module';
 import { NgSelectModule } from '@ng-select/ng-select';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { PsNgSelectorsModule } from '@poweredsoft/ng-select';
+import { PsNgSelectModule } from '@poweredsoft/ng-select';
 
 
 
@@ -17,7 +17,7 @@ import { PsNgSelectorsModule } from '@poweredsoft/ng-select';
     FormsModule,
     ReactiveFormsModule,
     NgSelectDemoRoutingModule,
-    PsNgSelectorsModule
+    PsNgSelectModule
   ]
 })
 export class NgSelectDemoModule { }