diff --git a/ng2-components/ng2-alfresco-datatable/demo/systemjs.config.js b/ng2-components/ng2-alfresco-datatable/demo/systemjs.config.js
index 3c064ea453..b66a415e5f 100644
--- a/ng2-components/ng2-alfresco-datatable/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-datatable/demo/systemjs.config.js
@@ -10,7 +10,7 @@
         'angular2-in-memory-web-api': 'node_modules/angular2-in-memory-web-api',
         'rxjs':                       'node_modules/rxjs',
 
-        'ng2-alfresco-datatable': 'node_modules/ng2-alfresco-datatable'
+        'ng2-alfresco-datatable': 'node_modules/ng2-alfresco-datatable/dist'
     };
     // packages tells the System loader how to load when no filename and/or no extension
     var packages = {
@@ -18,7 +18,7 @@
         'rxjs':                       { defaultExtension: 'js' },
         'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' },
 
-        'ng2-alfresco-datatable': { defaultExtension: 'js' }
+        'ng2-alfresco-datatable': { main: 'index.js', defaultExtension: 'js' }
     };
     var ngPackageNames = [
         'common',
diff --git a/ng2-components/ng2-alfresco-documentlist/demo/systemjs.config.js b/ng2-components/ng2-alfresco-documentlist/demo/systemjs.config.js
index e02792d2e0..8760acafab 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-documentlist/demo/systemjs.config.js
@@ -11,8 +11,8 @@
         'rxjs':                       'node_modules/rxjs',
 
         'ng2-translate': 'node_modules/ng2-translate',
-        'ng2-alfresco-core': 'node_modules/ng2-alfresco-core',
-        'ng2-alfresco-documentlist': 'node_modules/ng2-alfresco-documentlist'
+        'ng2-alfresco-core': 'node_modules/ng2-alfresco-core/dist',
+        'ng2-alfresco-documentlist': 'node_modules/ng2-alfresco-documentlist/dist'
     };
     // packages tells the System loader how to load when no filename and/or no extension
     var packages = {
@@ -21,8 +21,8 @@
         'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' },
 
         'ng2-translate': { defaultExtension: 'js' },
-        'ng2-alfresco-core': { defaultExtension: 'js' },
-        'ng2-alfresco-documentlist': { defaultExtension: 'js' }
+        'ng2-alfresco-core': { main: 'index.js', defaultExtension: 'js' },
+        'ng2-alfresco-documentlist': { main: 'index.js', defaultExtension: 'js' }
     };
     var ngPackageNames = [
         'common',
diff --git a/ng2-components/ng2-alfresco-login/demo/systemjs.config.js b/ng2-components/ng2-alfresco-login/demo/systemjs.config.js
index 6c215e3898..25fa889651 100644
--- a/ng2-components/ng2-alfresco-login/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-login/demo/systemjs.config.js
@@ -11,8 +11,8 @@
         'rxjs':                       'node_modules/rxjs',
 
         'ng2-translate': 'node_modules/ng2-translate',
-        'ng2-alfresco-core': 'node_modules/ng2-alfresco-core',
-        'ng2-alfresco-login': 'node_modules/ng2-alfresco-login'
+        'ng2-alfresco-core': 'node_modules/ng2-alfresco-core/dist',
+        'ng2-alfresco-login': 'node_modules/ng2-alfresco-login/dist'
     };
     // packages tells the System loader how to load when no filename and/or no extension
     var packages = {
@@ -21,8 +21,8 @@
         'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' },
 
         'ng2-translate': { defaultExtension: 'js' },
