diff --git a/demo-shell-ng2/app/app.component.ts b/demo-shell-ng2/app/app.component.ts
index 7cc2dc47cc..ee5bbe74fb 100644
--- a/demo-shell-ng2/app/app.component.ts
+++ b/demo-shell-ng2/app/app.component.ts
@@ -17,16 +17,16 @@
 
 import { Component } from '@angular/core';
 import { Router, RouteConfig, ROUTER_DIRECTIVES } from '@angular/router-deprecated';
-import { MDL } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
 import { FilesComponent } from './components/files/files.component';
 
 import {
+    MDL,
     AlfrescoSettingsService,
     AlfrescoTranslationService,
     AlfrescoPipeTranslate,
     AlfrescoAuthenticationService
-} from 'ng2-alfresco-core/dist/ng2-alfresco-core';
-import { UploadButtonComponent } from 'ng2-alfresco-upload/dist/ng2-alfresco-upload';
+} from 'ng2-alfresco-core';
+import { UploadButtonComponent } from 'ng2-alfresco-upload';
 import { DataTableDemoComponent } from './components/datatable/datatable-demo.component';
 import { SearchComponent } from './components/search/search.component';
 import { SearchBarComponent } from './components/search/search-bar.component';
diff --git a/demo-shell-ng2/app/components/datatable/datatable-demo.component.ts b/demo-shell-ng2/app/components/datatable/datatable-demo.component.ts
index 39dee7d9ed..c9c183222d 100644
--- a/demo-shell-ng2/app/components/datatable/datatable-demo.component.ts
+++ b/demo-shell-ng2/app/components/datatable/datatable-demo.component.ts
@@ -22,7 +22,7 @@ import {
     DataSorting,
     ObjectDataRow,
     ObjectDataColumn
-} from 'ng2-alfresco-datatable/dist/ng2-alfresco-datatable';
+} from 'ng2-alfresco-datatable';
 
 declare let __moduleName: string;
 
diff --git a/demo-shell-ng2/app/components/files/files.component.ts b/demo-shell-ng2/app/components/files/files.component.ts
index e9b4489aa4..ff0569c166 100644
--- a/demo-shell-ng2/app/components/files/files.component.ts
+++ b/demo-shell-ng2/app/components/files/files.component.ts
@@ -20,15 +20,15 @@ import {
     DOCUMENT_LIST_DIRECTIVES,
     DOCUMENT_LIST_PROVIDERS,
     DocumentActionsService
-} from 'ng2-alfresco-documentlist/dist/ng2-alfresco-documentlist';
+} from 'ng2-alfresco-documentlist';
 import {
     MDL,
-    AlfrescoContentService
-} from 'ng2-alfresco-core/dist/ng2-alfresco-core';
-import { CONTEXT_MENU_DIRECTIVES } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
-import { ALFRESCO_ULPOAD_COMPONENTS } from 'ng2-alfresco-upload/dist/ng2-alfresco-upload';
-import { AlfrescoPipeTranslate } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
-import { VIEWERCOMPONENT } from 'ng2-alfresco-viewer/dist/ng2-alfresco-viewer';
+    AlfrescoContentService,
+    CONTEXT_MENU_DIRECTIVES,
+    AlfrescoPipeTranslate
+} from 'ng2-alfresco-core';
+import { ALFRESCO_ULPOAD_COMPONENTS } from 'ng2-alfresco-upload';
+import { VIEWERCOMPONENT } from 'ng2-alfresco-viewer';
 
 declare let __moduleName: string;
 
diff --git a/demo-shell-ng2/app/components/login/login-demo.component.ts b/demo-shell-ng2/app/components/login/login-demo.component.ts
index 6c12d85aeb..1056f857b9 100644
--- a/demo-shell-ng2/app/components/login/login-demo.component.ts
+++ b/demo-shell-ng2/app/components/login/login-demo.component.ts
@@ -16,7 +16,7 @@
  */
 
 import { Component } from '@angular/core';
-import { AlfrescoLoginComponent } from 'ng2-alfresco-login/dist/ng2-alfresco-login';
+import { AlfrescoLoginComponent } from 'ng2-alfresco-login';
 
 declare let __moduleName: string;
 
diff --git a/demo-shell-ng2/app/components/search/search-bar.component.ts b/demo-shell-ng2/app/components/search/search-bar.component.ts
index fdd9d58063..41e94b96b0 100644
--- a/demo-shell-ng2/app/components/search/search-bar.component.ts
+++ b/demo-shell-ng2/app/components/search/search-bar.component.ts
@@ -17,12 +17,12 @@
 
 import { Component } from '@angular/core';
 import { Router } from '@angular/router-deprecated';
