diff --git a/package.json b/package.json
index d534724f7..a81acdfd6 100644
--- a/package.json
+++ b/package.json
@@ -31,13 +31,13 @@
     "ng2-alfresco-datatable": "1.9.0",
     "ng2-alfresco-documentlist": "1.9.0",
     "ng2-alfresco-login": "1.9.0",
-    "ng2-alfresco-upload": "1.9.0",
     "ng2-alfresco-search": "1.9.0",
+    "ng2-alfresco-upload": "1.9.0",
     "ng2-alfresco-viewer": "1.9.0",
     "pdfjs-dist": "1.8.557",
-    "rxjs": "^5.4.2",
-    "zone.js": "^0.8.14",
-    "wsrv": "0.2.2"
+    "rxjs": "5.1.0",
+    "wsrv": "0.2.2",
+    "zone.js": "^0.8.14"
   },
   "devDependencies": {
     "@angular/cli": "1.4.7",
diff --git a/src/app/adf.module.ts b/src/app/adf.module.ts
new file mode 100644
index 000000000..2034755b0
--- /dev/null
+++ b/src/app/adf.module.ts
@@ -0,0 +1,29 @@
+import { NgModule } from '@angular/core';
+
+// ADF modules
+import { CoreModule } from 'ng2-alfresco-core';
+import { DataTableModule } from 'ng2-alfresco-datatable';
+import { ViewerModule } from 'ng2-alfresco-viewer';
+import { DocumentListModule } from 'ng2-alfresco-documentlist';
+import { LoginModule } from 'ng2-alfresco-login';
+import { UploadModule } from 'ng2-alfresco-upload';
+import { SearchModule } from 'ng2-alfresco-search';
+
+export function modules() {
+  return [
+    // ADF modules
+    CoreModule,
+    DataTableModule,
+    DocumentListModule,
+    LoginModule,
+    SearchModule,
+    UploadModule,
+    ViewerModule
+  ];
+}
+
+@NgModule({
+  imports: modules(),
+  exports: modules()
+})
+export class AdfModule {}
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index f65716351..8a86c93b3 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,6 +1,7 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 
+import { AdfModule } from './adf.module';
 import { AppComponent } from './app.component';
 
 @NgModule({
@@ -8,7 +9,8 @@ import { AppComponent } from './app.component';
     AppComponent
   ],
   imports: [
-    BrowserModule
+    BrowserModule,
+    AdfModule
   ],
   providers: [],
   bootstrap: [AppComponent]
diff --git a/tsconfig.json b/tsconfig.json
index a6c016bf3..bf0a18c3d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,6 +14,8 @@
     "lib": [
       "es2017",
       "dom"
-    ]
+    ],
+
+    "skipLibCheck": true
   }
 }