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/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 2d30d2e237..2fe6b0a639 100644
--- a/ng2-components/ng2-alfresco-login/demo/src/main.ts
+++ b/ng2-components/ng2-alfresco-login/demo/src/main.ts
@@ -23,7 +23,7 @@ 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,
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/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"