diff --git a/ng2-components/ng2-alfresco-login/ng2-alfresco-login.ts b/ng2-components/ng2-alfresco-login/ng2-alfresco-login.ts
index 7bb9944efa..da45908916 100644
--- a/ng2-components/ng2-alfresco-login/ng2-alfresco-login.ts
+++ b/ng2-components/ng2-alfresco-login/ng2-alfresco-login.ts
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-import { AlfrescoLoginComponent } from './src/components/alfresco-login';
-import { AlfrescoAuthenticationService } from './src/services/alfresco-authentication';
+import { AlfrescoLoginComponent } from './src/components/alfresco-login.component';
+import { AlfrescoAuthenticationService } from './src/services/alfresco-authentication.service';
 
-export * from './src/components/alfresco-login';
-export * from './src/services/alfresco-authentication';
+export * from './src/components/alfresco-login.component';
+export * from './src/services/alfresco-authentication.service';
 
 export default {
     directives: [AlfrescoLoginComponent],
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 6a9cd41102..26ad202112 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
@@ -18,7 +18,7 @@
 import { Observable } from 'rxjs/Observable';
 import { provide } from 'angular2/core';
 
-import { AlfrescoAuthenticationService } from '../../src/services/alfresco-authentication';
+import { AlfrescoAuthenticationService } from './../services/alfresco-authentication.service';
 
 export class AuthenticationMock {
 
diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts
index d421b857ae..414e583f3a 100644
--- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts
@@ -32,9 +32,9 @@ import { Location, Router, RouteRegistry, ROUTER_PRIMARY_COMPONENT, Route } from
 import { RootRouter } from 'angular2/src/router/router';
 import { SpyLocation } from 'angular2/src/mock/location_mock';
 import { TranslateService } from 'ng2-translate/ng2-translate';
-import { AlfrescoLoginComponent } from './components/alfresco-login.component';
-import { AuthenticationMock } from '../assets/authentication.service.mock';
-import { TranslationMock } from '../assets/translation.service.mock';
+import { AlfrescoLoginComponent } from './alfresco-login.component';
+import { AuthenticationMock } from './../assets/authentication.service.mock';
+import { TranslationMock } from './../assets/translation.service.mock';
 
 describe('AlfrescoLogin', () => {
   let authService, location, router;
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 7c8dc83645..14eff08af3 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
@@ -18,7 +18,7 @@
 import { Component, Output, EventEmitter } from 'angular2/core';
 import { Router, ROUTER_DIRECTIVES } from 'angular2/router';
 import { FORM_DIRECTIVES, ControlGroup, FormBuilder, Validators } from 'angular2/common';
-import { AlfrescoAuthenticationService } from '../services/alfresco-authentication';
+import { AlfrescoAuthenticationService } from './../services/alfresco-authentication.service';
 import { TranslateService, TranslatePipe } from 'ng2-translate/ng2-translate';
 declare let componentHandler;
 declare let __moduleName: string;
diff --git a/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.spec.ts b/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.service.spec.ts
similarity index 97%
rename from ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.spec.ts
rename to ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.service.spec.ts
index 4b5edcef32..d64fa309da 100644
--- a/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.spec.ts
+++ b/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.service.spec.ts
@@ -19,7 +19,7 @@ import { it, describe } from 'angular2/testing';
 import { provide, Injector } from 'angular2/core';
 import { Http, HTTP_PROVIDERS, XHRBackend, Response, ResponseOptions } from 'angular2/http';
 import { MockBackend } from 'angular2/http/testing';
-import { AlfrescoAuthenticationService } from '../../src/services/alfresco-authentication';
+import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
 
 
 describe('AlfrescoAuthentication', () => {
diff --git a/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.ts b/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.service.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.ts
rename to ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.service.ts