-import { ALFRESCO_SEARCH_DIRECTIVES } from 'ng2-alfresco-search/dist/ng2-alfresco-search';
-import { VIEWERCOMPONENT } from 'ng2-alfresco-viewer/dist/ng2-alfresco-viewer';
+import { ALFRESCO_SEARCH_DIRECTIVES } from 'ng2-alfresco-search';
+import { VIEWERCOMPONENT } from 'ng2-alfresco-viewer';
 import {
     AlfrescoAuthenticationService,
     AlfrescoContentService
-} from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+} from 'ng2-alfresco-core';
 
 declare let __moduleName: string;
 
diff --git a/demo-shell-ng2/app/components/search/search.component.ts b/demo-shell-ng2/app/components/search/search.component.ts
index 4af77dd72d..4a8bf72da3 100644
--- a/demo-shell-ng2/app/components/search/search.component.ts
+++ b/demo-shell-ng2/app/components/search/search.component.ts
@@ -16,7 +16,7 @@
  */
 
 import { Component } from '@angular/core';
-import { ALFRESCO_SEARCH_DIRECTIVES } from 'ng2-alfresco-search/dist/ng2-alfresco-search';
+import { ALFRESCO_SEARCH_DIRECTIVES } from 'ng2-alfresco-search';
 
 declare let __moduleName: string;
 