-        'ng2-alfresco-core': { defaultExtension: 'js' },
-        'ng2-alfresco-login': { defaultExtension: 'js' }
+        'ng2-alfresco-core': { main: 'index.js', defaultExtension: 'js' },
+        'ng2-alfresco-login': { main: 'index.js', defaultExtension: 'js' }
     };
     var ngPackageNames = [
         'common',
diff --git a/ng2-components/ng2-alfresco-search/demo/systemjs.config.js b/ng2-components/ng2-alfresco-search/demo/systemjs.config.js
index 721ea273a8..e798c26904 100644
--- a/ng2-components/ng2-alfresco-search/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-search/demo/systemjs.config.js
@@ -11,8 +11,8 @@
         'rxjs':                       'node_modules/rxjs',
 
         'ng2-translate': 'node_modules/ng2-translate',
-        'ng2-alfresco-core': 'node_modules/ng2-alfresco-core',
-        'ng2-alfresco-search': 'node_modules/ng2-alfresco-search'
+        'ng2-alfresco-core': 'node_modules/ng2-alfresco-core/dist',
+        'ng2-alfresco-search': 'node_modules/ng2-alfresco-search/dist'
     };
     // packages tells the System loader how to load when no filename and/or no extension
     var packages = {
@@ -21,8 +21,8 @@
         'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' },
 
         'ng2-translate': { defaultExtension: 'js' },
-        'ng2-alfresco-core': { defaultExtension: 'js' },
-        'ng2-alfresco-search': { defaultExtension: 'js' }
+        'ng2-alfresco-core': { main: 'index.js', defaultExtension: 'js' },
+        'ng2-alfresco-search': { main: 'index.js', defaultExtension: 'js' }
     };
     var ngPackageNames = [
         'common',
diff --git a/ng2-components/ng2-alfresco-upload/demo/systemjs.config.js b/ng2-components/ng2-alfresco-upload/demo/systemjs.config.js
index 50ac0b4afe..a3154643ff 100644
--- a/ng2-components/ng2-alfresco-upload/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-upload/demo/systemjs.config.js
@@ -11,8 +11,8 @@
         'rxjs':                       'node_modules/rxjs',
 
         'ng2-translate': 'node_modules/ng2-translate',
-        'ng2-alfresco-core': 'node_modules/ng2-alfresco-core',
-        'ng2-alfresco-upload': 'node_modules/ng2-alfresco-upload'
+        'ng2-alfresco-core': 'node_modules/ng2-alfresco-core/dist',
+        'ng2-alfresco-upload': 'node_modules/ng2-alfresco-upload/dist'
     };
     // packages tells the System loader how to load when no filename and/or no extension
     var packages = {
@@ -21,8 +21,8 @@
         'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' },
 
         'ng2-translate': { defaultExtension: 'js' },
-        'ng2-alfresco-core': { defaultExtension: 'js' },
-        'ng2-alfresco-upload': { defaultExtension: 'js' }
+        'ng2-alfresco-core': { main: 'index.js', defaultExtension: 'js' },
+        'ng2-alfresco-upload': { main: 'index.js', defaultExtension: 'js' }
     };
     var ngPackageNames = [
         'common',
diff --git a/ng2-components/ng2-alfresco-viewer/demo/systemjs.config.js b/ng2-components/ng2-alfresco-viewer/demo/systemjs.config.js
index 0f3df3f2e1..39f39384ef 100644
--- a/ng2-components/ng2-alfresco-viewer/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-viewer/demo/systemjs.config.js
@@ -10,7 +10,7 @@
         'angular2-in-memory-web-api': 'node_modules/angular2-in-memory-web-api',
         'rxjs':                       'node_modules/rxjs',
 
-        'ng2-alfresco-viewer': 'node_modules/ng2-alfresco-viewer'
+        'ng2-alfresco-viewer': 'node_modules/ng2-alfresco-viewer/dist'
     };
     // packages tells the System loader how to load when no filename and/or no extension
     var packages = {
@@ -18,7 +18,7 @@
         'rxjs':                       { defaultExtension: 'js' },
         'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' },
 
-        'ng2-alfresco-viewer': { defaultExtension: 'js' }
+        'ng2-alfresco-viewer': { main: 'index.js', defaultExtension: 'js' }
     };
     var ngPackageNames = [
         'common',