diff --git a/src/app/components/language-selector/language-selector.component.spec.ts b/src/app/components/language-selector/language-selector.component.spec.ts
deleted file mode 100644
index c95395f..0000000
--- a/src/app/components/language-selector/language-selector.component.spec.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import {ComponentFixture} from 'ng-forward/cjs/testing/test-component-builder';
-import {provide} from 'ng-forward';
-
-import {LanguageSelector} from './language-selector.component';
-
-import * as helpers from "../../../spec/helpers";
-
-describe("Components", () => {
-
-    describe("Language Selector Component", () => {
-
-        beforeEach(angular.mock.module("templates"));
-
-        let translatorService: any;
-
-        let buildComponent = (): Promise<ComponentFixture> => {
-            translatorService = jasmine.createSpyObj("translatorService", ["availableLanguages", "currentLanguage"]);
-            return helpers.quickCreateComponent({
-                template: "<language-selector></language-selector>",
-                directives: [LanguageSelector],
-                providers: [
-                    provide('TranslatorService', {
-                        useValue: translatorService
-                    })
-                ].concat(helpers.provideFilters("translateFilter"))
-            });
-        };
-
-        it("display language options", (done) => {
-            buildComponent().then(fixture => {
-                fixture.debugElement.getLocal("$rootScope").$apply();
-                expect(fixture.debugElement.queryAll('li.language').length).toEqual(2);
-                done();
-            });
-        });
-
-        it("call the translator service when change the language", (done) => {
-            let translatorService = jasmine.createSpyObj("translatorService", ["changeLanguage"]);
-            let languageSelector = new LanguageSelector(<any>translatorService);
-            languageSelector.changeLanguage("en");
-            expect(translatorService.changeLanguage).toHaveBeenCalledWith("en");
-            done();
-        });
-
-    });
-});
diff --git a/src/app/profile/info/profile-info.component.ts b/src/app/profile/info/profile-info.component.ts
index 0055aea..49583e4 100644
--- a/src/app/profile/info/profile-info.component.ts
+++ b/src/app/profile/info/profile-info.component.ts
@@ -3,7 +3,7 @@ import {ProfileService} from "../../../lib/ng-noosfero-api/http/profile.service"
 
 @Component({
     selector: 'profile',
-    templateUrl: "app/profile-info/profile-info.html",
+    templateUrl: "app/profile/info/profile-info.html",
     providers: [provide('profileService', { useClass: ProfileService })]
 })
 @Inject(ProfileService)
diff --git a/src/app/profile/profile.component.ts b/src/app/profile/profile.component.ts
index 0f09724..2f7ca7c 100644
--- a/src/app/profile/profile.component.ts
+++ b/src/app/profile/profile.component.ts
@@ -33,7 +33,7 @@ import {MyProfile} from "./myprofile.component";
         component: ProfileInfoComponent,
         views: {
             "mainBlockContent": {
-                templateUrl: "app/profile-info/profile-info.html",
+                templateUrl: "app/profile/info/profile-info.html",
                 controller: ProfileInfoComponent,
                 controllerAs: "vm"
             }
@@ -73,12 +73,12 @@ import {MyProfile} from "./myprofile.component";
         component: ContentViewerComponent,
         views: {
             "mainBlockContent": {
-                templateUrl: "app/content-viewer/page.html",
+                templateUrl: "app/article/content-viewer/page.html",
                 controller: ContentViewerComponent,
                 controllerAs: "vm"
             },
             "actions@main": {
-                templateUrl: "app/content-viewer/navbar-actions.html",
+                templateUrl: "app/article/content-viewer/navbar-actions.html",
                 controller: ContentViewerActions,
                 controllerAs: "vm"
             }
--
libgit2 0.21.2