diff --git a/demo-shell-ng2/app/components/tasks/tasks-demo.component.ts b/demo-shell-ng2/app/components/tasks/tasks-demo.component.ts
index db01e5ad71..0b61684eae 100644
--- a/demo-shell-ng2/app/components/tasks/tasks-demo.component.ts
+++ b/demo-shell-ng2/app/components/tasks/tasks-demo.component.ts
@@ -20,7 +20,7 @@ import { ActivitiService } from './activiti.service';
 import {
     ALFRESCO_DATATABLE_DIRECTIVES,
     ObjectDataTableAdapter
-} from 'ng2-alfresco-datatable/dist/ng2-alfresco-datatable';
+} from 'ng2-alfresco-datatable';
 
 @Component({
     selector: 'tasks-demo',
diff --git a/demo-shell-ng2/app/main.ts b/demo-shell-ng2/app/main.ts
index 37b3de6a06..b54b210b18 100644
--- a/demo-shell-ng2/app/main.ts
+++ b/demo-shell-ng2/app/main.ts
@@ -18,8 +18,8 @@
 import { bootstrap } from '@angular/platform-browser-dynamic';
 import { ROUTER_PROVIDERS } from '@angular/router-deprecated';
 import { HTTP_PROVIDERS } from '@angular/http';
-import { ALFRESCO_CORE_PROVIDERS } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
-import { UploadService } from 'ng2-alfresco-upload/dist/ng2-alfresco-upload';
+import { ALFRESCO_CORE_PROVIDERS } from 'ng2-alfresco-core';
+import { UploadService } from 'ng2-alfresco-upload';
 import { AppComponent } from './app.component';
 
 bootstrap(AppComponent, [
diff --git a/demo-shell-ng2/systemjs.config.js b/demo-shell-ng2/systemjs.config.js
index 8b717dbca4..013d5f1210 100644
--- a/demo-shell-ng2/systemjs.config.js
+++ b/demo-shell-ng2/systemjs.config.js
@@ -11,13 +11,13 @@
         'rxjs':                       'node_modules/rxjs',
 
         'ng2-translate': 'node_modules/ng2-translate',
-        'ng2-alfresco-core': 'node_modules/ng2-alfresco-core',
-        'ng2-alfresco-datatable': 'node_modules/ng2-alfresco-datatable',
-        'ng2-alfresco-documentlist': 'node_modules/ng2-alfresco-documentlist',
-        'ng2-alfresco-login': 'node_modules/ng2-alfresco-login',
-        'ng2-alfresco-search': 'node_modules/ng2-alfresco-search',
-        'ng2-alfresco-upload': 'node_modules/ng2-alfresco-upload',
-        'ng2-alfresco-viewer': 'node_modules/ng2-alfresco-viewer'
+        'ng2-alfresco-core': 'node_modules/ng2-alfresco-core/dist',
+        'ng2-alfresco-datatable': 'node_modules/ng2-alfresco-datatable/dist',
+        'ng2-alfresco-documentlist': 'node_modules/ng2-alfresco-documentlist/dist',
+        'ng2-alfresco-login': 'node_modules/ng2-alfresco-login/dist',
+        'ng2-alfresco-search': 'node_modules/ng2-alfresco-search/dist',
+        'ng2-alfresco-upload': 'node_modules/ng2-alfresco-upload/dist',
+        '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 = {
@@ -26,13 +26,14 @@
         'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' },
 
         'ng2-translate': { defaultExtension: 'js' },
-        'ng2-alfresco-core': {defaultExtension: 'js'},
-        'ng2-alfresco-datatable': {defaultExtension: 'js'},
-        'ng2-alfresco-documentlist': {defaultExtension: 'js'},
-        'ng2-alfresco-login': {defaultExtension: 'js'},
-        'ng2-alfresco-search': {defaultExtension: 'js'},
-        'ng2-alfresco-upload': {defaultExtension: 'js'},
-        'ng2-alfresco-viewer': {defaultExtension: 'js'}
+        
+        'ng2-alfresco-core': { main: 'index.js', defaultExtension: 'js'},
+        'ng2-alfresco-datatable': { main: 'index.js', defaultExtension: 'js'},
+        'ng2-alfresco-documentlist': { main: 'index.js', defaultExtension: 'js'},
+        'ng2-alfresco-login': { main: 'index.js', defaultExtension: 'js'},
+        'ng2-alfresco-search': { main: 'index.js', defaultExtension: 'js'},
+        'ng2-alfresco-upload': { main: 'index.js', defaultExtension: 'js'},
+        'ng2-alfresco-viewer': { main: 'index.js', defaultExtension: 'js'}
     };
     var ngPackageNames = [
         'common',
diff --git a/ng2-components/ng2-alfresco-core/.gitignore b/ng2-components/ng2-alfresco-core/.gitignore
index 0398da9d4a..bf980cac93 100644
--- a/ng2-components/ng2-alfresco-core/.gitignore
+++ b/ng2-components/ng2-alfresco-core/.gitignore
@@ -1,6 +1,5 @@
 npm-debug.log
 node_modules
-jspm_packages
 .idea
 typings
 coverage
@@ -11,6 +10,6 @@ src/**/*.d.ts
 demo/**/*.js
 demo/**/*.js.map
 demo/**/*.d.ts
-ng2-alfresco-core.js
-ng2-alfresco-core.js.map
+index.js
+index.map
 !systemjs.config.js
diff --git a/ng2-components/ng2-alfresco-core/ng2-alfresco-core.ts b/ng2-components/ng2-alfresco-core/index.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-core/ng2-alfresco-core.ts
rename to ng2-components/ng2-alfresco-core/index.ts
diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json
index c4bfeb741a..8c1b17efb8 100644
--- a/ng2-components/ng2-alfresco-core/package.json
+++ b/ng2-components/ng2-alfresco-core/package.json
@@ -25,6 +25,8 @@
     "coverage": "npm run test && http-server -c-1 -o -p 9875 ./coverage/report",
     "prepublish": "npm run build"
   },
+  "main": "./dist/index.js",
+  "typings": "./dist/index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/Alfresco/dev-platform-webcomponents.git"
diff --git a/ng2-components/ng2-alfresco-datatable/.gitignore b/ng2-components/ng2-alfresco-datatable/.gitignore
index d9eb4fd0d7..787032431d 100644
--- a/ng2-components/ng2-alfresco-datatable/.gitignore
+++ b/ng2-components/ng2-alfresco-datatable/.gitignore
@@ -6,6 +6,6 @@ coverage/
 dist/
 src/**/*.js
 src/**/*.js.map
-ng2-alfresco-datatable.js
-ng2-alfresco-datatable.js.map
+index.js
+index.js.map
 !systemjs.config.js
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-datatable/ng2-alfresco-datatable.ts b/ng2-components/ng2-alfresco-datatable/index.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-datatable/ng2-alfresco-datatable.ts
rename to ng2-components/ng2-alfresco-datatable/index.ts
diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json
index f0c2e7afed..6c73c54e30 100644
--- a/ng2-components/ng2-alfresco-datatable/package.json
+++ b/ng2-components/ng2-alfresco-datatable/package.json
@@ -28,6 +28,8 @@
     "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report",
     "prepublish": "npm run build"
   },
+  "main": "./dist/index.js",
+  "typings": "./dist/index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/Alfresco/dev-platform-webcomponents.git"
diff --git a/ng2-components/ng2-alfresco-documentlist/.gitignore b/ng2-components/ng2-alfresco-documentlist/.gitignore
index c44b624e52..b7afa7a47d 100644
--- a/ng2-components/ng2-alfresco-documentlist/.gitignore
+++ b/ng2-components/ng2-alfresco-documentlist/.gitignore
@@ -11,6 +11,6 @@ src/**/*.d.ts
 demo/**/*.js
 demo/**/*.js.map
 demo/**/*.d.ts
-ng2-alfresco-documentlist.js
-ng2-alfresco-documentlist.js.map
+index.js
+index.js.map
 !systemjs.config.js
diff --git a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts
index 9468f92fd8..b24b84ff0b 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts
+++ b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts
@@ -26,13 +26,13 @@ import {
     AlfrescoPipeTranslate,
     AlfrescoTranslationService,
     CONTEXT_MENU_DIRECTIVES
-} from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+} from 'ng2-alfresco-core';
 
 import {
     DOCUMENT_LIST_DIRECTIVES,
     DOCUMENT_LIST_PROVIDERS,
     DocumentActionsService
-} from 'ng2-alfresco-documentlist/dist/ng2-alfresco-documentlist';
+} from 'ng2-alfresco-documentlist';
 
 @Component({
     selector: 'alfresco-documentlist-demo',
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-documentlist/ng2-alfresco-documentlist.ts b/ng2-components/ng2-alfresco-documentlist/index.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-documentlist/ng2-alfresco-documentlist.ts
rename to ng2-components/ng2-alfresco-documentlist/index.ts
diff --git a/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js b/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js
index 0e75b01bf5..13d8a57324 100644
--- a/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js
+++ b/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js
@@ -9,14 +9,14 @@ var map = {
     'app': 'base/dist',
     'rxjs': 'base/node_modules/rxjs',
     '@angular': 'base/node_modules/@angular',
-    'ng2-alfresco-core/dist': '/base/node_modules/ng2-alfresco-core/dist',
+    'ng2-alfresco-core': '/base/node_modules/ng2-alfresco-core/dist',
     'ng2-translate' : '/base/node_modules/ng2-translate'
 };
 
 var packages = {
     'app': { main: 'main.js',  defaultExtension: 'js' },
     'rxjs': { defaultExtension: 'js' },
-    'ng2-alfresco-core/dist': { defaultExtension: 'js' },
+    'ng2-alfresco-core': { main: 'index.js', defaultExtension: 'js' },
     'ng2-translate': { defaultExtension: 'js' }
 };
 
diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json
index 01a8f64edf..a70404003a 100644
--- a/ng2-components/ng2-alfresco-documentlist/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/package.json
@@ -30,6 +30,8 @@
     "coverage": "npm run test && http-server -c-1 -o -p 9875 ./coverage/report",
     "prepublish": "npm run build"
   },
+  "main": "./dist/index.js",
+  "typings": "./dist/index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/Alfresco/dev-platform-webcomponents.git"
diff --git a/ng2-components/ng2-alfresco-documentlist/src/assets/alfresco.service.mock.ts b/ng2-components/ng2-alfresco-documentlist/src/assets/alfresco.service.mock.ts
index 5a37ff8720..dbeae24ba2 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/assets/alfresco.service.mock.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/assets/alfresco.service.mock.ts
@@ -22,7 +22,7 @@ import {
     AlfrescoSettingsService,
     AlfrescoAuthenticationService,
     AlfrescoContentService
-} from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+} from 'ng2-alfresco-core';
 
 export class AlfrescoServiceMock extends AlfrescoService {
 
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
index b891823bd4..7bce23bf29 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
@@ -28,7 +28,7 @@ import {
 } from '@angular/core';
 import { DatePipe } from '@angular/common';
 import { Subject } from 'rxjs/Rx';
-import { CONTEXT_MENU_DIRECTIVES } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+import { CONTEXT_MENU_DIRECTIVES } from 'ng2-alfresco-core';
 import { AlfrescoService } from './../services/alfresco.service';
 import { MinimalNodeEntity, NodePaging } from './../models/document-library.model';
 import { ContentActionModel } from './../models/content-action.model';
diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/alfresco.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/alfresco.service.ts
index fca22e0f24..fd7d77142b 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/services/alfresco.service.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/services/alfresco.service.ts
@@ -23,7 +23,7 @@ import {
     AlfrescoSettingsService,
     AlfrescoAuthenticationService,
     AlfrescoContentService
-} from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+} from 'ng2-alfresco-core';
 
 declare let AlfrescoApi: any;
 
diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts
index 6f11303c3f..eb30d1bd69 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts
@@ -20,7 +20,7 @@ import {ContentActionHandler} from '../models/content-action.model';
 import {AlfrescoService} from './alfresco.service';
 import {
     AlfrescoContentService
-} from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+} from 'ng2-alfresco-core';
 
 @Injectable()
 export class DocumentActionsService {
diff --git a/ng2-components/ng2-alfresco-login/.gitignore b/ng2-components/ng2-alfresco-login/.gitignore
index cc337ca43d..13324e66b9 100644
--- a/ng2-components/ng2-alfresco-login/.gitignore
+++ b/ng2-components/ng2-alfresco-login/.gitignore
@@ -1,6 +1,5 @@
 npm-debug.log
 node_modules
-jspm_packages
 .idea
 typings
 coverage
@@ -11,6 +10,6 @@ src/**/*.d.ts
 demo/**/*.js
 demo/**/*.js.map
 demo/**/*.d.ts
-ng2-alfresco-login.js
-ng2-alfresco-login.js.map
+index.js
+index.js.map
 !systemjs.config.js
diff --git a/ng2-components/ng2-alfresco-login/demo/src/main.ts b/ng2-components/ng2-alfresco-login/demo/src/main.ts
index ede3a22404..2fe6b0a639 100644
--- a/ng2-components/ng2-alfresco-login/demo/src/main.ts
+++ b/ng2-components/ng2-alfresco-login/demo/src/main.ts
@@ -23,13 +23,13 @@ import {
     ROUTER_PROVIDERS,
     ROUTER_DIRECTIVES
 } from '@angular/router-deprecated';
-import { AlfrescoLoginComponent } from 'ng2-alfresco-login/dist/ng2-alfresco-login';
+import { AlfrescoLoginComponent } from 'ng2-alfresco-login';
 import { HTTP_PROVIDERS } from '@angular/http';
 import {
     ALFRESCO_CORE_PROVIDERS,
     AlfrescoSettingsService,
     AlfrescoAuthenticationService
-} from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+} from 'ng2-alfresco-core';
 
 
 @RouteConfig([
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-login/ng2-alfresco-login.ts b/ng2-components/ng2-alfresco-login/index.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-login/ng2-alfresco-login.ts
rename to ng2-components/ng2-alfresco-login/index.ts
diff --git a/ng2-components/ng2-alfresco-login/karma-test-shim.js b/ng2-components/ng2-alfresco-login/karma-test-shim.js
index 0e75b01bf5..13d8a57324 100644
--- a/ng2-components/ng2-alfresco-login/karma-test-shim.js
+++ b/ng2-components/ng2-alfresco-login/karma-test-shim.js
@@ -9,14 +9,14 @@ var map = {
     'app': 'base/dist',
     'rxjs': 'base/node_modules/rxjs',
     '@angular': 'base/node_modules/@angular',
-    'ng2-alfresco-core/dist': '/base/node_modules/ng2-alfresco-core/dist',
+    'ng2-alfresco-core': '/base/node_modules/ng2-alfresco-core/dist',
     'ng2-translate' : '/base/node_modules/ng2-translate'
 };
 
 var packages = {
     'app': { main: 'main.js',  defaultExtension: 'js' },
     'rxjs': { defaultExtension: 'js' },
-    'ng2-alfresco-core/dist': { defaultExtension: 'js' },
+    'ng2-alfresco-core': { main: 'index.js', defaultExtension: 'js' },
     'ng2-translate': { defaultExtension: 'js' }
 };
 
diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json
index ecad394254..b6ecac674c 100644
--- a/ng2-components/ng2-alfresco-login/package.json
+++ b/ng2-components/ng2-alfresco-login/package.json
@@ -30,6 +30,8 @@
     "coverage": "npm run test && http-server -c-1 -o -p 9875 ./coverage/report",
     "prepublish": "npm run build"
   },
+  "main": "./dist/index.js",
+  "typings": "./dist/index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/Alfresco/dev-platform-webcomponents.git"
diff --git a/ng2-components/ng2-alfresco-login/src/assets/authentication.service.mock.ts b/ng2-components/ng2-alfresco-login/src/assets/authentication.service.mock.ts
index 3b914091c1..4e261ad646 100644
--- a/ng2-components/ng2-alfresco-login/src/assets/authentication.service.mock.ts
+++ b/ng2-components/ng2-alfresco-login/src/assets/authentication.service.mock.ts
@@ -17,7 +17,7 @@
 
 import { Observable } from 'rxjs/Rx';
 import { provide } from '@angular/core';
-import { AlfrescoAuthenticationService } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+import { AlfrescoAuthenticationService } from 'ng2-alfresco-core';
 
 export class AuthenticationMock {
 
diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
index d6a1757378..8dd91e1e99 100644
--- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
@@ -22,7 +22,7 @@ import {
     AlfrescoTranslationService,
     AlfrescoPipeTranslate,
     AlfrescoAuthenticationService
-} from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+} from 'ng2-alfresco-core';
 
 declare let componentHandler: any;
 declare let __moduleName: string;
diff --git a/ng2-components/ng2-alfresco-search/.gitignore b/ng2-components/ng2-alfresco-search/.gitignore
index 121768e216..787032431d 100644
--- a/ng2-components/ng2-alfresco-search/.gitignore
+++ b/ng2-components/ng2-alfresco-search/.gitignore
@@ -6,6 +6,6 @@ coverage/
 dist/
 src/**/*.js
 src/**/*.js.map
-ng2-alfresco-search.js
-ng2-alfresco-search.js.map
+index.js
+index.js.map
 !systemjs.config.js
diff --git a/ng2-components/ng2-alfresco-search/demo/src/main.ts b/ng2-components/ng2-alfresco-search/demo/src/main.ts
index 473d9eb407..4386921fac 100644
--- a/ng2-components/ng2-alfresco-search/demo/src/main.ts
+++ b/ng2-components/ng2-alfresco-search/demo/src/main.ts
@@ -25,13 +25,13 @@ import {
     AlfrescoAuthenticationService,
     AlfrescoPipeTranslate,
     AlfrescoTranslationService
-} from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+} from 'ng2-alfresco-core';
 
 import {
     ALFRESCO_SEARCH_PROVIDERS,
     ALFRESCO_SEARCH_DIRECTIVES,
     AlfrescoService
-} from 'ng2-alfresco-search/dist/ng2-alfresco-search';
+} from 'ng2-alfresco-search';
 
 @Component({
     selector: 'alfresco-search-demo',
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-search/ng2-alfresco-search.ts b/ng2-components/ng2-alfresco-search/index.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-search/ng2-alfresco-search.ts
rename to ng2-components/ng2-alfresco-search/index.ts
diff --git a/ng2-components/ng2-alfresco-search/src/assets/alfresco.service.mock.ts b/ng2-components/ng2-alfresco-search/src/assets/alfresco.service.mock.ts
index d7fd69df36..3ddef936fd 100644
--- a/ng2-components/ng2-alfresco-search/src/assets/alfresco.service.mock.ts
+++ b/ng2-components/ng2-alfresco-search/src/assets/alfresco.service.mock.ts
@@ -21,7 +21,7 @@ import {
     AlfrescoSettingsService,
     AlfrescoAuthenticationService,
     AlfrescoContentService
-} from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+} from 'ng2-alfresco-core';
 import {AlfrescoService} from './../../src/services/alfresco.service';
 
 export class AlfrescoServiceMock extends AlfrescoService {
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts
index c95f98cb97..9bf364f96c 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts
+++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts
@@ -26,7 +26,7 @@ import {
 } from '@angular/core';
 import { AlfrescoService } from './../services/alfresco.service';
 
-import { AlfrescoPipeTranslate, AlfrescoTranslationService } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+import { AlfrescoPipeTranslate, AlfrescoTranslationService } from 'ng2-alfresco-core';
 
 declare let __moduleName: string;
 
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts
index 94d6dbd5e9..d10e959a05 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts
+++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts
@@ -18,7 +18,7 @@
 import { Control, Validators } from '@angular/common';
 import { Component, Input, Output, EventEmitter, AfterViewInit } from '@angular/core';
 
-import { AlfrescoPipeTranslate, AlfrescoTranslationService } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+import { AlfrescoPipeTranslate, AlfrescoTranslationService } from 'ng2-alfresco-core';
 
 import { AlfrescoSearchAutocompleteComponent } from './alfresco-search-autocomplete.component';
 
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts
index 6e0626ac49..9c83e74058 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts
+++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts
@@ -19,7 +19,7 @@ import { Component, Input, Optional, OnChanges, OnInit } from '@angular/core';
 import { RouteParams } from '@angular/router-deprecated';
 import { AlfrescoService } from './../services/alfresco.service';
 
-import { AlfrescoPipeTranslate, AlfrescoTranslationService } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+import { AlfrescoPipeTranslate, AlfrescoTranslationService } from 'ng2-alfresco-core';
 
 declare let __moduleName: string;
 
diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco.service.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco.service.ts
index bf63091c0b..72752faab1 100644
--- a/ng2-components/ng2-alfresco-search/src/services/alfresco.service.ts
+++ b/ng2-components/ng2-alfresco-search/src/services/alfresco.service.ts
@@ -22,7 +22,7 @@ import {
     AlfrescoSettingsService,
     AlfrescoAuthenticationService,
     AlfrescoContentService
-} from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+} from 'ng2-alfresco-core';
 
 declare let AlfrescoApi: any;
 
diff --git a/ng2-components/ng2-alfresco-upload/.gitignore b/ng2-components/ng2-alfresco-upload/.gitignore
index bd34a24709..13324e66b9 100644
--- a/ng2-components/ng2-alfresco-upload/.gitignore
+++ b/ng2-components/ng2-alfresco-upload/.gitignore
@@ -1,6 +1,5 @@
 npm-debug.log
 node_modules
-jspm_packages
 .idea
 typings
 coverage
@@ -11,6 +10,6 @@ src/**/*.d.ts
 demo/**/*.js
 demo/**/*.js.map
 demo/**/*.d.ts
-ng2-alfresco-upload.js
-ng2-alfresco-upload.js.map
+index.js
+index.js.map
 !systemjs.config.js
diff --git a/ng2-components/ng2-alfresco-upload/demo/src/main.ts b/ng2-components/ng2-alfresco-upload/demo/src/main.ts
index 99a6327dd2..e9eb0f2ef5 100644
--- a/ng2-components/ng2-alfresco-upload/demo/src/main.ts
+++ b/ng2-components/ng2-alfresco-upload/demo/src/main.ts
@@ -22,8 +22,8 @@ import {
     ALFRESCO_CORE_PROVIDERS,
     AlfrescoSettingsService,
     AlfrescoAuthenticationService
-} from 'ng2-alfresco-core/dist/ng2-alfresco-core';
-import { ALFRESCO_ULPOAD_COMPONENTS, UploadService } from 'ng2-alfresco-upload/dist/ng2-alfresco-upload';
+} from 'ng2-alfresco-core';
+import { ALFRESCO_ULPOAD_COMPONENTS, UploadService } from 'ng2-alfresco-upload';
 
 
 @Component({
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-upload/ng2-alfresco-upload.ts b/ng2-components/ng2-alfresco-upload/index.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-upload/ng2-alfresco-upload.ts
rename to ng2-components/ng2-alfresco-upload/index.ts
diff --git a/ng2-components/ng2-alfresco-upload/karma-test-shim.js b/ng2-components/ng2-alfresco-upload/karma-test-shim.js
index 0e75b01bf5..13d8a57324 100644
--- a/ng2-components/ng2-alfresco-upload/karma-test-shim.js
+++ b/ng2-components/ng2-alfresco-upload/karma-test-shim.js
@@ -9,14 +9,14 @@ var map = {
     'app': 'base/dist',
     'rxjs': 'base/node_modules/rxjs',
     '@angular': 'base/node_modules/@angular',
-    'ng2-alfresco-core/dist': '/base/node_modules/ng2-alfresco-core/dist',
+    'ng2-alfresco-core': '/base/node_modules/ng2-alfresco-core/dist',
     'ng2-translate' : '/base/node_modules/ng2-translate'
 };
 
 var packages = {
     'app': { main: 'main.js',  defaultExtension: 'js' },
     'rxjs': { defaultExtension: 'js' },
-    'ng2-alfresco-core/dist': { defaultExtension: 'js' },
+    'ng2-alfresco-core': { main: 'index.js', defaultExtension: 'js' },
     'ng2-translate': { defaultExtension: 'js' }
 };
 
diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json
index 03b843a18a..a6e9d68ccf 100644
--- a/ng2-components/ng2-alfresco-upload/package.json
+++ b/ng2-components/ng2-alfresco-upload/package.json
@@ -28,6 +28,8 @@
     "coverage": "npm run test && http-server -c-1 -o -p 9875 ./coverage/report",
     "prepublish": "npm run build"
   },
+  "main": "./dist/index.js",
+  "typings": "./dist/index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/Alfresco/dev-platform-webcomponents.git"
diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts
index 7949ed91a6..92535da31a 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts
@@ -24,7 +24,7 @@ import {
 import { provide } from '@angular/core';
 import { FileUploadingDialogComponent } from './file-uploading-dialog.component';
 import { FileModel } from '../models/file.model';
-import { AlfrescoTranslationService } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { TranslationMock } from '../assets/translation.service.mock';
 
 describe('FileUploadDialog', () => {
diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts
index ef251bcd0c..8fb22dcb28 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts
@@ -18,7 +18,7 @@
 import { Component, ChangeDetectorRef, OnInit } from '@angular/core';
 import { FileModel } from '../models/file.model';
 import { FileUploadingListComponent } from './file-uploading-list.component';
-import { AlfrescoTranslationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+import { AlfrescoTranslationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core';
 import { UploadService } from '../services/upload.service';
 
 declare let __moduleName: string;
diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts
index e53a100ea0..bc023f5eb8 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts
@@ -18,7 +18,7 @@
 
 import { Component, ElementRef, Input } from '@angular/core';
 import { FileModel } from '../models/file.model';
-import { AlfrescoPipeTranslate } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+import { AlfrescoPipeTranslate } from 'ng2-alfresco-core';
 
 declare let __moduleName: string;
 
diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts
index 09f2a85b9f..b78c52f559 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts
@@ -19,7 +19,7 @@ import { describe, expect, it, inject, beforeEachProviders } from '@angular/core
 import { TestComponentBuilder } from '@angular/compiler/testing';
 import { provide } from '@angular/core';
 import { UploadButtonComponent } from './upload-button.component';
-import { AlfrescoTranslationService } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { TranslationMock } from '../assets/translation.service.mock';
 import { UploadServiceMock } from '../assets/upload.service.mock';
 import { UploadService } from '../services/upload.service';
diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts
index 5ac07ddde3..6d8378129e 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts
@@ -19,7 +19,7 @@
 import { Component, ViewChild, ElementRef, Input, Output, EventEmitter } from '@angular/core';
 import { UploadService } from '../services/upload.service';
 import { FileModel } from '../models/file.model';
-import { AlfrescoTranslationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+import { AlfrescoTranslationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core';
 import 'rxjs/Rx';
 
 declare let componentHandler: any;
diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts
index 548fff22c9..9e2ab0728d 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts
@@ -18,7 +18,7 @@
 import { Component, ViewChild, Input, Output, EventEmitter } from '@angular/core';
 import { UploadService } from '../services/upload.service';
 import { FileDraggableDirective } from '../directives/file-draggable.directive';
-import { AlfrescoTranslationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+import { AlfrescoTranslationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core';
 import { FileModel } from '../models/file.model';
 
 declare let __moduleName: string;
diff --git a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts
index 099343fc24..b88c314a33 100644
--- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts
+++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts
@@ -20,7 +20,7 @@ import { EventEmitter, Injectable } from '@angular/core';
 import { Response } from '@angular/http';
 import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
-import { AlfrescoSettingsService } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+import { AlfrescoSettingsService } from 'ng2-alfresco-core';
 import { FileModel } from '../models/file.model';
 
 declare let AlfrescoApi: any;
diff --git a/ng2-components/ng2-alfresco-viewer/demo/src/main.ts b/ng2-components/ng2-alfresco-viewer/demo/src/main.ts
index 79f17bf715..f7ad64f64a 100644
--- a/ng2-components/ng2-alfresco-viewer/demo/src/main.ts
+++ b/ng2-components/ng2-alfresco-viewer/demo/src/main.ts
@@ -17,7 +17,7 @@
 
 import { Component } from '@angular/core';
 import { bootstrap } from '@angular/platform-browser-dynamic';
-import { VIEWERCOMPONENT } from 'ng2-alfresco-viewer/dist/ng2-alfresco-viewer';
+import { VIEWERCOMPONENT } from 'ng2-alfresco-viewer';
 
 @Component({
     selector: 'my-app',
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',
diff --git a/ng2-components/ng2-alfresco-viewer/ng2-alfresco-viewer.ts b/ng2-components/ng2-alfresco-viewer/index.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-viewer/ng2-alfresco-viewer.ts
rename to ng2-components/ng2-alfresco-viewer/index.ts
diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json
index 863031c1f5..e75bad13b2 100644
--- a/ng2-components/ng2-alfresco-viewer/package.json
+++ b/ng2-components/ng2-alfresco-viewer/package.json
@@ -29,6 +29,8 @@
     "coverage": "npm run test && http-server -c-1 -o -p 9875 ./coverage/report",
     "prepublish": "npm run build"
   },
+  "main": "./dist/index.js",
+  "typings": "./dist/index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/alfresco/ng2-alfresco-viewer.git"