diff --git a/app/app.component.ts b/app/app.component.ts
index f97eef3..5626953 100644
--- a/app/app.component.ts
+++ b/app/app.component.ts
@@ -4,7 +4,7 @@
 
 import { Component } from '@angular/core';
 import {Properties} from './utils/properties';
-import{MenuItem, RootMenuItem} from 'ng-openaire-library';
+import{MenuItem, RootMenuItem} from './openaireLibrary/sharedComponents/menu';
 import {ActivatedRoute} from '@angular/router';
 
 @Component({
diff --git a/app/app.module.ts b/app/app.module.ts
index 772483a..72709c9 100644
--- a/app/app.module.ts
+++ b/app/app.module.ts
@@ -40,9 +40,17 @@ import { DivContentFormComponent } from "./pages/divhelpcontent/div-help-content
 import { EditDivHelpContentComponent } from "./pages/divhelpcontent/edit-div-help-content.component";
 import {ClaimsComponent} from './pages/claims/claims.component';
 
-import {BottomModule, FeedbackModule, NavigationBarModule, CookieLawModule} from 'ng-openaire-library';
-import {FreeGuard, AdminLoginGuard, EnvironmentSpecificResolver, EnvironmentSpecificService} from 'ng-openaire-library';
-import{ClaimsAdminModule, Meta} from 'ng-openaire-library';
+import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module';
+import { CookieLawModule } from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module';
+import {Meta} from './openaireLibrary/sharedComponents/metaService';
+
+import {BottomModule} from './openaireLibrary/sharedComponents/bottom.module';
+import {FeedbackModule} from './openaireLibrary/sharedComponents/feedback/feedback.module';
+import {FreeGuard} from './openaireLibrary/login/freeGuard.guard';
+import { AdminLoginGuard} from './openaireLibrary/login/adminLoginGuard.guard';
+import { EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
+import { EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
+import{ClaimsAdminModule} from './openaireLibrary/claims/claimsAdmin/claimsAdmin.module';
 //, , ErrorModule CookieLawModule
 @NgModule({
     imports: [
diff --git a/app/app.routing.ts b/app/app.routing.ts
index c0b2950..ecacb72 100644
--- a/app/app.routing.ts
+++ b/app/app.routing.ts
@@ -17,9 +17,13 @@ import { DivHelpContentsComponent } from "./pages/divhelpcontent/div-help-conten
 import { NewDivHelpContentComponent } from "./pages/divhelpcontent/new-div-help-content.component";
 import { EditDivHelpContentComponent } from "./pages/divhelpcontent/edit-div-help-content.component";
 import {ClaimsComponent} from './pages/claims/claims.component';
+import {FreeGuard} from './openaireLibrary/login/freeGuard.guard';
 
- import {FreeGuard, AdminLoginGuard} from 'ng-openaire-library';
- import {EnvironmentSpecificResolver, EnvironmentSpecificService, ClaimsAdminComponent} from 'ng-openaire-library';
+import { AdminLoginGuard} from './openaireLibrary/login/adminLoginGuard.guard';
+import { EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
+import { EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
+import{ClaimsAdminComponent} from './openaireLibrary/claims/claimsAdmin/claimsAdmin.component';
+ 
 
 
 const appRoutes: Routes = [
diff --git a/app/pages/claims/claims.component.ts b/app/pages/claims/claims.component.ts
index 018fbfa..c08955f 100644
--- a/app/pages/claims/claims.component.ts
+++ b/app/pages/claims/claims.component.ts
@@ -1,7 +1,7 @@
 
 import { Component, ViewChild, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import{ClaimsAdminModule} from 'ng-openaire-library';
+// import{ClaimsAdminModule} from 'ng-openaire-library';
 @Component({
     selector: 'claims',
     template: `    <claims-admin>
diff --git a/package.json b/package.json
index 9f1bebf..1ad29dd 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,13 @@
     "@angular/router": "^4.2.4",
     "@angular/upgrade": "^4.2.4",
     "angular-in-memory-web-api": "~0.3.2",
+    "angular-datatables": "^4.4.0",
+    "citation-js": "^0.3.4",
+    "clipboard": "^1.5.16",
     "core-js": "^2.4.1",
+    "datatables.net": "^1.10.16",
+    "datatables.net-dt": "^1.10.16",
+    "jquery": "^3.2.1",
     "extract-text-webpack-plugin": "^2.1.0",
     "file-loader": "^0.11.1",
     "ie-shim": "^0.1.0",
@@ -41,6 +47,9 @@
     "zone.js": "^0.8.14"
   },
   "devDependencies": {
+    "@angular/cli": "^1.6.8",
+    "@types/datatables.net": "^1.10.8",
+    "@types/jquery": "^3.2.17",
     "angular2-router-loader": "^0.3.4",
     "angular2-template-loader": "^0.6.0",
     "awesome-typescript-loader": "^3.1.3",