diff --git a/ng2-components/ng2-alfresco-login/ng2-alfresco-login.d.ts b/ng2-components/ng2-alfresco-login/ng2-alfresco-login.d.ts
index 71a526410f..f733fd5ba2 100644
--- a/ng2-components/ng2-alfresco-login/ng2-alfresco-login.d.ts
+++ b/ng2-components/ng2-alfresco-login/ng2-alfresco-login.d.ts
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { AlfrescoLoginComponent } from './src/alfresco-login.component';
-import { AlfrescoAuthenticationService } from './src/alfresco-authentication.service';
-export * from './src/alfresco-login.component';
-export * from './src/alfresco-authentication.service';
+import { AlfrescoLoginComponent } from './src/components/alfresco-login';
+import { AlfrescoAuthenticationService } from './src/services/alfresco-authentication';
+export * from './src/components/alfresco-login';
+export * from './src/services/alfresco-authentication';
 declare var _default: {
     directives: typeof AlfrescoLoginComponent[];
     providers: typeof AlfrescoAuthenticationService[];
diff --git a/ng2-components/ng2-alfresco-login/ng2-alfresco-login.js b/ng2-components/ng2-alfresco-login/ng2-alfresco-login.js
index c87a5b6920..48473eb095 100644
--- a/ng2-components/ng2-alfresco-login/ng2-alfresco-login.js
+++ b/ng2-components/ng2-alfresco-login/ng2-alfresco-login.js
@@ -1,7 +1,7 @@
-System.register(['./src/alfresco-login.component', './src/alfresco-authentication.service'], function(exports_1, context_1) {
+System.register(['./src/components/alfresco-login', './src/services/alfresco-authentication'], function(exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var alfresco_login_component_1, alfresco_authentication_service_1;
+    var alfresco_login_1, alfresco_authentication_1;
     var ALFRESCO_LOGIN_DIRECTIVES, ALFRESCO_AUTHENTICATION;
     var exportedNames_1 = {
         'ALFRESCO_LOGIN_DIRECTIVES': true,
@@ -16,21 +16,21 @@ System.register(['./src/alfresco-login.component', './src/alfresco-authenticatio
     }
     return {
         setters:[
-            function (alfresco_login_component_1_1) {
-                alfresco_login_component_1 = alfresco_login_component_1_1;
-                exportStar_1(alfresco_login_component_1_1);
+            function (alfresco_login_1_1) {
+                alfresco_login_1 = alfresco_login_1_1;
+                exportStar_1(alfresco_login_1_1);
             },
-            function (alfresco_authentication_service_1_1) {
-                alfresco_authentication_service_1 = alfresco_authentication_service_1_1;
-                exportStar_1(alfresco_authentication_service_1_1);
+            function (alfresco_authentication_1_1) {
+                alfresco_authentication_1 = alfresco_authentication_1_1;
+                exportStar_1(alfresco_authentication_1_1);
             }],
         execute: function() {
             exports_1("default",{
-                directives: [alfresco_login_component_1.AlfrescoLoginComponent],
-                providers: [alfresco_authentication_service_1.AlfrescoAuthenticationService]
+                directives: [alfresco_login_1.AlfrescoLoginComponent],
+                providers: [alfresco_authentication_1.AlfrescoAuthenticationService]
             });
-            exports_1("ALFRESCO_LOGIN_DIRECTIVES", ALFRESCO_LOGIN_DIRECTIVES = [alfresco_login_component_1.AlfrescoLoginComponent]);
-            exports_1("ALFRESCO_AUTHENTICATION", ALFRESCO_AUTHENTICATION = [alfresco_authentication_service_1.AlfrescoAuthenticationService]);
+            exports_1("ALFRESCO_LOGIN_DIRECTIVES", ALFRESCO_LOGIN_DIRECTIVES = [alfresco_login_1.AlfrescoLoginComponent]);
+            exports_1("ALFRESCO_AUTHENTICATION", ALFRESCO_AUTHENTICATION = [alfresco_authentication_1.AlfrescoAuthenticationService]);
         }
     }
 });
diff --git a/ng2-components/ng2-alfresco-login/ng2-alfresco-login.js.map b/ng2-components/ng2-alfresco-login/ng2-alfresco-login.js.map
index a99b750ffb..c35d46677d 100644
--- a/ng2-components/ng2-alfresco-login/ng2-alfresco-login.js.map
+++ b/ng2-components/ng2-alfresco-login/ng2-alfresco-login.js.map
@@ -1 +1 @@
-{"version":3,"file":"ng2-alfresco-login.js","sourceRoot":"","sources":["ng2-alfresco-login.ts"],"names":[],"mappings":";;;;QA2Ba,yBAAyB,EACzB,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;YANpC,oBAAe;gBACX,UAAU,EAAE,CAAC,iDAAsB,CAAC;gBACpC,SAAS,EAAE,CAAC,+DAA6B,CAAC;aAC7C,EAAA;YAEY,uCAAA,yBAAyB,GAAU,CAAC,iDAAsB,CAAC,CAAA,CAAC;YAC5D,qCAAA,uBAAuB,GAAU,CAAC,+DAA6B,CAAC,CAAA,CAAC"}
\ No newline at end of file
+{"version":3,"file":"ng2-alfresco-login.js","sourceRoot":"","sources":["ng2-alfresco-login.ts"],"names":[],"mappings":";;;;QA2Ba,yBAAyB,EACzB,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;YANpC,oBAAe;gBACX,UAAU,EAAE,CAAC,uCAAsB,CAAC;gBACpC,SAAS,EAAE,CAAC,uDAA6B,CAAC;aAC7C,EAAA;YAEY,uCAAA,yBAAyB,GAAU,CAAC,uCAAsB,CAAC,CAAA,CAAC;YAC5D,qCAAA,uBAAuB,GAAU,CAAC,uDAA6B,CAAC,CAAA,CAAC"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-login/ng2-alfresco-login.ts b/ng2-components/ng2-alfresco-login/ng2-alfresco-login.ts
index 17f24b5e84..07932a4a3c 100644
--- a/ng2-components/ng2-alfresco-login/ng2-alfresco-login.ts
+++ b/ng2-components/ng2-alfresco-login/ng2-alfresco-login.ts
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {AlfrescoLoginComponent} from './src/alfresco-login.component';
-import {AlfrescoAuthenticationService} from './src/alfresco-authentication.service';
+import {AlfrescoLoginComponent} from './src/components/alfresco-login';
+import {AlfrescoAuthenticationService} from './src/services/alfresco-authentication';
 
-export * from './src/alfresco-login.component';
-export * from './src/alfresco-authentication.service';
+export * from './src/components/alfresco-login';
+export * from './src/services/alfresco-authentication';
 
 export default {
     directives: [AlfrescoLoginComponent],
diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.js.map b/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.js.map
deleted file mode 100644
index cc903b36c5..0000000000
--- a/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"alfresco-authentication.service.js","sourceRoot":"","sources":["alfresco-authentication.service.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.spec.js.map b/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.spec.js.map
deleted file mode 100644
index 82226fe649..0000000000
--- a/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.spec.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"alfresco-authentication.service.spec.js","sourceRoot":"","sources":["alfresco-authentication.service.spec.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.js.map b/ng2-components/ng2-alfresco-login/src/alfresco-login.component.js.map
deleted file mode 100644
index bc65558493..0000000000
--- a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"alfresco-login.component.js","sourceRoot":"","sources":["alfresco-login.component.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.spec.js.map b/ng2-components/ng2-alfresco-login/src/alfresco-login.component.spec.js.map
deleted file mode 100644
index 267f42525c..0000000000
--- a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.spec.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"alfresco-login.component.spec.js","sourceRoot":"","sources":["alfresco-login.component.spec.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-login/src/authentication.service.spec.js.map b/ng2-components/ng2-alfresco-login/src/authentication.service.spec.js.map
deleted file mode 100644
index 16bbc1f485..0000000000
--- a/ng2-components/ng2-alfresco-login/src/authentication.service.spec.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"authentication.service.spec.js","sourceRoot":"","sources":["authentication.service.spec.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.css b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.css
similarity index 100%
rename from ng2-components/ng2-alfresco-login/src/alfresco-login.component.css
rename to ng2-components/ng2-alfresco-login/src/components/alfresco-login.css
diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.d.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.d.ts
similarity index 92%
rename from ng2-components/ng2-alfresco-login/src/alfresco-login.component.d.ts
rename to ng2-components/ng2-alfresco-login/src/components/alfresco-login.d.ts
index aa9e524780..cf769dd96f 100644
--- a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.d.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.d.ts
@@ -1,6 +1,6 @@
 import { Router } from 'angular2/router';
 import { ControlGroup, FormBuilder } from 'angular2/common';
-import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
+import { AlfrescoAuthenticationService } from '../services/alfresco-authentication';
 import { TranslateService } from 'ng2-translate/ng2-translate';
 export declare class AlfrescoLoginComponent {
     auth: AlfrescoAuthenticationService;
diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.html b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.html
similarity index 100%
rename from ng2-components/ng2-alfresco-login/src/alfresco-login.component.html
rename to ng2-components/ng2-alfresco-login/src/components/alfresco-login.html
diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.js b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.js
similarity index 88%
rename from ng2-components/ng2-alfresco-login/src/alfresco-login.component.js
rename to ng2-components/ng2-alfresco-login/src/components/alfresco-login.js
index a568342e00..c5f36d8d6c 100644
--- a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.js
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.js
@@ -1,4 +1,4 @@
-System.register(['angular2/core', 'angular2/router', 'angular2/common', './alfresco-authentication.service', 'ng2-translate/ng2-translate'], function(exports_1, context_1) {
+System.register(['angular2/core', 'angular2/router', 'angular2/common', '../services/alfresco-authentication', 'ng2-translate/ng2-translate'], function(exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -10,7 +10,7 @@ System.register(['angular2/core', 'angular2/router', 'angular2/common', './alfre
     var __metadata = (this && this.__metadata) || function (k, v) {
         if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
     };
-    var core_1, router_1, common_1, alfresco_authentication_service_1, ng2_translate_1;
+    var core_1, router_1, common_1, alfresco_authentication_1, ng2_translate_1;
     var AlfrescoLoginComponent;
     return {
         setters:[
@@ -23,8 +23,8 @@ System.register(['angular2/core', 'angular2/router', 'angular2/common', './alfre
             function (common_1_1) {
                 common_1 = common_1_1;
             },
-            function (alfresco_authentication_service_1_1) {
-                alfresco_authentication_service_1 = alfresco_authentication_service_1_1;
+            function (alfresco_authentication_1_1) {
+                alfresco_authentication_1 = alfresco_authentication_1_1;
             },
             function (ng2_translate_1_1) {
                 ng2_translate_1 = ng2_translate_1_1;
@@ -110,11 +110,11 @@ System.register(['angular2/core', 'angular2/router', 'angular2/common', './alfre
                         selector: 'alfresco-login',
                         moduleId: __moduleName,
                         directives: [router_1.ROUTER_DIRECTIVES, common_1.FORM_DIRECTIVES],
-                        templateUrl: './alfresco-login.component.html',
-                        styleUrls: ['./alfresco-login.component.css'],
+                        templateUrl: './alfresco-login.html',
+                        styleUrls: ['./alfresco-login.css'],
                         pipes: [ng2_translate_1.TranslatePipe]
                     }), 
-                    __metadata('design:paramtypes', [common_1.FormBuilder, alfresco_authentication_service_1.AlfrescoAuthenticationService, router_1.Router, ng2_translate_1.TranslateService])
+                    __metadata('design:paramtypes', [common_1.FormBuilder, alfresco_authentication_1.AlfrescoAuthenticationService, router_1.Router, ng2_translate_1.TranslateService])
                 ], AlfrescoLoginComponent);
                 return AlfrescoLoginComponent;
             }());
@@ -122,4 +122,4 @@ System.register(['angular2/core', 'angular2/router', 'angular2/common', './alfre
         }
     }
 });
-//# sourceMappingURL=alfresco-login.component.js.map
\ No newline at end of file
+//# sourceMappingURL=alfresco-login.js.map
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.js.map b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.js.map
new file mode 100644
index 0000000000..c7b5ff870e
--- /dev/null
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"alfresco-login.js","sourceRoot":"","sources":["alfresco-login.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.spec.d.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.spec.d.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.spec.d.ts
rename to ng2-components/ng2-alfresco-login/src/components/alfresco-login.spec.d.ts
diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.spec.js b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.spec.js
similarity index 85%
rename from ng2-components/ng2-alfresco-login/src/alfresco-login.component.spec.js
rename to ng2-components/ng2-alfresco-login/src/components/alfresco-login.spec.js
index fdd941eb59..661dd52a56 100644
--- a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.spec.js
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.spec.js
@@ -1,7 +1,7 @@
-System.register(['angular2/platform/testing/browser', 'angular2/testing', 'angular2/core', './alfresco-login.component', 'rxjs/Rx', './alfresco-authentication.service', 'angular2/src/router/router', 'angular2/router', 'angular2/src/mock/location_mock', 'ng2-translate/ng2-translate'], function(exports_1, context_1) {
+System.register(['angular2/platform/testing/browser', 'angular2/testing', 'angular2/core', './alfresco-login', 'rxjs/Rx', '../services/alfresco-authentication', 'angular2/src/router/router', 'angular2/router', 'angular2/src/mock/location_mock', 'ng2-translate/ng2-translate'], function(exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var browser_1, testing_1, core_1, alfresco_login_component_1, Rx_1, alfresco_authentication_service_1, router_1, router_2, location_mock_1, ng2_translate_1;
+    var browser_1, testing_1, core_1, alfresco_login_1, Rx_1, alfresco_authentication_1, router_1, router_2, location_mock_1, ng2_translate_1;
     var AuthenticationMock, TranslationMock;
     return {
         setters:[
@@ -14,14 +14,14 @@ System.register(['angular2/platform/testing/browser', 'angular2/testing', 'angul
             function (core_1_1) {
                 core_1 = core_1_1;
             },
-            function (alfresco_login_component_1_1) {
-                alfresco_login_component_1 = alfresco_login_component_1_1;
+            function (alfresco_login_1_1) {
+                alfresco_login_1 = alfresco_login_1_1;
             },
             function (Rx_1_1) {
                 Rx_1 = Rx_1_1;
             },
-            function (alfresco_authentication_service_1_1) {
-                alfresco_authentication_service_1 = alfresco_authentication_service_1_1;
+            function (alfresco_authentication_1_1) {
+                alfresco_authentication_1 = alfresco_authentication_1_1;
             },
             function (router_1_1) {
                 router_1 = router_1_1;
@@ -49,7 +49,7 @@ System.register(['angular2/platform/testing/browser', 'angular2/testing', 'angul
                     }
                 };
                 AuthenticationMock.prototype.getProviders = function () {
-                    return [core_1.provide(alfresco_authentication_service_1.AlfrescoAuthenticationService, { useValue: this })];
+                    return [core_1.provide(alfresco_authentication_1.AlfrescoAuthenticationService, { useValue: this })];
                 };
                 return AuthenticationMock;
             }());
@@ -71,7 +71,7 @@ System.register(['angular2/platform/testing/browser', 'angular2/testing', 'angul
                         authService.getProviders(),
                         router_2.RouteRegistry,
                         core_1.provide(router_2.Location, { useClass: location_mock_1.SpyLocation }),
-                        core_1.provide(router_2.ROUTER_PRIMARY_COMPONENT, { useValue: alfresco_login_component_1.AlfrescoLoginComponent }),
+                        core_1.provide(router_2.ROUTER_PRIMARY_COMPONENT, { useValue: alfresco_login_1.AlfrescoLoginComponent }),
                         core_1.provide(router_2.Router, { useClass: router_1.RootRouter }),
                         core_1.provide(ng2_translate_1.TranslateService, { useClass: TranslationMock })
                     ];
@@ -82,7 +82,7 @@ System.register(['angular2/platform/testing/browser', 'angular2/testing', 'angul
                 }));
                 testing_1.it('should render `Login` form with input fields user and password with default value', testing_1.injectAsync([testing_1.TestComponentBuilder], function (tcb) {
                     return tcb
-                        .createAsync(alfresco_login_component_1.AlfrescoLoginComponent)
+                        .createAsync(alfresco_login_1.AlfrescoLoginComponent)
                         .then(function (fixture) {
                         var element = fixture.nativeElement;
                         testing_1.expect(element.querySelector('form')).toBeDefined();
@@ -94,7 +94,7 @@ System.register(['angular2/platform/testing/browser', 'angular2/testing', 'angul
                 }));
                 testing_1.it('should render the new values after change the user and password values', testing_1.injectAsync([testing_1.TestComponentBuilder], function (tcb) {
                     return tcb
-                        .createAsync(alfresco_login_component_1.AlfrescoLoginComponent)
+                        .createAsync(alfresco_login_1.AlfrescoLoginComponent)
                         .then(function (fixture) {
                         var compiled = fixture.debugElement.nativeElement;
                         var password = compiled.querySelector('input[type="password"]');
@@ -107,9 +107,9 @@ System.register(['angular2/platform/testing/browser', 'angular2/testing', 'angul
                 }));
                 testing_1.it('should navigate to Home route after the login OK ', testing_1.injectAsync([testing_1.TestComponentBuilder], function (tcb) {
                     return tcb
-                        .createAsync(alfresco_login_component_1.AlfrescoLoginComponent)
+                        .createAsync(alfresco_login_1.AlfrescoLoginComponent)
                         .then(function (fixture) {
-                        router.config([new router_2.Route({ path: '/home', name: 'Home', component: alfresco_login_component_1.AlfrescoLoginComponent })]);
+                        router.config([new router_2.Route({ path: '/home', name: 'Home', component: alfresco_login_1.AlfrescoLoginComponent })]);
                         spyOn(router, 'navigate').and.callThrough();
                         var compiled = fixture.debugElement.nativeElement;
                         var password = compiled.querySelector('input[type="password"]');
@@ -123,7 +123,7 @@ System.register(['angular2/platform/testing/browser', 'angular2/testing', 'angul
                 }));
                 testing_1.it('should return error with a wrong username ', testing_1.injectAsync([testing_1.TestComponentBuilder], function (tcb) {
                     return tcb
-                        .createAsync(alfresco_login_component_1.AlfrescoLoginComponent)
+                        .createAsync(alfresco_login_1.AlfrescoLoginComponent)
                         .then(function (fixture) {
                         spyOn(router, 'navigate').and.callThrough();
                         var compiled = fixture.debugElement.nativeElement;
@@ -137,7 +137,7 @@ System.register(['angular2/platform/testing/browser', 'angular2/testing', 'angul
                 }));
                 testing_1.it('should return error with a wrong password ', testing_1.injectAsync([testing_1.TestComponentBuilder], function (tcb) {
                     return tcb
-                        .createAsync(alfresco_login_component_1.AlfrescoLoginComponent)
+                        .createAsync(alfresco_login_1.AlfrescoLoginComponent)
                         .then(function (fixture) {
                         spyOn(router, 'navigate').and.callThrough();
                         var compiled = fixture.debugElement.nativeElement;
@@ -151,7 +151,7 @@ System.register(['angular2/platform/testing/browser', 'angular2/testing', 'angul
                 }));
                 testing_1.it('should return error with a wrong username and password ', testing_1.injectAsync([testing_1.TestComponentBuilder], function (tcb) {
                     return tcb
-                        .createAsync(alfresco_login_component_1.AlfrescoLoginComponent)
+                        .createAsync(alfresco_login_1.AlfrescoLoginComponent)
                         .then(function (fixture) {
                         spyOn(router, 'navigate').and.callThrough();
                         var compiled = fixture.debugElement.nativeElement;
@@ -167,4 +167,4 @@ System.register(['angular2/platform/testing/browser', 'angular2/testing', 'angul
         }
     }
 });
-//# sourceMappingURL=alfresco-login.component.spec.js.map
\ No newline at end of file
+//# sourceMappingURL=alfresco-login.spec.js.map
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.spec.js.map b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.spec.js.map
new file mode 100644
index 0000000000..5cac983732
--- /dev/null
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.spec.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"alfresco-login.spec.js","sourceRoot":"","sources":["alfresco-login.spec.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.spec.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.spec.ts
similarity index 98%
rename from ng2-components/ng2-alfresco-login/src/alfresco-login.component.spec.ts
rename to ng2-components/ng2-alfresco-login/src/components/alfresco-login.spec.ts
index 6ea6b4c48f..5f2442a40b 100644
--- a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.spec.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.spec.ts
@@ -17,9 +17,9 @@
 import {TEST_BROWSER_PLATFORM_PROVIDERS, TEST_BROWSER_APPLICATION_PROVIDERS} from 'angular2/platform/testing/browser';
 import {it, describe, expect, inject, injectAsync, beforeEach, beforeEachProviders, TestComponentBuilder, setBaseTestProviders} from 'angular2/testing';
 import {Component, provide, Injector} from 'angular2/core';
-import {AlfrescoLoginComponent} from './alfresco-login.component';
+import {AlfrescoLoginComponent} from './alfresco-login';
 import {Observable} from 'rxjs/Rx';
-import {AlfrescoAuthenticationService} from './alfresco-authentication.service';
+import {AlfrescoAuthenticationService} from '../services/alfresco-authentication';
 import { RootRouter } from 'angular2/src/router/router';
 import { Location, Router, RouteRegistry, ROUTER_PRIMARY_COMPONENT, Route } from 'angular2/router';
 import { SpyLocation } from 'angular2/src/mock/location_mock';
diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.ts
similarity index 94%
rename from ng2-components/ng2-alfresco-login/src/alfresco-login.component.ts
rename to ng2-components/ng2-alfresco-login/src/components/alfresco-login.ts
index dd368fe0ac..a9100cc265 100644
--- a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.ts
@@ -17,7 +17,7 @@
 import {Component, Input} from 'angular2/core';
 import {Router, ROUTER_DIRECTIVES} from 'angular2/router';
 import {FORM_DIRECTIVES, ControlGroup, FormBuilder, Validators} from 'angular2/common';
-import {AlfrescoAuthenticationService} from './alfresco-authentication.service';
+import {AlfrescoAuthenticationService} from '../services/alfresco-authentication';
 import {TranslateService, TranslatePipe} from 'ng2-translate/ng2-translate';
 declare let componentHandler;
 declare let __moduleName:string;
@@ -26,8 +26,8 @@ declare let __moduleName:string;
     selector: 'alfresco-login',
     moduleId: __moduleName,
     directives: [ROUTER_DIRECTIVES, FORM_DIRECTIVES],
-    templateUrl: './alfresco-login.component.html',
-    styleUrls: ['./alfresco-login.component.css'],
+    templateUrl: './alfresco-login.html',
+    styleUrls: ['./alfresco-login.css'],
     pipes: [TranslatePipe]
 
 })
diff --git a/ng2-components/ng2-alfresco-login/src/login.component.spec.js.map b/ng2-components/ng2-alfresco-login/src/login.component.spec.js.map
deleted file mode 100644
index d8b10c87de..0000000000
--- a/ng2-components/ng2-alfresco-login/src/login.component.spec.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"login.component.spec.js","sourceRoot":"","sources":["login.component.spec.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.d.ts b/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.d.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.d.ts
rename to ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.d.ts
diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.js b/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.js
similarity index 99%
rename from ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.js
rename to ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.js
index 74ec2f638a..8db922a640 100644
--- a/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.js
+++ b/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.js
@@ -137,4 +137,4 @@ System.register(['angular2/core', 'rxjs/Rx', 'angular2/http'], function(exports_
         }
     }
 });
-//# sourceMappingURL=alfresco-authentication.service.js.map
\ No newline at end of file
+//# sourceMappingURL=alfresco-authentication.js.map
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.js.map b/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.js.map
new file mode 100644
index 0000000000..569757b889
--- /dev/null
+++ b/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"alfresco-authentication.js","sourceRoot":"","sources":["alfresco-authentication.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;YAsBA;;eAEG;YAEH;gBAMI;;;mBAGG;gBACH,uCAAmB,IAAS;oBAAT,SAAI,GAAJ,IAAI,CAAK;oBAPpB,UAAK,GAAU,4BAA4B,CAAC;oBAC5C,aAAQ,GAAU,IAAI,CAAC,KAAK,GAAG,wBAAwB,CAAC;oBAO5D,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAC/C,CAAC;gBACD;;;mBAGG;gBACH,kDAAU,GAAV;oBACI,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAC3C,CAAC;gBAED;;;;;;mBAMG;gBACH,6CAAK,GAAL,UAAM,MAAa,EAAE,QAAe,EAAE,QAAe;oBACjD,EAAE,CAAC,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC;wBACnB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;oBAC7C,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;oBAC9C,CAAC;gBACL,CAAC;gBAED;;;;;mBAKG;gBACH,gDAAQ,GAAR,UAAS,QAAe,EAAE,QAAe;oBAAzC,iBAYC;oBAXG,IAAM,YAAY,GAAG,IAAI,sBAAe,EAAE,CAAC;oBAC3C,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;oBAChC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;oBAEjC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,OAAO,EAAE,EAAC,MAAM,EAAE,YAAY,EAAC,CAAC;yBAChE,GAAG,CAAC,UAAC,GAAO;wBACT,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;wBAClD,KAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;wBACzB,KAAI,CAAC,OAAO,CAAC,KAAI,CAAC,KAAK,CAAC,CAAC;oBAC7B,CAAC,CAAC;yBACD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACjC,CAAC;gBAED;;;;;mBAKG;gBACH,iDAAS,GAAT,UAAU,QAAe,EAAE,QAAe;oBAA1C,iBAeC;oBAdG,IAAI,WAAW,GAAG,cAAc,GAAG,QAAQ,GAAG,cAAc,GAAG,QAAQ,GAAG,IAAI,CAAC;oBAE/E,IAAI,OAAO,GAAG,IAAI,cAAO,EAAE,CAAC;oBAC5B,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;oBAEnD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,OAAO,EAAE,WAAW,EAAE;wBACxD,OAAO,EAAE,OAAO;qBACnB,CAAC;yBACG,GAAG,CAAC,UAAC,GAAO;wBACT,IAAI,QAAQ,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;wBAC1B,KAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;wBAClC,KAAI,CAAC,OAAO,CAAC,KAAI,CAAC,KAAK,CAAC,CAAC;oBAC7B,CAAC,CAAC;yBACD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACjC,CAAC;gBAED;;;mBAGG;gBACH,+CAAO,GAAP,UAAQ,GAAG;oBACP,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;wBACN,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;oBACvC,CAAC;gBACL,CAAC;gBAED;;;mBAGG;gBACH,8CAAM,GAAN;oBACI,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;oBACvB,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;oBAEjC,MAAM,CAAC,eAAU,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;gBAC/B,CAAC;gBAED;;;;mBAIG;gBACK,mDAAW,GAAnB,UAAoB,KAAc;oBAC9B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACrB,MAAM,CAAC,eAAU,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,cAAc,CAAC,CAAC;gBAClE,CAAC;gBA7GL;oBAAC,iBAAU,EAAE;;iDAAA;gBA8Gb,oCAAC;YAAD,CAAC,AA7GD,IA6GC;YA7GD,yEA6GC,CAAA"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.spec.d.ts b/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.spec.d.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-login/src/alfresco-login.component.spec.d.ts
rename to ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.spec.d.ts
diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.spec.js b/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.spec.js
similarity index 90%
rename from ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.spec.js
rename to ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.spec.js
index 1d8538af9f..153f0dfd7a 100644
--- a/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.spec.js
+++ b/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.spec.js
@@ -1,7 +1,7 @@
-System.register(['angular2/testing', 'angular2/core', 'angular2/http', 'angular2/http/testing', './alfresco-authentication.service'], function(exports_1, context_1) {
+System.register(['angular2/testing', 'angular2/core', 'angular2/http', 'angular2/http/testing', './alfresco-authentication'], function(exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var testing_1, core_1, http_1, testing_2, alfresco_authentication_service_1;
+    var testing_1, core_1, http_1, testing_2, alfresco_authentication_1;
     return {
         setters:[
             function (testing_1_1) {
@@ -16,8 +16,8 @@ System.register(['angular2/testing', 'angular2/core', 'angular2/http', 'angular2
             function (testing_2_1) {
                 testing_2 = testing_2_1;
             },
-            function (alfresco_authentication_service_1_1) {
-                alfresco_authentication_service_1 = alfresco_authentication_service_1_1;
+            function (alfresco_authentication_1_1) {
+                alfresco_authentication_1 = alfresco_authentication_1_1;
             }],
         execute: function() {
             testing_1.describe('AlfrescoAuthentication', function () {
@@ -27,7 +27,7 @@ System.register(['angular2/testing', 'angular2/core', 'angular2/http', 'angular2
                         http_1.HTTP_PROVIDERS,
                         testing_2.MockBackend,
                         core_1.provide(http_1.XHRBackend, { useClass: testing_2.MockBackend }),
-                        alfresco_authentication_service_1.AlfrescoAuthenticationService
+                        alfresco_authentication_1.AlfrescoAuthenticationService
                     ]);
                     var store = {};
                     spyOn(localStorage, 'getItem').and.callFake(function (key) {
@@ -49,7 +49,7 @@ System.register(['angular2/testing', 'angular2/core', 'angular2/http', 'angular2
                     mockBackend = injector.get(testing_2.MockBackend);
                     backend = injector.get(http_1.XHRBackend);
                     httpService = injector.get(http_1.Http);
-                    service = injector.get(alfresco_authentication_service_1.AlfrescoAuthenticationService);
+                    service = injector.get(alfresco_authentication_1.AlfrescoAuthenticationService);
                 });
                 testing_1.it('should return true and token if the user is logged in', function () {
                     service.saveJwt('fake-local-token');
@@ -88,4 +88,4 @@ System.register(['angular2/testing', 'angular2/core', 'angular2/http', 'angular2
         }
     }
 });
-//# sourceMappingURL=alfresco-authentication.service.spec.js.map
\ No newline at end of file
+//# sourceMappingURL=alfresco-authentication.spec.js.map
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.spec.js.map b/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.spec.js.map
new file mode 100644
index 0000000000..6a1b32380d
--- /dev/null
+++ b/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.spec.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"alfresco-authentication.spec.js","sourceRoot":"","sources":["alfresco-authentication.spec.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.spec.ts b/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.spec.ts
similarity index 99%
rename from ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.spec.ts
rename to ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.spec.ts
index 7cf085c2fe..ef573e26d5 100644
--- a/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.spec.ts
+++ b/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.spec.ts
@@ -18,7 +18,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 './alfresco-authentication.service';
+import {AlfrescoAuthenticationService} from './alfresco-authentication';
 
 describe('AlfrescoAuthentication', () => {
     let injector,
diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.ts b/ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.ts
rename to ng2-components/ng2-alfresco-login/src/services/alfresco-authentication.ts
diff --git a/ng2-components/ng2-alfresco-login/tests-runner.html b/ng2-components/ng2-alfresco-login/tests-runner.html
index a341282524..220b73a633 100644
--- a/ng2-components/ng2-alfresco-login/tests-runner.html
+++ b/ng2-components/ng2-alfresco-login/tests-runner.html
@@ -42,8 +42,8 @@
 
         // #3. Import the spec file explicitly
         Promise.all([
-            System.import('src/alfresco-authentication.service.spec'),
-            System.import('src/alfresco-login.component.spec')
+            System.import('src/services/alfresco-authentication.spec'),
+            System.import('src/components/alfresco-login.spec')
         ])
                 // #4. wait for all imports to load ...
                 //     then re-execute `window.onload` which